flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - try to fix jenkins build
Date Tue, 25 Mar 2014 22:27:58 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 5e7bde8f0 -> 8699c1c85


try to fix jenkins build


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

Branch: refs/heads/develop
Commit: 8699c1c8583604fb0cd928030fba3e263e5a6ab5
Parents: 5e7bde8
Author: Alex Harui <aharui@apache.org>
Authored: Tue Mar 25 15:27:51 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Mar 25 15:27:51 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8699c1c8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e2fede..45522ee 100644
--- a/build.xml
+++ b/build.xml
@@ -87,6 +87,7 @@
     </target>
 
     <target name="dump-config" >
+        <property name="is.jenkins" value="true" />
         <echo>env.USERNAME is: ${env.USERNAME}</echo>
         <condition property="FLASHLOG"
             value="c:/Documents and Settings/${env.USERNAME}/Application Data/Macromedia/Flash
Player/Logs/flashlog.txt">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8699c1c8/frameworks/as/projects/FlexJSJX/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/build.xml b/frameworks/as/projects/FlexJSJX/build.xml
index 1cb8d23..d6bc75e 100644
--- a/frameworks/as/projects/FlexJSJX/build.xml
+++ b/frameworks/as/projects/FlexJSJX/build.xml
@@ -28,7 +28,10 @@
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
 
-    <target name="main" depends="clean,compile" description="Clean build of FlexJSJX.swc">
+    <target name="main" depends="clean,compile,test" description="Clean build of FlexJSJX.swc">
+    </target>
+    
+    <target name="test" unless="is.jenkins">
         <ant dir="tests" />
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8699c1c8/frameworks/as/projects/FlexJSUI/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/build.xml b/frameworks/as/projects/FlexJSUI/build.xml
index 9470db3..514b42d 100644
--- a/frameworks/as/projects/FlexJSUI/build.xml
+++ b/frameworks/as/projects/FlexJSUI/build.xml
@@ -28,7 +28,10 @@
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
 
-    <target name="main" depends="clean,compile" description="Clean build of FlexJSUI.swc">
+    <target name="main" depends="clean,compile,test" description="Clean build of FlexJSUI.swc">
+    </target>
+
+    <target name="test" unless="is.jenkins">
         <ant dir="tests" />
     </target>
     


Mime
View raw message