flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [3/8] git commit: [flex-sdk] [refs/heads/develop] - Changed build files to us zip of pixel bender files on Linux
Date Mon, 03 Jun 2013 22:43:07 GMT
Changed build files to us zip of pixel bender files on Linux


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

Branch: refs/heads/develop
Commit: e306116827bca35fd15d7b425b00fea595687534
Parents: 975a0f5
Author: Justin Mclean <jmclean@apache.org>
Authored: Tue Jun 4 07:27:17 2013 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Tue Jun 4 07:27:17 2013 +1000

----------------------------------------------------------------------
 build.xml                                      |    2 +-
 frameworks/projects/mobilecomponents/build.xml |   23 +++++++++++++++++-
 frameworks/projects/mobiletheme/build.xml      |   23 +++++++++++++++++-
 3 files changed, 43 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3061168/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7196f28..95323a3 100644
--- a/build.xml
+++ b/build.xml
@@ -217,7 +217,7 @@
             </and>
         </condition>
 
-        <fail message="The directory ${env.PIXELBENDER_HOME} does not contain the pbutil
executable" 
+        <fail message="The directory ${env.PIXELBENDER_HOME} does not contain the pbutil
executable or pb files" 
             unless="pbutil.exe.exists"/>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3061168/frameworks/projects/mobilecomponents/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/build.xml b/frameworks/projects/mobilecomponents/build.xml
index 817139e..b333ef1 100644
--- a/frameworks/projects/mobilecomponents/build.xml
+++ b/frameworks/projects/mobilecomponents/build.xml
@@ -82,6 +82,21 @@
         </sequential>
     </macrodef>
     
+    <condition property="isMac" value="true">
+        <os family="mac"/>
+    </condition>
+    <condition property="isWindows">
+        <os family="windows" />
+    </condition>   
+    <condition property="isLinux">
+        <and>
+          <os family="unix"/>    
+          <not>
+            <os family="mac"/>    
+          </not>
+        </and>
+    </condition>  
+
     <target name="main" depends="clean,compile" description="Clean build of mobilecomponents.swc
and en_US">
         <bundle locale="${locale}"/>
     </target>
@@ -156,7 +171,11 @@
         </delete>
     </target>
 
-    <target name="compile" description="Compiles mobilecomponents.swc">
+    <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+        <property name="configMod" value="AIR2"/>
+    </target>
+
+    <target name="compile" description="Compiles mobilecomponents.swc" depends="configMod">
         <echo message="Compiling frameworks/libs/mobile/mobilecomponents.swc"/>
         <echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" level="info"/>
 
@@ -179,7 +198,7 @@
         <compc fork="true"
                output="${FLEX_HOME}/frameworks/libs/mobile/mobilecomponents.swc">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="compile-config.xml" />
+            <load-config filename="compile-config${configMod}.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
         </compc>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3061168/frameworks/projects/mobiletheme/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/build.xml b/frameworks/projects/mobiletheme/build.xml
index 7139da9..cc8575d 100644
--- a/frameworks/projects/mobiletheme/build.xml
+++ b/frameworks/projects/mobiletheme/build.xml
@@ -27,6 +27,21 @@
     <property environment="env"/>
     <property file="${FLEX_HOME}/build.properties"/>
 
+    <condition property="isMac" value="true">
+        <os family="mac"/>
+    </condition>
+    <condition property="isWindows">
+        <os family="windows" />
+    </condition>   
+    <condition property="isLinux">
+        <and>
+          <os family="unix"/>    
+          <not>
+            <os family="mac"/>    
+          </not>
+        </and>
+    </condition>  
+
     <target name="main" depends="clean,compile" description="Clean build of mobile.swc"/>
 
     <target name="clean">
@@ -39,7 +54,11 @@
         </delete>
     </target>
 
-    <target name="compile" description="Compiles mobile.swc">
+    <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+        <property name="configMod" value="AIR2"/>
+    </target>
+
+    <target name="compile" description="Compiles mobile.swc" depends="configMod">
         <echo message="Compiling frameworks/themes/Mobile/mobile.swc"/>
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
@@ -61,7 +80,7 @@
         <compc fork="true"
                output="${FLEX_HOME}/frameworks/themes/Mobile/mobile.swc">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="compile-config.xml" />
+            <load-config filename="compile-config${configMod}.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
         </compc>


Mime
View raw message