incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1336304 - in /incubator/flex/trunk/mustella: build.xml java/src/build.xml
Date Wed, 09 May 2012 17:09:58 GMT
Author: cframpton
Date: Wed May  9 17:09:58 2012
New Revision: 1336304

URL: http://svn.apache.org/viewvc?rev=1336304&view=rev
Log:
Even though we aren't using it yet, fix the compile-mustella target.  Now that air isn't integrated
into the flex tree structure anymore need to include the air library classpath as well as
the flex library classpath when compiling java code.

Modified:
    incubator/flex/trunk/mustella/build.xml
    incubator/flex/trunk/mustella/java/src/build.xml

Modified: incubator/flex/trunk/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/mustella/build.xml?rev=1336304&r1=1336303&r2=1336304&view=diff
==============================================================================
--- incubator/flex/trunk/mustella/build.xml (original)
+++ incubator/flex/trunk/mustella/build.xml Wed May  9 17:09:58 2012
@@ -24,6 +24,7 @@
     <property file="${FLEX_HOME}/env.properties"/>
 
     <property name="mustella.dir" value="${basedir}" />
+    <property name="airsdk.dir" value="${env.AIR_HOME}" />
 	
     <property name="feature" value=""/>
     <property file="${basedir}/properties/${feature}.properties" />
@@ -851,7 +852,7 @@
 	</target>
 	
 	<target name="handle_adt_jar" if="copy_adt_jar">
-		<copy file="${sdk.dir}/lib/adt.jar" tofile="${mustella.dir}/lib/adt.jar" overwrite="true"
/>		
+		<copy file="${airsdk.dir}/lib/adt.jar" tofile="${mustella.dir}/lib/adt.jar" overwrite="true"
/>		
 	</target>
 
     <target name="cleanswfs" unless="noclean.set" description="--> deletes all swfs
and tag files">
@@ -1780,7 +1781,7 @@ we could have pmd_doler do the dir split
         	<arg value="-source-path=${mustella.dir}/as3/src/mustella" />
             <!-- clear library path -->
             <arg value="-library-path="/>
-            <arg value="-external-library-path=${env.AIR_HOME}/frameworks/libs/air,${sdk.dir}/frameworks/libs,${sdk.dir}/frameworks/libs/mx"
/>
+            <arg value="-external-library-path=${airsdk.dir}/frameworks/libs/air,${sdk.dir}/frameworks/libs,${sdk.dir}/frameworks/libs/mx"
/>
         	<arg value="ApolloFilePath"/>
         	<arg value="Assert"/>
         	<arg value="AssertError"/>

Modified: incubator/flex/trunk/mustella/java/src/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/mustella/java/src/build.xml?rev=1336304&r1=1336303&r2=1336304&view=diff
==============================================================================
--- incubator/flex/trunk/mustella/java/src/build.xml (original)
+++ incubator/flex/trunk/mustella/java/src/build.xml Wed May  9 17:09:58 2012
@@ -21,6 +21,7 @@
 	<property environment="env"/>
 
     <property name="mustella.dir" value="${basedir}"/>
+    <property file="${mustella.dir}/../env.properties"/>
     <property file="${mustella.dir}/local.properties"/>
     <property file="${mustella.dir}/build.properties"/>
     <property name="sdk.dir" value="$.."/>
@@ -47,6 +48,12 @@
         </fileset>
     </path>
 
+	<path id="airsdk.lib.classpath">
+		<fileset dir="${airsdk.dir}/lib">
+			<include name="*.jar"/>
+		</fileset>
+	</path>
+
 	<path id="sdk.lib.classpath">
 		<fileset dir="${sdk.dir}/lib">
 			<include name="*.jar"/>
@@ -74,6 +81,7 @@
 			<classpath>
                 <!--<path refid="flex.mustella.lib.classpath"/>-->
                 <path refid="ant.lib.classpath"/>
+                <path refid="airsdk.lib.classpath"/>
                 <path refid="swfutils.classpath"/>
 				<path refid="sdk.lib.classpath"/>
 			</classpath>
@@ -81,7 +89,6 @@
 
 	</target>
 
-
 	<target name="compile" depends="prepare">
 		<echo message="Compiling source code..."/>
 		<javac srcdir="${src.dir}" destdir="${build.dir}" debug="${src.debug}" nowarn="true"
source="1.4">



Mime
View raw message