flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/3] git commit: [flex-falcon] [refs/heads/develop] - try to get L & N in all of our jars
Date Thu, 18 Jun 2015 20:32:15 GMT
try to get L & N in all of our jars


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d33966fa
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d33966fa
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d33966fa

Branch: refs/heads/develop
Commit: d33966fa7e0a28b4019521431e17632108c44290
Parents: 26ff39a
Author: Alex Harui <aharui@apache.org>
Authored: Tue Jun 16 22:34:39 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Jun 18 12:09:28 2015 -0700

----------------------------------------------------------------------
 build.xml                   | 9 +++++++++
 debugger/build.xml          | 5 +++++
 flex-compiler-oem/build.xml | 7 ++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d33966fa/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index af7c455..83323d1 100644
--- a/build.xml
+++ b/build.xml
@@ -152,7 +152,12 @@
             source="${javac.src}" target="${javac.src}">
             <src path="${basedir}/swfutils/src" />
         </javac>
+        <mkdir dir="${basedir}/swfutils/classes/META-INF"/>
+        <copy file="${basedir}/LICENSE.base" tofile="${basedir}/swfutils/classes/META-INF/LICENSE"/>
+        <copy file="${basedir}/NOTICE.base" tofile="${basedir}/swfutils/classes/META-INF/NOTICE"/>
         <jar destfile="${basedir}/compiler/generated/dist/sdk/lib/swfutils.jar" basedir="${basedir}/swfutils/classes"
includes="**/*.class **/*.properties **/*.txt">
+            <include name="META-INF/LICENSE"/>
+            <include name="META-INF/NOTICE"/>
             <manifest>
                 <attribute name="Sealed" value="${manifest.sealed}" />
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"
/>
@@ -595,6 +600,10 @@
                 <include name="bin/**"/>
                 <include name="lib/**"/>
                 <exclude name="lib/commons-io**"/>
+                <exclude name="lib/flex-tool**"/>
+                <exclude name="lib/args4j**"/>
+                <exclude name="lib/guava**"/>
+                <exclude name="lib/org.json**"/>
             </fileset>
         </copy>
         

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d33966fa/debugger/build.xml
----------------------------------------------------------------------
diff --git a/debugger/build.xml b/debugger/build.xml
index bb774a8..1d378a1 100644
--- a/debugger/build.xml
+++ b/debugger/build.xml
@@ -29,7 +29,12 @@
 
 		<target name="jar" depends="compile">
 		    <mkdir dir="${dist}" />
+            <mkdir dir="${basedir}/swfutils/classes/META-INF"/>
+            <copy file="${basedir}/../LICENSE.base" tofile="${basedir.bin}/META-INF/LICENSE"/>
+            <copy file="${basedir}/../NOTICE.base" tofile="${basedir.bin}/META-INF/NOTICE"/>
 			<jar destfile="${dist}/${jar}" basedir="${basedir.bin}" includes="**/*.class **/*.properties
**/*.txt">
+                <include name="META-INF/LICENSE"/>
+                <include name="META-INF/NOTICE"/>
 				<manifest>
 	                <attribute name="Sealed" value="${manifest.sealed}" />
 	                <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"
/>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d33966fa/flex-compiler-oem/build.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index 5e778e3..ce0b4f2 100644
--- a/flex-compiler-oem/build.xml
+++ b/flex-compiler-oem/build.xml
@@ -145,9 +145,14 @@
 	</target>
 	
 	<target name="oem.jar" depends="compile, set.oem.jar.uptodate" unless="oem.jar.uptodate"
-		    description="Builds compiler.jar">
+		    description="Builds flex-oem-compiler.jar">
         <mkdir dir="${sdk}/lib"/>
+        <mkdir dir="${oem}/bin/META-INF"/>
+        <copy file="${basedir}/../LICENSE.base" tofile="${oem}/bin/META-INF/LICENSE"/>
+        <copy file="${basedir}/../NOTICE.base" tofile="${oem}/bin/META-INF/NOTICE"/>
         <jar file="${sdk}/lib/flex-compiler-oem.jar" basedir="${oem}/bin" includes="**/*.properties,**/*">
+            <include name="META-INF/LICENSE"/>
+            <include name="META-INF/NOTICE"/>
             <manifest>
                 <attribute name="Sealed" value="${manifest.sealed}"/>
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>


Mime
View raw message