flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [14/35] git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - off one level of folders
Date Fri, 22 Apr 2016 17:25:01 GMT
off one level of folders


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

Branch: refs/heads/feature/maven-migration-test
Commit: b23aaa3f1c3b5ea8e01455dc2f88c463f6526345
Parents: 0f6013b
Author: Alex Harui <aharui@apache.org>
Authored: Wed Apr 20 14:00:12 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Apr 22 09:02:57 2016 -0700

----------------------------------------------------------------------
 compiler/build.xml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b23aaa3f/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index dfd40a0..9b8fa70 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -529,7 +529,7 @@
 	
 	<target name="set.compiler.jar.uptodate">
 		<uptodate property="compiler.jar.uptodate"
-		          targetfile="${sdk}/lib/compiler.jar">
+		          targetfile="${sdk}/compiler.jar">
 			<srcfiles dir="${compiler}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -541,10 +541,10 @@
         description="Builds compiler.jar"> skip localization for now -->
 	<target name="compiler.jar" depends="compile, version-info, set.compiler.jar.uptodate"
unless="compiler.jar.uptodate"
 		    description="Builds compiler.jar">
-        <mkdir dir="${sdk}/lib"/>
+        <mkdir dir="${sdk}"/>
         <copy file="${basedir}/../LICENSE.base" tofile="${compiler}/target/classes/META-INF/LICENSE"/>
         <copy file="${basedir}/../NOTICE.base" tofile="${compiler}/target/classes/META-INF/NOTICE"/>
-        <jar file="${sdk}/lib/compiler.jar" basedir="${compiler}/target/classes" includes="**/*.properties,org/apache/**/*,META-INF/**/*"
excludes="${compiler.ant.binaries},${compiler.font.binaries}">
+        <jar file="${sdk}/compiler.jar" basedir="${compiler}/target/classes" includes="**/*.properties,org/apache/**/*,META-INF/**/*"
excludes="${compiler.ant.binaries},${compiler.font.binaries}">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -560,7 +560,7 @@
 	
 	<target name="set.falcon.asc.jar.uptodate">
 		<uptodate property="falcon.asc.jar.uptodate"
-		          targetfile="${sdk}/lib/falcon-asc.jar">
+		          targetfile="${sdk}/falcon-asc.jar">
 			<srcfiles dir="${compiler}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -569,8 +569,8 @@
 	</target>
 	
 	<target name="falcon.asc.jar" depends="compiler.jar, set.falcon.asc.jar.uptodate" unless="falcon.asc.jar.uptodate">
-        <mkdir dir="${sdk}/lib"/>
-        <jar file="${sdk}/lib/falcon-asc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
+        <mkdir dir="${sdk}"/>
+        <jar file="${sdk}/falcon-asc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -586,7 +586,7 @@
 
 	<target name="set.falcon.mxmlc.jar.uptodate">
 		<uptodate property="falcon.mxmlc.jar.uptodate"
-		          targetfile="${sdk}/lib/falcon-mxmlc.jar">
+		          targetfile="${sdk}/falcon-mxmlc.jar">
 			<srcfiles dir="${compiler}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -595,8 +595,8 @@
 	</target>
 	
 	<target name="falcon.mxmlc.jar" depends="compiler.jar, set.falcon.mxmlc.jar.uptodate"
unless="falcon.mxmlc.jar.uptodate">
-        <mkdir dir="${sdk}/lib"/>
-        <jar file="${sdk}/lib/falcon-mxmlc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
+        <mkdir dir="${sdk}"/>
+        <jar file="${sdk}/falcon-mxmlc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -612,7 +612,7 @@
 
 	<target name="set.falcon.compc.jar.uptodate">
 		<uptodate property="falcon.compc.jar.uptodate"
-		          targetfile="${sdk}/lib/falcon-compc.jar">
+		          targetfile="${sdk}/falcon-compc.jar">
 			<srcfiles dir="${compiler}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -621,8 +621,8 @@
 	</target>
 	
 	<target name="falcon.compc.jar" depends="compiler.jar, set.falcon.compc.jar.uptodate"
unless="falcon.compc.jar.uptodate">
-        <mkdir dir="${sdk}/lib"/>
-        <jar file="${sdk}/lib/falcon-compc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
+        <mkdir dir="${sdk}"/>
+        <jar file="${sdk}/falcon-compc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -638,7 +638,7 @@
 
 	<target name="set.falcon.optimizer.jar.uptodate">
 		<uptodate property="falcon.optimizer.jar.uptodate"
-		          targetfile="${sdk}/lib/falcon-optimizer.jar">
+		          targetfile="${sdk}/falcon-optimizer.jar">
 			<srcfiles dir="${compiler}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -647,8 +647,8 @@
 	</target>
 	
 	<target name="falcon.optimizer.jar" depends="compiler.jar, set.falcon.optimizer.jar.uptodate"
unless="falcon.optimizer.jar.uptodate">
-        <mkdir dir="${sdk}/lib"/>
-        <jar file="${sdk}/lib/falcon-optimizer.jar" basedir="${compiler}/target/classes"
whenmanifestonly="create">
+        <mkdir dir="${sdk}"/>
+        <jar file="${sdk}/falcon-optimizer.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -664,7 +664,7 @@
 
 	<target name="set.falcon.swfdump.jar.uptodate">
 		<uptodate property="falcon.swfdump.jar.uptodate"
-		          targetfile="${sdk}/lib/falcon-swfdump.jar">
+		          targetfile="${sdk}/falcon-swfdump.jar">
 			<srcfiles dir="${compiler}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -673,8 +673,8 @@
 	</target>
 	
 	<target name="falcon.swfdump.jar" depends="compiler.jar, set.falcon.swfdump.jar.uptodate"
unless="falcon.swfdump.jar.uptodate">
-        <mkdir dir="${sdk}/lib"/>
-        <jar file="${sdk}/lib/falcon-swfdump.jar" basedir="${compiler}/target/classes"
whenmanifestonly="create">
+        <mkdir dir="${sdk}"/>
+        <jar file="${sdk}/falcon-swfdump.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -690,7 +690,7 @@
 
 	<target name="set.falcon.flextasks.jar.uptodate">
 		<uptodate property="falcon.flextasks.jar.uptodate"
-		          targetfile="${sdk}/lib/falcon-flextasks.jar">
+		          targetfile="${sdk}/falcon-flextasks.jar">
 			<srcfiles dir="${compiler}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -699,8 +699,8 @@
 	</target>
 	
 	<target name="falcon.flextasks.jar" depends="compiler.jar, set.falcon.flextasks.jar.uptodate"
unless="falcon.flextasks.jar.uptodate">
-        <mkdir dir="${sdk}/lib"/>
-        <jar file="${sdk}/lib/falcon-flexTasks.jar" basedir="${compiler}/target/classes"
>
+        <mkdir dir="${sdk}"/>
+        <jar file="${sdk}/falcon-flexTasks.jar" basedir="${compiler}/target/classes" >
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>


Mime
View raw message