flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - Fix build issues on Windows.
Date Tue, 26 Aug 2014 04:36:06 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 2f078fd62 -> 5a6e15eb3


Fix build issues on Windows.


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

Branch: refs/heads/develop
Commit: 5a6e15eb37dd80d04a451a8de3d6cdd4bf46813b
Parents: 2f078fd
Author: Om <bigosmallm@gmail.com>
Authored: Mon Aug 25 21:35:26 2014 -0700
Committer: Om <bigosmallm@gmail.com>
Committed: Mon Aug 25 21:35:26 2014 -0700

----------------------------------------------------------------------
 frameworks/as/projects/FlexJSJX/tests/build.xml | 9 ++++++++-
 frameworks/as/projects/FlexJSUI/tests/build.xml | 9 ++++++++-
 frameworks/js/build.xml                         | 3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5a6e15eb/frameworks/as/projects/FlexJSJX/tests/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/tests/build.xml b/frameworks/as/projects/FlexJSJX/tests/build.xml
index eb55a72..d7f0c94 100644
--- a/frameworks/as/projects/FlexJSJX/tests/build.xml
+++ b/frameworks/as/projects/FlexJSJX/tests/build.xml
@@ -27,7 +27,14 @@
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
-    <property name="browser" value="/Applications/Safari.app/Contents/MacOS/Safari" />
+
+	<condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe">
+		<os family="windows"/>
+    </condition>
+    <condition property="browser" value="/Applications/Safari.app/Contents/MacOS/Safari">
+        <os family="mac"/>
+    </condition>
+
     <property name="report.dir" value="${basedir}/out" />
     
     <available file="${FLEXJS_HOME}/../flex-flexunit"

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5a6e15eb/frameworks/as/projects/FlexJSUI/tests/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/tests/build.xml b/frameworks/as/projects/FlexJSUI/tests/build.xml
index 7a885d8..e116442 100644
--- a/frameworks/as/projects/FlexJSUI/tests/build.xml
+++ b/frameworks/as/projects/FlexJSUI/tests/build.xml
@@ -27,7 +27,14 @@
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
-    <property name="browser" value="/Applications/Safari.app/Contents/MacOS/Safari" />
+ 	
+	<condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe">
+		<os family="windows"/>
+    </condition>
+    <condition property="browser" value="/Applications/Safari.app/Contents/MacOS/Safari">
+        <os family="mac"/>
+    </condition>
+	
     <property name="report.dir" value="${basedir}/out" />
     
     <available file="${FLEXJS_HOME}/../flex-flexunit"

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5a6e15eb/frameworks/js/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/build.xml b/frameworks/js/build.xml
index e42f842..118c190 100644
--- a/frameworks/js/build.xml
+++ b/frameworks/js/build.xml
@@ -62,6 +62,9 @@
     <property name="FLEX_HOME" value="${env.FLEX_HOME}" />
 	<property name="gjslint" value="gjslint" />
 	<property name="jshint" value="jshint" />
+	<condition property="no.lint" value="true">
+		<os family="windows"/>
+	</condition>
  
     <target name="main" depends="check-compile-env,clean,prepare,compile" 
         description="Clean build of all SWCs"/>


Mime
View raw message