You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/06/04 00:43:10 UTC
[6/8] git commit: [flex-sdk] [refs/heads/develop] - fix up platform
conditionals
fix up platform conditionals
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5c852d6b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5c852d6b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5c852d6b
Branch: refs/heads/develop
Commit: 5c852d6b5e3e7fbfa9234045a67e5724338c729f
Parents: 9a4e7cb
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 08:30:17 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 08:30:17 2013 +1000
----------------------------------------------------------------------
frameworks/build.xml | 2 +-
frameworks/projects/framework/build.xml | 4 ++--
frameworks/projects/mobilecomponents/build.xml | 4 ++--
frameworks/projects/mobiletheme/build.xml | 4 ++--
frameworks/projects/spark/build.xml | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index b028332..488e7e1 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -40,7 +40,7 @@
</condition>
<!-- Property for the platform. -->
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/framework/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/build.xml b/frameworks/projects/framework/build.xml
index a22ee88..67e8383 100644
--- a/frameworks/projects/framework/build.xml
+++ b/frameworks/projects/framework/build.xml
@@ -83,7 +83,7 @@
</sequential>
</macrodef>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -190,7 +190,7 @@
</delete>
</target>
- <target name="pixelbender-unzip" unless="isWindows,isOSX">
+ <target name="pixelbender-unzip" if="isLinux">
<echo message="Unziping pixel bender files" />
<gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
<untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/mobilecomponents/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/build.xml b/frameworks/projects/mobilecomponents/build.xml
index b333ef1..8813ed6 100644
--- a/frameworks/projects/mobilecomponents/build.xml
+++ b/frameworks/projects/mobilecomponents/build.xml
@@ -82,7 +82,7 @@
</sequential>
</macrodef>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -171,7 +171,7 @@
</delete>
</target>
- <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+ <target name="configMod" description="Modifies which config file to use" if="isLinux">
<property name="configMod" value="AIR2"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/mobiletheme/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/build.xml b/frameworks/projects/mobiletheme/build.xml
index cc8575d..42aaaff 100644
--- a/frameworks/projects/mobiletheme/build.xml
+++ b/frameworks/projects/mobiletheme/build.xml
@@ -27,7 +27,7 @@
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -54,7 +54,7 @@
</delete>
</target>
- <target name="configMod" description="Modifies which config file to use" unless="isWindows,isMac">
+ <target name="configMod" description="Modifies which config file to use" if="isLinux">
<property name="configMod" value="AIR2"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c852d6b/frameworks/projects/spark/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/build.xml b/frameworks/projects/spark/build.xml
index c526808..f5420c1 100644
--- a/frameworks/projects/spark/build.xml
+++ b/frameworks/projects/spark/build.xml
@@ -84,7 +84,7 @@
</sequential>
</macrodef>
- <condition property="isMac" value="true">
+ <condition property="isMac">
<os family="mac"/>
</condition>
<condition property="isWindows">
@@ -192,7 +192,7 @@
<target name="compile" depends="pixelbender-compile, pixelbender-unzip, swc-compile" description="Compiles spark.swc"/>
- <target name="pixelbender-unzip" unless="isWindows,isOSX">
+ <target name="pixelbender-unzip" if="isLinux">
<echo message="Unziping pixel bender files" />
<gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
<untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />