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 05:42:48 UTC
[2/2] git commit: [flex-sdk] [refs/heads/develop] - Clean up OS
dependant config
Clean up OS dependant config
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7fcaf586
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7fcaf586
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7fcaf586
Branch: refs/heads/develop
Commit: 7fcaf5861b4fca591fdd9f6e4a6a963533cba8ac
Parents: c499f73
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 31 13:41:39 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 31 13:41:39 2013 +1000
----------------------------------------------------------------------
mustella/build.xml | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7fcaf586/mustella/build.xml
----------------------------------------------------------------------
diff --git a/mustella/build.xml b/mustella/build.xml
index e9bbf4e..cd05417 100644
--- a/mustella/build.xml
+++ b/mustella/build.xml
@@ -400,11 +400,13 @@
<echo>doing linux setup</echo>
<property name="mxmlc.exe" value="mxmlc"/>
<property name="compc.exe" value="compc" />
- <property name="player.dir" value="${sdk.dir}/in/player/${player.version}/lnx" />
- <property name="player" value="${player.dir}/flashplayer" />
<property name="apollo_exe" value="adl" />
<!-- kind of a guess: -->
<property name="shell" value="/bin/bash" />
+
+ <property name="player" value="${env.FLASHPLAYER_DEBUGGER}" />
+
+ <!-- these values are sort of magic numbers, corresponding to db entries -->
<property name="auto_exclude_config_value" value="10"/>
<property name="auto_exclude_bug_id" value="unproven_linux_${fetched_date}" />
</target>
@@ -413,18 +415,16 @@
<echo>doing mac setup</echo>
<property name="mxmlc.exe" value="mxmlc"/>
<property name="compc.exe" value="compc" />
+ <property name="apollo_exe" value="adl" />
+ <property name="unzip" value="/usr/bin/unzip" />
<property name="shell" value="/bin/sh" />
<property name="player" value="${env.FLASHPLAYER_DEBUGGER}" />
+
<!-- these values are sort of magic numbers, corresponding to db entries -->
<property name="auto_exclude_config_value" value="9"/>
<property name="auto_exclude_bug_id" value="unproven_mac_${fetched_date}"/>
<echo>excl config val ${auto_exclude_config_value}</echo>
- <property name="apollo_exe" value="adl" />
- <property name="shell" value="/bin/sh" />
- <property name="unzip" value="/usr/bin/unzip" />
- <property name="auto_exclude_config_value" value="9"/>
- <property name="auto_exclude_bug_id" value="unproven_mac_${fetched_date}"/>
</target>
<target name="setup_windows" if="is_win">
@@ -432,15 +432,14 @@
<echo>homepath: ${HOMEPATH} </echo>
<property name="mxmlc.exe" value="mxmlc.bat"/>
<property name="compc.exe" value="compc.bat" />
+ <property name="apollo_exe" value="adl.exe" />
<property name="shell" value="${cygwinshell}" />
+
<property file="${HOMEPATH}/mm.cfg"/>
<echo>trace output file: ${TraceOutputFileEnable} </echo>
<property name="player" value="${env.FLASHPLAYER_DEBUGGER}" />
- <property name="apollo_exe" value="adl.exe" />
-
- <echo>apollo_exe: ${apollo_exe}</echo>
-
+
<!-- these magic numbers correspond to db entries. Relevant for vetting -->
<condition property="auto_exclude_config_value" value="1">
<and>