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/05/31 03:38:40 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - added check for
Linux - file just need to exist but not do anything for now
Updated Branches:
refs/heads/develop 2b77e9dd2 -> e0275a226
added check for Linux - file just need to exist but not do anything for now
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fb4295f5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fb4295f5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fb4295f5
Branch: refs/heads/develop
Commit: fb4295f553ea01d781e29a57ee8fab3c81b53fbf
Parents: 2b77e9d
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 31 11:37:36 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 31 11:37:36 2013 +1000
----------------------------------------------------------------------
build.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fb4295f5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 53b3dfa..7986d28 100644
--- a/build.xml
+++ b/build.xml
@@ -202,7 +202,14 @@
<available file="${env.PIXELBENDER_HOME}/pbutil" type="file"/>
</and>
</condition>
-
+
+ <condition property="pbutil.exe.exists">
+ <and>
+ <os family="unix"/>
+ <available file="${env.PIXELBENDER_HOME}/pbutil" type="file"/>
+ </and>
+ </condition>
+
<condition property="pbutil.exe.exists">
<and>
<os family="windows"/>
[2/2] git commit: [flex-sdk] [refs/heads/develop] - added isLinux
check (for completeness not used yet)
Posted by jm...@apache.org.
added isLinux check (for completeness not used yet)
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e0275a22
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e0275a22
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e0275a22
Branch: refs/heads/develop
Commit: e0275a226458048fc9d145069811c9f1a89f13ee
Parents: fb4295f
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 31 11:38:27 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 31 11:38:27 2013 +1000
----------------------------------------------------------------------
frameworks/build.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e0275a22/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 448b944..b028332 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -45,7 +45,15 @@
</condition>
<condition property="isWindows">
<os family="windows" />
- </condition>
+ </condition>
+ <condition property="isLinux">
+ <and>
+ <os family="unix"/>
+ <not>
+ <os family="mac"/>
+ </not>
+ </and>
+ </condition>
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>