You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/06/15 21:10:39 UTC
svn commit: r1350742 - in /incubator/flex/trunk: NOTICE
frameworks/downloads.xml ide/flashbuilder/flashbuilder-config.xml
modules/thirdparty/batik/build.xml
modules/thirdparty/velocity/build/build.xml
Author: cframpton
Date: Fri Jun 15 19:10:39 2012
New Revision: 1350742
URL: http://svn.apache.org/viewvc?rev=1350742&view=rev
Log:
Cleanup, additional doc and add MPL1.1 code to NOTICE as required by http://www.apache.org/legal/3party.html#labeling-reciprocity, section "Category B: Reciprocal Licenses".
Modified:
incubator/flex/trunk/NOTICE
incubator/flex/trunk/frameworks/downloads.xml
incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml
incubator/flex/trunk/modules/thirdparty/batik/build.xml
incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml
Modified: incubator/flex/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/NOTICE?rev=1350742&r1=1350741&r2=1350742&view=diff
==============================================================================
--- incubator/flex/trunk/NOTICE (original)
+++ incubator/flex/trunk/NOTICE Fri Jun 15 19:10:39 2012
@@ -21,3 +21,14 @@ The Batik SVG toolkit source contains co
The Batik SVG toolkit source contains code from the International Organisation for
Standardization for the definition of character entities used in the software's
documentation.
+
+The Open Source Media Framework used by the video components is licensed under the
+ Mozilla Public License Version 1.1. The source code can be found here:
+ http://sourceforge.net/projects/osmf.adobe/files/OSMF%201.0%20%28final%20source%2C%20ASDocs%2C%20PDF%20guides%2C%20and%20release%20notes%29/OSMF_1.0.zip
+
+The Adobe Text Layout Framework used by the Spark text components is licensed under the
+ Mozilla Public License Version 1.1. The source code can be found here:
+ http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip
+
+The Flash authoring support uses FlexContentHolderThumbnail.swc which is licensed under
+ under the Mozilla Public License Version 1.1.
Modified: incubator/flex/trunk/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/downloads.xml?rev=1350742&r1=1350741&r2=1350742&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/downloads.xml (original)
+++ incubator/flex/trunk/frameworks/downloads.xml Fri Jun 15 19:10:39 2012
@@ -58,6 +58,8 @@
<!--
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">
<echo message="Mozilla Public License Version 1.1:
@@ -84,8 +86,7 @@
</target>
<!--
- Notify before downloading.
- See http://www.apache.org/legal/3party.html#labeling-reciprocity
+ Notify before downloading file with MPL1.1 license.
-->
<target name="ask-authoring" unless="build.noprompt"
description="Notify the user before downloading the authoring swc.">
@@ -113,7 +114,9 @@
<available file="${basedir}/libs/osmf.swc" property="osmf.swc.present"/>
</target>
- <!-- Prompt before downloading OSMF. -->
+ <!--
+ Notify before downloading file with MPL1.1 license.
+ -->
<target name="ask-osmf" unless="build.noprompt">
<echo message="The Open Source Media Framework used by the video components"/>
<echo message="is licensed under the Mozilla Public License Version 1.1."/>
@@ -168,8 +171,7 @@
</target>
<!--
- Notify before downloading.
- See http://www.apache.org/legal/3party.html#labeling-reciprocity
+ Notify before downloading file with MPL1.1 license.
-->
<target name="ask-tlf" unless="build.noprompt">
<echo message="The Adobe Text Layout Framework used by the Spark text components"/>
Modified: incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml?rev=1350742&r1=1350741&r2=1350742&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml (original)
+++ incubator/flex/trunk/ide/flashbuilder/flashbuilder-config.xml Fri Jun 15 19:10:39 2012
@@ -19,6 +19,6 @@
-->
<flashbuilder-config>
<!-- Specifies the express install swf that will be used in the HTML file generated. -->
- <!-- The implied path is templates/swfobject. -->
+ <!-- The implied path is {flex-home}/templates/swfobject. -->
<express-install-swf>expressInstall.swf</express-install-swf>
</flashbuilder-config>
\ No newline at end of file
Modified: incubator/flex/trunk/modules/thirdparty/batik/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/batik/build.xml?rev=1350742&r1=1350741&r2=1350742&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/batik/build.xml (original)
+++ incubator/flex/trunk/modules/thirdparty/batik/build.xml Fri Jun 15 19:10:39 2012
@@ -473,6 +473,7 @@ To display the available targets type:
<!--====== START additions for Apache Flex =========-->
+ <property name="FLEX_HOME" value="${basedir}/../../.."/>
<property name="FLEX_LIB" value="${basedir}/../../../lib"/>
<!--
@@ -484,9 +485,8 @@ To display the available targets type:
<target name="batik-all-flex-jar" depends="compile, prepare-build"
description="Creates a combined JAR file of the Batik libraries in ${build}/lib">
- <mkdir dir="${module.classes}/META-INF"/>
- <copy file="LICENSE" todir="${dest}/META-INF"/>
- <copy file="NOTICE" todir="${dest}/META-INF"/>
+ <copy file="${FLEX_HOME}/LICENSE" todir="${dest}/META-INF"/>
+ <copy file="${FLEX_HOME}/NOTICE" todir="${dest}/META-INF"/>
<jar jarfile="${FLEX_LIB}/batik-all-flex.jar">
<fileset dir="${dest}" excludes="**/CVS">
Modified: incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml?rev=1350742&r1=1350741&r2=1350742&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml Fri Jun 15 19:10:39 2012
@@ -306,7 +306,8 @@
<!--====== START additions for Apache Flex =========-->
- <property name="FLEX_LIB" value="${basedir}/../../../lib"/>
+ <property name="FLEX_HOME" value="${basedir}/../../../.."/>
+ <property name="FLEX_LIB" value="${basedir}/../../../../lib"/>
<!--
Clone jar-dep and add manifest and LICENSE/NOTICE files.
@@ -324,8 +325,8 @@
<delete dir="${build.dest}/meta-inf" quiet="true"/>
<mkdir dir="${build.dest}/META-INF"/>
- <copy file="../LICENSE" todir="${build.dest}/META-INF"/>
- <copy file="../NOTICE" todir="${build.dest}/META-INF"/>
+ <copy file="${FLEX_HOME}/LICENSE" todir="${build.dest}/META-INF"/>
+ <copy file="${FLEX_HOME}/NOTICE" todir="${build.dest}/META-INF"/>
<jar jarfile="${FLEX_LIB}/velocity-dep-1.4-flex.jar">
<fileset dir="${build.dest}">