flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [11/13] git commit: [flex-sdk] [refs/heads/develop] - fix release packaging of NOTICE and LICENSE
Date Sat, 03 Jan 2015 09:02:34 GMT
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/e7f7be84
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e7f7be84
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e7f7be84

Branch: refs/heads/develop
Commit: e7f7be84d7d5d9afaa1a122c3a62a0fc9a089b8c
Parents: ac5a168
Author: Alex Harui <aharui@apache.org>
Authored: Fri Jan 2 09:17:19 2015 -0800
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Sat Jan 3 10:02:10 2015 +0100

----------------------------------------------------------------------
 build.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e7f7be84/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" 


Mime
View raw message