update paths to partial license and notice files
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e3c90350 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e3c90350 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e3c90350 Branch: refs/heads/develop Commit: e3c903503bb8f44994278dc041a39c684298fe69 Parents: 66f2cc4 Author: Justin Mclean <[email protected]> Authored: Mon Dec 28 14:45:11 2015 +1100 Committer: Justin Mclean <[email protected]> Committed: Mon Dec 28 14:45:11 2015 +1100 ---------------------------------------------------------------------- ApproveSDK.xml | 10 ++-------- build.xml | 19 ++++++------------- modules/antTasks/build.xml | 4 ++-- modules/asc/build/java/build.xml | 4 ++-- modules/compiler/build.xml | 4 ++-- modules/debugger/build.xml | 4 ++-- modules/fxgutils/build.xml | 4 ++-- modules/swfutils/build.xml | 4 ++-- modules/thirdparty/xerces-patch/build.xml | 2 +- 9 files changed, 21 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/ApproveSDK.xml ---------------------------------------------------------------------- diff --git a/ApproveSDK.xml b/ApproveSDK.xml index 77aba4a..5135aff 100644 --- a/ApproveSDK.xml +++ b/ApproveSDK.xml @@ -319,10 +319,7 @@ <!-- exclude text files --> <exclude name="CONTRIBUTING"/> <exclude name="CONTRIBUTORS"/> - <exclude name="LICENSE.bin"/> - <exclude name="NOTICE.bin"/> - <exclude name="NOTICE.asc"/> - <exclude name="NOTICE.base"/> + <exclude name="licenseParts/*"/> <exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/> <exclude name="modules/thirdparty/batik/lib/**/README*.txt"/> <exclude name="frameworks/projects/flatspark/src/flatspark/assets/fonts/**/OFL.txt"/> @@ -409,10 +406,7 @@ <!-- exclude text files --> <exclude name="CONTRIBUTING"/> <exclude name="CONTRIBUTORS"/> - <exclude name="LICENSE.bin"/> - <exclude name="NOTICE.bin"/> - <exclude name="NOTICE.asc"/> - <exclude name="NOTICE.base"/> + <exclude name="licenseParts/*"/> <exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/> <exclude name="modules/thirdparty/batik/lib/**/README*.txt"/> <exclude name="frameworks/projects/flatspark/src/flatspark/assets/fonts/**/OFL.txt"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 6e6b579..9fd4ac4 100644 --- a/build.xml +++ b/build.xml @@ -566,12 +566,8 @@ <include name="installer.properties/**"/> <include name="CHANGES"/> <include name="LICENSE"/> - <include name="LICENSE.base"/> - <include name="LICENSE.bin"/> + <include name="licenseParts/*"/> <include name="NOTICE"/> - <include name="NOTICE.asc"/> - <include name="NOTICE.base"/> - <include name="NOTICE.bin"/> <include name="README"/> <include name="RELEASE_NOTES"/> <include name="CONTRIBUTING"/> @@ -807,8 +803,8 @@ </fileset> </copy> <copy file="${basedir}/README.pb" tofile="${basedir}/temp/README" /> - <copy file="${basedir}/LICENSE.pb" tofile="${basedir}/temp/LICENSE" /> - <copy file="${basedir}/NOTICE.pb" tofile="${basedir}/temp/NOTICE" /> + <copy file="${basedir}/licenseParts/LICENSE.pb" tofile="${basedir}/temp/LICENSE" /> + <copy file="${basedir}/licenseParts/NOTICE.pb" tofile="${basedir}/temp/NOTICE" /> <echo file="${basedir}/temp/RELEASE_NOTES"> Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -888,11 +884,11 @@ There are no known issues. <!-- concat the license file with the binary license file for the 3rd party deps --> <concat destfile="${basedir}/temp/LICENSE"> - <filelist dir="${FLEX_HOME}" files="LICENSE,LICENSE.bin"/> + <filelist dir="${FLEX_HOME}" files="LICENSE,licenseParts/LICENSE.bin"/> </concat> <!-- concat the license file with the binary license file for the 3rd party deps --> <concat destfile="${basedir}/temp/NOTICE"> - <filelist dir="${FLEX_HOME}" files="NOTICE,NOTICE.bin"/> + <filelist dir="${FLEX_HOME}" files="NOTICE,licenseParts/NOTICE.bin"/> </concat> <!-- use this to build frameworks --> @@ -1799,10 +1795,7 @@ There are no known issues. <!-- exclude text files --> <exclude name="CONTRIBUTING"/> <exclude name="CONTRIBUTORS"/> - <exclude name="LICENSE.bin"/> - <exclude name="NOTICE.bin"/> - <exclude name="NOTICE.asc"/> - <exclude name="NOTICE.base"/> + <exclude name="licenseParts/*"/> <exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/> <exclude name="modules/thirdparty/batik/lib/**/README*.txt"/> <exclude name="frameworks/projects/flatspark/src/flatspark/assets/fonts/**/OFL.txt"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/modules/antTasks/build.xml ---------------------------------------------------------------------- diff --git a/modules/antTasks/build.xml b/modules/antTasks/build.xml index 937ea57..f7e65af 100644 --- a/modules/antTasks/build.xml +++ b/modules/antTasks/build.xml @@ -45,8 +45,8 @@ <target name="jar" depends="compile"> <echo message="Building lib/flexTasks.jar"/> <mkdir dir="${module.classes}/META-INF"/> - <copy file="${FLEX_HOME}/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> - <copy file="${FLEX_HOME}/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> + <copy file="${FLEX_HOME}/licenseParts/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> + <copy file="${FLEX_HOME}/licenseParts/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> <jar destfile="${module.jar}"> <fileset dir="${module.dir}" includes="flexTasks.tasks" /> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/modules/asc/build/java/build.xml ---------------------------------------------------------------------- diff --git a/modules/asc/build/java/build.xml b/modules/asc/build/java/build.xml index caa416f..dfc10c2 100644 --- a/modules/asc/build/java/build.xml +++ b/modules/asc/build/java/build.xml @@ -106,8 +106,8 @@ <target name="jar" depends="classes" > <mkdir dir="${lib.dir}" /> <mkdir dir="${basedir}/classes/META-INF"/> - <copy file="${root.dir}/../../LICENSE.base" tofile="${basedir}/classes/META-INF/LICENSE"/> - <copy file="${root.dir}/../../NOTICE.asc" tofile="${basedir}/classes/META-INF/NOTICE"/> + <copy file="${root.dir}/../../licenseParts/LICENSE.base" tofile="${basedir}/classes/META-INF/LICENSE"/> + <copy file="${root.dir}/../../licenseParts/NOTICE.asc" tofile="${basedir}/classes/META-INF/NOTICE"/> <jar file="${lib.dir}/asc.jar" basedir="${basedir}/classes" includes="macromedia/asc/**/*,macromedia/abc/**/*,adobe/abc/**/*"> <include name="META-INF/LICENSE"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/modules/compiler/build.xml ---------------------------------------------------------------------- diff --git a/modules/compiler/build.xml b/modules/compiler/build.xml index 1291c42..dc0c3a9 100644 --- a/modules/compiler/build.xml +++ b/modules/compiler/build.xml @@ -164,8 +164,8 @@ <target name="jar" depends="javacc,compile,set-build-num,templates,localization" description="compile and create compiler jars"> <mkdir dir="${module.classes}/META-INF"/> - <copy file="${FLEX_HOME}/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> - <copy file="${FLEX_HOME}/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> + <copy file="${FLEX_HOME}/licenseParts/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> + <copy file="${FLEX_HOME}/licenseParts/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> <!-- Copy the flex-tool-api jar --> <copy file="${lib.in.dir}/flex-tool-api.jar" todir="${lib.dir}"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/modules/debugger/build.xml ---------------------------------------------------------------------- diff --git a/modules/debugger/build.xml b/modules/debugger/build.xml index 7c252a8..06930b5 100644 --- a/modules/debugger/build.xml +++ b/modules/debugger/build.xml @@ -78,8 +78,8 @@ build outputs: sdk/lib/fdb.jar <target name="jar" depends="compile" description="compile and create fdb.jar"> <mkdir dir="${lib.dir}" /> <mkdir dir="${module.classes}/META-INF"/> - <copy file="${FLEX_HOME}/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> - <copy file="${FLEX_HOME}/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> + <copy file="${FLEX_HOME}/licenseParts/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> + <copy file="${FLEX_HOME}/licenseParts/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> <echo message="Building lib/fdb.jar"/> <jar file="${lib.dir}/fdb.jar" basedir="${module.classes}" includes="**/*" excludes="dependencies.txt"> <manifest> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/modules/fxgutils/build.xml ---------------------------------------------------------------------- diff --git a/modules/fxgutils/build.xml b/modules/fxgutils/build.xml index 508d9df..15f9b3d 100644 --- a/modules/fxgutils/build.xml +++ b/modules/fxgutils/build.xml @@ -56,8 +56,8 @@ <target name="jar" depends="compile" description="compile and create fxgutils.jar"> <mkdir dir="${lib.dir}" /> <mkdir dir="${module.classes}/META-INF"/> - <copy file="${FLEX_HOME}/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> - <copy file="${FLEX_HOME}/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> + <copy file="${FLEX_HOME}/licenseParts/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> + <copy file="${FLEX_HOME}/licenseParts/NOTICE.base" tofile="${module.classes}/META-INF/NOTICE"/> <echo message="Building lib/fxgutils.jar"/> <jar file="${lib.dir}/fxgutils.jar" basedir="${module.classes}" includes="**/*"> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/modules/swfutils/build.xml ---------------------------------------------------------------------- diff --git a/modules/swfutils/build.xml b/modules/swfutils/build.xml index f8792ad..c1e3d0d 100644 --- a/modules/swfutils/build.xml +++ b/modules/swfutils/build.xml @@ -52,8 +52,8 @@ <target name="jar" depends="compile" description="compile and create swfutils.jar"> <mkdir dir="${lib.dir}" /> <mkdir dir="${basedir}/classes/META-INF"/> - <copy file="${FLEX_HOME}/LICENSE.base" tofile="${basedir}/classes/META-INF/LICENSE"/> - <copy file="${FLEX_HOME}/NOTICE.base" tofile="${basedir}/classes/META-INF/NOTICE"/> + <copy file="${FLEX_HOME}/licenseParts/LICENSE.base" tofile="${basedir}/classes/META-INF/LICENSE"/> + <copy file="${FLEX_HOME}/licenseParts/NOTICE.base" tofile="${basedir}/classes/META-INF/NOTICE"/> <echo message="Building lib/swfutils.jar"/> <jar file="${lib.dir}/swfutils.jar" basedir="${module.classes}" includes="**/*"> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3c90350/modules/thirdparty/xerces-patch/build.xml ---------------------------------------------------------------------- diff --git a/modules/thirdparty/xerces-patch/build.xml b/modules/thirdparty/xerces-patch/build.xml index 79b99d7..e856af6 100644 --- a/modules/thirdparty/xerces-patch/build.xml +++ b/modules/thirdparty/xerces-patch/build.xml @@ -62,7 +62,7 @@ <target name="jar" depends="compile" description="compile and create xercesPatch.jar"> <mkdir dir="${module.classes}/META-INF"/> - <copy file="../../../LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> + <copy file="../../../licenseParts/LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/> <!--use copy of xerces NOTICE stored in our repo --> <!--<copy file="../../../NOTICE" todir="${module.classes}/META-INF"/>-->
