Repository: flex-falcon Updated Branches: refs/heads/feature/maven-migration c2c3912b0 -> 748c1df8e
clean up binary rat Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/abc0fd0f Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/abc0fd0f Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/abc0fd0f Branch: refs/heads/feature/maven-migration Commit: abc0fd0fc2cd01372bb6fc95cc5be8f85e02948a Parents: ea7610b Author: Alex Harui <[email protected]> Authored: Sat Mar 12 07:31:58 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Sat Mar 12 07:32:16 2016 -0800 ---------------------------------------------------------------------- ApproveFalcon.xml | 8 ++++++++ LICENSE.jx.bin | 8 ++++++++ build.xml | 18 +++++++++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/abc0fd0f/ApproveFalcon.xml ---------------------------------------------------------------------- diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml index eddf204..6f99c25 100644 --- a/ApproveFalcon.xml +++ b/ApproveFalcon.xml @@ -298,6 +298,7 @@ <exclude name="**/org.apache.flex.tools.FlexToolGroup"/> <exclude name="debugger/META-INF/MANIFEST.MF"/> <exclude name="RELEASE_NOTES_JX"/> + <exclude name="LICENSE.jx.bin"/> <exclude name="NOTICE.jx"/> <exclude name="README_JX"/> <exclude name="NOTICE.base"/> @@ -365,6 +366,7 @@ <exclude name="**/*.flv"/> <exclude name="**/org.apache.flex.tools.FlexToolGroup"/> <exclude name="debugger/META-INF/MANIFEST.MF"/> + <exclude name="LICENSE.jx.bin"/> <exclude name="RELEASE_NOTES_JX"/> <exclude name="NOTICE.jx"/> <exclude name="README_JX"/> @@ -373,9 +375,15 @@ <exclude name="NOTICE.oem"/> <exclude name="NOTICE.swfutils"/> <exclude name="externs/js/externs/svg.js" /> + <exclude name="externs/createjs/externs/**/*.js" /> + <exclude name="js/libs/cordova.swc"/> + <exclude name="js/libs/createjs.swc"/> <exclude name="js/libs/GCL.swc"/> + <exclude name="js/libs/google_maps.swc"/> + <exclude name="js/libs/jasmine.swc"/> <exclude name="js/libs/jquery.swc"/> <exclude name="js/libs/js.swc"/> + <exclude name="js/libs/node.swc"/> <excludesfile name="${basedir}/jarexcludes.txt" /> </fileset> </rat:report> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/abc0fd0f/LICENSE.jx.bin ---------------------------------------------------------------------- diff --git a/LICENSE.jx.bin b/LICENSE.jx.bin new file mode 100644 index 0000000..eba2b3e --- /dev/null +++ b/LICENSE.jx.bin @@ -0,0 +1,8 @@ +Below are the licenses for components included in the binary distribution. + +------------------------------------------------------------------------------------------ + +externs/createjs + +This product bundles CreateJS available under the +MIT Software License. http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/abc0fd0f/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 87d8a64..42e027d 100644 --- a/build.xml +++ b/build.xml @@ -493,6 +493,7 @@ <include name="README_JX"/> <include name="RELEASE_NOTES_JX"/> <include name="LICENSE.jx"/> + <include name="LICENSE.jx.bin"/> <include name="NOTICE.jx"/> </fileset> </copy> @@ -811,11 +812,6 @@ <!-- these files are in addition to the remaining source files --> - <!-- concat the license file with the binary license file for the 3rd party deps --> - <!--concat destfile="${basedir}/temp/LICENSE"> - <filelist dir="${FLEX_SDK_HOME}" files="LICENSE,LICENSE.bin"/> - </concat--> - <!-- copy the flex-sdk files that go in generated/dist/sdk --> <ant dir="compiler" target="copy.sdk" /> @@ -874,6 +870,12 @@ <antcall target="stage-source-jx" /> + <!-- concat the license file with the binary license file for the 3rd party deps --> + <delete file="${basedir}/temp/LICENSE" /> + <concat destfile="${basedir}/temp/LICENSE"> + <filelist dir="${basedir}" files="LICENSE.jx,LICENSE.jx.bin"/> + </concat> + <!-- generated --> <mkdir dir="${basedir}/temp/js"/> <copy todir="${basedir}/temp/js"> @@ -893,6 +895,9 @@ <mkdir dir="${basedir}/temp/js/libs"/> <copy tofile="${basedir}/temp/js/libs/js.swc" file="${basedir}/externs/js/out/bin/js.swc" /> <copy tofile="${basedir}/temp/js/libs/cordova.swc" file="${basedir}/externs/cordova/out/bin/cordova.swc" /> + <copy tofile="${basedir}/temp/js/libs/createjs.swc" file="${basedir}/externs/createjs/out/bin/createjs.swc" /> + <copy tofile="${basedir}/temp/js/libs/google_maps.swc" file="${basedir}/externs/google_maps/out/bin/google_maps.swc" /> + <copy tofile="${basedir}/temp/js/libs/jasmine.swc" file="${basedir}/externs/jasmine/out/bin/jasmine-2.0.swc" /> <copy tofile="${basedir}/temp/js/libs/jquery.swc" file="${basedir}/externs/jquery/out/bin/jquery-1.9.swc" /> <copy tofile="${basedir}/temp/js/libs/GCL.swc" file="${basedir}/externs/GCL/out/bin/GCL.swc" /> <copy tofile="${basedir}/temp/js/libs/node.swc" file="${basedir}/externs/node/out/bin/node.swc" /> @@ -905,6 +910,8 @@ <exclude name="**/*.swc"/> <exclude name="**/*.as"/> <exclude name="GCL/externs/**"/> + <exclude name="createjs/out/**"/> + <exclude name="createjs/in/**"/> </fileset> </copy> @@ -1016,6 +1023,7 @@ <exclude name="**/*.flv"/> <exclude name="**/org.apache.flex.tools.FlexToolGroup"/> <exclude name="debugger/META-INF/MANIFEST.MF"/> + <exclude name="LICENSE.jx.bin"/> <exclude name="README_JX"/> <exclude name="RELEASE_NOTES_JX"/> <exclude name="NOTICE.jx"/>
