You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2015/02/02 10:03:10 UTC
[34/50] [abbrv] git commit: [flex-sdk] [refs/heads/master] - remove
prompt for OSMF download
remove prompt for OSMF download
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c307aef3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c307aef3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c307aef3
Branch: refs/heads/master
Commit: c307aef3841856ac0fda11043278b80731791fdb
Parents: b6d8a31
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jan 20 23:28:04 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jan 20 23:29:35 2015 -0800
----------------------------------------------------------------------
frameworks/downloads.xml | 32 --------------------------------
1 file changed, 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c307aef3/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index f2847fa..0652183 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -83,27 +83,6 @@
</delete>
<delete dir="${lib.opt.dir}" failonerror="false"/>
</target>
-
- <!--
- MPL 1.1 Licesense Notification
- See http://www.apache.org/legal/3party.html#labeling-reciprocity
- Section "Category B: Reciprocal Licenses"
- -->
- <target name="echo-mpl1.1-license">
- <input
- message="Mozilla Public License Version 1.1:
- ${line.separator}
- ${line.separator}The contents of the file(s) are subject to the Mozilla Public License Version 1.1.
- ${line.separator}You may not use the file(s) except in compliance with the License.
- ${line.separator}You may obtain a copy of the License here:
- ${line.separator} http://www.mozilla.org/MPL/.
- ${line.separator}By downloading, modifying, distributing, using and/or accessing the file(s),
- ${line.separator}you agree to the terms and conditions of the applicable license agreement.
- ${line.separator}
- ${line.separator}I have read the MPL1.1 license information above?"
- validargs="y"
- defaultvalue="y"/>
- </target>
<!--
osmf.swc (Version 1.0)
@@ -113,18 +92,7 @@
<available file="${basedir}/libs/osmf.swc" property="osmf.swc.present"/>
</target>
- <!--
- Notify before downloading file with MPL1.1 license.
- -->
- <target name="ask-osmf" unless="build.noprompt">
- <echo message="The Open Source Media Framework (OSMF) used by the video components"/>
- <echo message="is licensed under the Mozilla Public License Version 1.1."/>
- <antcall target="echo-mpl1.1-license"/>
- <property name="do.osmf.install" value="set" />
- </target>
-
<target name="osmf-download" depends="osmf-check" unless="osmf.swc.present">
- <antcall target="ask-osmf"/>
<available file="${download.dir}/osmf.swc" type="file" property="osmf.swc.exists"/>
<antcall target="download-osmf-swc" />
<copy file="${download.dir}/osmf.swc" todir="${basedir}/libs" />