You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/01/02 19:36:44 UTC
[10/12] git commit: [flex-sdk] [refs/heads/release4.14.0] - fix
release packaging of NOTICE and LICENSE
fix release packaging of NOTICE and LICENSE
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/db79d868
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/db79d868
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/db79d868
Branch: refs/heads/release4.14.0
Commit: db79d868e40de5e300992336442f33b8cf8d4876
Parents: 3047164
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 2 09:17:19 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 2 10:33:24 2015 -0800
----------------------------------------------------------------------
build.xml | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/db79d868/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d12c850..98631ad 100644
--- a/build.xml
+++ b/build.xml
@@ -601,7 +601,12 @@
<include name="installer.properties/**"/>
<include name="CHANGES"/>
<include name="LICENSE"/>
+ <include name="LICENSE.base"/>
+ <include name="LICENSE.bin"/>
<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"/>
@@ -940,9 +945,13 @@ There are no known issues.
<!-- 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">
+ <concat destfile="${basedir}/temp/LICENSE">
<filelist dir="${FLEX_HOME}" files="LICENSE,LICENSE.bin"/>
- </concat-->
+ </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"/>
+ </concat>
<!-- use this to build frameworks -->
<copy file="${basedir}/frameworks/build_framework.xml"