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 08:05:08 UTC
git commit: [flex-sdk] [refs/heads/develop] - Fixed build for Linux
so it includes correct config file.
Updated Branches:
refs/heads/develop 31d1b97c1 -> 845899d44
Fixed build for Linux so it includes correct config file.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/845899d4
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/845899d4
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/845899d4
Branch: refs/heads/develop
Commit: 845899d4461b989b00725fe3e43afe4640e0bca4
Parents: 31d1b97
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jun 4 16:04:31 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jun 4 16:04:31 2013 +1000
----------------------------------------------------------------------
frameworks/projects/mobilecomponents/build.xml | 11 ++++++-----
frameworks/projects/mobiletheme/build.xml | 12 +++++++-----
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/845899d4/frameworks/projects/mobilecomponents/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/build.xml b/frameworks/projects/mobilecomponents/build.xml
index 06bec59..6f14a51 100644
--- a/frameworks/projects/mobilecomponents/build.xml
+++ b/frameworks/projects/mobilecomponents/build.xml
@@ -26,9 +26,6 @@
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
-
- <property name="configMod" value=""/>
-
<macrodef name="bundle">
<attribute name="locale"/>
@@ -174,11 +171,15 @@
</delete>
</target>
- <target name="configMod" description="Modifies which config file to use" if="isLinux">
+ <target name="configModLinux" description="Modifies which config file to use" if="isLinux">
<property name="configMod" value="AIR2"/>
</target>
+
+ <target name="configModOther" description="Modifies which config file to use" unless="isLinux">
+ <property name="configMod" value=""/>
+ </target>
- <target name="compile" description="Compiles mobilecomponents.swc" depends="configMod">
+ <target name="compile" description="Compiles mobilecomponents.swc" depends="configModLinux,configModOther">
<echo message="Compiling frameworks/libs/mobile/mobilecomponents.swc"/>
<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" level="info"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/845899d4/frameworks/projects/mobiletheme/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/build.xml b/frameworks/projects/mobiletheme/build.xml
index e627bb5..002281c 100644
--- a/frameworks/projects/mobiletheme/build.xml
+++ b/frameworks/projects/mobiletheme/build.xml
@@ -26,9 +26,7 @@
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
-
- <property name="configMod" value=""/>
-
+
<condition property="isMac">
<os family="mac"/>
</condition>
@@ -56,11 +54,15 @@
</delete>
</target>
- <target name="configMod" description="Modifies which config file to use" if="isLinux">
+ <target name="configModLinux" description="Modifies which config file to use" if="isLinux">
<property name="configMod" value="AIR2"/>
</target>
+
+ <target name="configModOther" description="Modifies which config file to use" unless="isLinux">
+ <property name="configMod" value=""/>
+ </target>
- <target name="compile" description="Compiles mobile.swc" depends="configMod">
+ <target name="compile" description="Compiles mobile.swc" depends="configModLinux,configModOther">
<echo message="Compiling frameworks/themes/Mobile/mobile.swc"/>
<!-- Load the <compc> task. We can't do this at the <project> level -->