incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1328530 - in /incubator/flex/trunk/modules: antTasks/build.xml asc/build/java/build.xml compiler/build.xml debugger/build.xml fxgutils/build.xml swfutils/build.xml thirdparty/xerces-patch/build.xml
Date Fri, 20 Apr 2012 22:30:13 GMT
Author: cframpton
Date: Fri Apr 20 22:30:13 2012
New Revision: 1328530

URL: http://svn.apache.org/viewvc?rev=1328530&view=rev
Log:
Include META-INF/LICENSE and META-INF/NOTICE in all the jars we generate for the release.
 The Apache velocity and batik jars that we're merging our changes into are so old that they
don't seem to implement this Apache release requirement.  For now I left them as is.

Modified:
    incubator/flex/trunk/modules/antTasks/build.xml
    incubator/flex/trunk/modules/asc/build/java/build.xml
    incubator/flex/trunk/modules/compiler/build.xml
    incubator/flex/trunk/modules/debugger/build.xml
    incubator/flex/trunk/modules/fxgutils/build.xml
    incubator/flex/trunk/modules/swfutils/build.xml
    incubator/flex/trunk/modules/thirdparty/xerces-patch/build.xml

Modified: incubator/flex/trunk/modules/antTasks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/antTasks/build.xml?rev=1328530&r1=1328529&r2=1328530&view=diff
==============================================================================
--- incubator/flex/trunk/modules/antTasks/build.xml (original)
+++ incubator/flex/trunk/modules/antTasks/build.xml Fri Apr 20 22:30:13 2012
@@ -44,11 +44,14 @@
 
     <target name="jar" depends="compile">
     <echo message="Building lib/flexTasks.jar"/>
+        <mkdir dir="${module.classes}/META-INF"/>
+        <copy file="${FLEX_HOME}/LICENSE" todir="${module.classes}/META-INF"/>
+        <copy file="${FLEX_HOME}/NOTICE" todir="${module.classes}/META-INF"/>
         <jar destfile="${module.jar}">
             <fileset dir="${module.dir}"
                      includes="flexTasks.tasks" />
             <fileset dir="${module.classes}"
-                     includes="**/*.class"
+                     includes="**/*.class,META-INF/LICENSE,META-INF/NOTICE"
                      excludes="flex/ant/AscTask*.class" />
             <fileset dir="${FLEX_HOME}"
                      includes="templates/**"

Modified: incubator/flex/trunk/modules/asc/build/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/asc/build/java/build.xml?rev=1328530&r1=1328529&r2=1328530&view=diff
==============================================================================
--- incubator/flex/trunk/modules/asc/build/java/build.xml (original)
+++ incubator/flex/trunk/modules/asc/build/java/build.xml Fri Apr 20 22:30:13 2012
@@ -105,7 +105,13 @@
     </target>
 	<target name="jar" depends="classes" >
 		<mkdir dir="${lib.dir}" />
+		<mkdir dir="${basedir}/classes/META-INF"/>
+        <copy file="${root.dir}/../../LICENSE" todir="${basedir}/classes/META-INF"/>
+        <copy file="${root.dir}/../../NOTICE" todir="${basedir}/classes/META-INF"/>
+
 		<jar file="${lib.dir}/asc.jar" basedir="${basedir}/classes" includes="macromedia/asc/**/*,macromedia/abc/**/*,adobe/abc/**/*">
+		    <include name="META-INF/LICENSE"/>
+            <include name="META-INF/NOTICE"/>
             <manifest>
                 <attribute name="Main-Class" value="macromedia.asc.embedding.Main"/>
                 <attribute name="Class-Path" value=""/>
@@ -208,8 +214,8 @@
 			<fileset file="${root.dir}/lib/asc.jar"/>
 			<fileset file="${root.dir}/lib/asc_authoring.jar"/>
 			<fileset file="${root.dir}/lib/global.abc"/>
-            <fileset dir="${basedir}/classes" />
 		</delete>
+		<delete dir="${basedir}/classes" failonerror="false"/>
 	</target>
 	<target name="with.clover">
 		<taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>

Modified: incubator/flex/trunk/modules/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/build.xml?rev=1328530&r1=1328529&r2=1328530&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/build.xml (original)
+++ incubator/flex/trunk/modules/compiler/build.xml Fri Apr 20 22:30:13 2012
@@ -143,10 +143,17 @@
     </target>
 
     <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" todir="${module.classes}/META-INF"/>
+        <copy file="${FLEX_HOME}/NOTICE" todir="${module.classes}/META-INF"/>
+
 		<echo message="Building lib/mxmlc.jar"/>
         <jar file="${module.jar}" basedir="${module.classes}"
-             includes="**/*.properties,flex2/compiler/**/*,flex2/license/**/*,flex2/linker/**/*,flex2/tools/*,flex2/tools/oem/Message.class,flex2/tools/oem/ProgressMeter.class,flex2/tools/oem/Component.class,flex2/tools/oem/Script.class,flash/**/*,flex/**/*"
+            includes="**/*.properties,flex2/compiler/**/*,flex2/license/**/*,flex2/linker/**/*,flex2/tools/*,flex2/tools/oem/Message.class,flex2/tools/oem/ProgressMeter.class,flex2/tools/oem/Component.class,flex2/tools/oem/Script.class,flash/**/*,flex/**/*"
             excludes="flex2/tools/Shell*,flex2/tools/Optimizer*,flex2/tools/Digest*,flex2/tools/SwcDependencies*">
+            <include name="META-INF/LICENSE"/>
+            <include name="META-INF/NOTICE"/>
+
 			<patternset refid="locale.properties"/>
 					
             <manifest>
@@ -162,6 +169,8 @@
         <jar file="${module.ja.jar}" basedir="${module.classes}"
             includes="**/*_ja.properties"
             excludes="flex2/tools/Shell*,flex2/tools/Optimizer*,flex2/tools/Digest*,flex2/tools/SwcDependencies*">
+            <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}
- MXML Compiler (Japanese)"/>
@@ -173,7 +182,9 @@
         </jar>
 		<antcall target="other-jars"/>
 		<echo message="Building lib/compc.jar"/>
-        <jar file="${lib.dir}/compc.jar">
+        <jar file="${lib.dir}/compc.jar" basedir="${module.classes}">
+            <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}
- SWC Compiler"/>
@@ -184,7 +195,9 @@
             </manifest>
         </jar>
 		<echo message="Building lib/asdoc.jar"/>
-        <jar file="${lib.dir}/asdoc.jar">
+        <jar file="${lib.dir}/asdoc.jar" basedir="${module.classes}">
+            <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}
- ASDoc"/>
@@ -197,6 +210,8 @@
 		<echo message="Building lib/fcsh.jar"/>
         <jar file="${lib.dir}/fcsh.jar" basedir="${module.classes}"
              includes="flex2/tools/Fcsh*">
+            <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}
- Compiler Shell"/>
@@ -210,6 +225,8 @@
 		<echo message="Building lib/flex-compiler-oem.jar"/>
         <jar file="${lib.dir}/flex-compiler-oem.jar" basedir="${module.classes}"
              includes="flex2/tools/oem/**/*,flex2/tools/flexbuilder/**/*,flex/license/*">
+            <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}
- OEM Compiler"/>
@@ -221,6 +238,8 @@
 		<echo message="Building lib/optimizer.jar"/>
         <jar file="${lib.dir}/optimizer.jar" basedir="${module.classes}"
              includes="flex2/tools/Optimizer*">
+            <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}
- Optimizer"/>
@@ -233,6 +252,8 @@
 		<echo message="Building lib/digest.jar"/>
         <jar file="${lib.dir}/digest.jar" basedir="${module.classes}"
              includes="flex2/tools/Digest*">
+            <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}
- Digest Tool"/>
@@ -245,6 +266,8 @@
 		<echo message="Building lib/swcdepends.jar"/>
         <jar file="${lib.dir}/swcdepends.jar" basedir="${module.classes}"
              includes="flex2/tools/SwcDependencies*">
+            <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}
- SwcDependencies"/>
@@ -257,6 +280,8 @@
 		<echo message="Building lib/copylocale.jar"/>
         <jar file="${lib.dir}/copylocale.jar" basedir="${module.classes}"
              includes="flex2/tools/CopyLocale*">
+            <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}
- Copy Locale"/>
@@ -338,6 +363,8 @@
         <jar file="${lib.dir}/mxmlc_${locale}.jar" basedir="${module.classes}"
             includes="**/*_${locale}.properties"
             excludes="flex2/tools/Shell*,flex2/tools/Optimizer*,flex2/tools/Digest*">
+            <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}
- MXML Compiler (${lang})"/>

Modified: incubator/flex/trunk/modules/debugger/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/debugger/build.xml?rev=1328530&r1=1328529&r2=1328530&view=diff
==============================================================================
--- incubator/flex/trunk/modules/debugger/build.xml (original)
+++ incubator/flex/trunk/modules/debugger/build.xml Fri Apr 20 22:30:13 2012
@@ -74,6 +74,9 @@ 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" todir="${module.classes}/META-INF"/>
+        <copy file="${FLEX_HOME}/NOTICE" todir="${module.classes}/META-INF"/>
 		<echo message="Building lib/fdb.jar"/>
         <jar file="${lib.dir}/fdb.jar" basedir="${module.classes}" includes="**/*" excludes="dependencies.txt">
             <manifest>

Modified: incubator/flex/trunk/modules/fxgutils/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/fxgutils/build.xml?rev=1328530&r1=1328529&r2=1328530&view=diff
==============================================================================
--- incubator/flex/trunk/modules/fxgutils/build.xml (original)
+++ incubator/flex/trunk/modules/fxgutils/build.xml Fri Apr 20 22:30:13 2012
@@ -55,6 +55,10 @@
 
     <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" todir="${module.classes}/META-INF"/>
+        <copy file="${FLEX_HOME}/NOTICE" todir="${module.classes}/META-INF"/>
+        
 		<echo message="Building lib/fxgutils.jar"/>
         <jar file="${lib.dir}/fxgutils.jar" basedir="${module.classes}" includes="**/*">
             <manifest>

Modified: incubator/flex/trunk/modules/swfutils/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/swfutils/build.xml?rev=1328530&r1=1328529&r2=1328530&view=diff
==============================================================================
--- incubator/flex/trunk/modules/swfutils/build.xml (original)
+++ incubator/flex/trunk/modules/swfutils/build.xml Fri Apr 20 22:30:13 2012
@@ -51,6 +51,10 @@
 
     <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" todir="${basedir}/classes/META-INF"/>
+        <copy file="${FLEX_HOME}/NOTICE" todir="${basedir}/classes/META-INF"/>
+        
 		<echo message="Building lib/swfutils.jar"/>
         <jar file="${lib.dir}/swfutils.jar" basedir="${module.classes}" includes="**/*">
             <manifest>
@@ -61,7 +65,9 @@
             </manifest>
         </jar>
 		<echo message="Building lib/swfdump.jar"/>
-        <jar file="${lib.dir}/swfdump.jar">
+        <jar file="${lib.dir}/swfdump.jar" basedir="${module.classes}">
+        	<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}
- SWF Dump"/>

Modified: incubator/flex/trunk/modules/thirdparty/xerces-patch/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/xerces-patch/build.xml?rev=1328530&r1=1328529&r2=1328530&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/xerces-patch/build.xml (original)
+++ incubator/flex/trunk/modules/thirdparty/xerces-patch/build.xml Fri Apr 20 22:30:13 2012
@@ -61,6 +61,10 @@
     </target>
 
     <target name="jar" depends="compile" description="compile and create xercesPatch.jar">
+        <mkdir dir="${module.classes}/META-INF"/>
+        <copy file="../../../LICENSE" todir="${module.classes}/META-INF"/>
+        <copy file="../../../NOTICE" todir="${module.classes}/META-INF"/>
+
 		<echo message="Building lib/xercesPatch.jar"/>
         <jar file="${lib.dir}/xercesPatch.jar" basedir="${module.classes}" includes="**/*">
             <manifest>
@@ -93,4 +97,4 @@
         <depend cache="${module.classes}" srcdir="${module.src}" destdir="${module.classes}"/>
     </target>
 
-</project>
\ No newline at end of file
+</project>



Mime
View raw message