You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/12/04 00:06:15 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - build should
fail on error
Updated Branches:
refs/heads/develop 07d0d2501 -> 50e8a637f
build should fail on error
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/25591cb5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/25591cb5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/25591cb5
Branch: refs/heads/develop
Commit: 25591cb5153421994c04fe3d9b7d5e5301d8b955
Parents: 07d0d25
Author: Alex Harui <ah...@apache.org>
Authored: Tue Dec 3 13:21:21 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Dec 3 13:21:35 2013 -0800
----------------------------------------------------------------------
examples/build_example.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/25591cb5/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 6bc3db1..82f8925 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -120,7 +120,7 @@
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
- <java jar="${FALCONJX_HOME}/lib/mxmlc.jar"
+ <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" failonerror="true"
fork="true">
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
[2/2] git commit: [flex-asjs] [refs/heads/develop] - fix status code
handling
Posted by ah...@apache.org.
fix status code handling
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/50e8a637
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/50e8a637
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/50e8a637
Branch: refs/heads/develop
Commit: 50e8a637f8dfcb6a615b54848f358bedc60ba9f4
Parents: 25591cb
Author: Alex Harui <ah...@apache.org>
Authored: Tue Dec 3 15:05:32 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Dec 3 15:05:32 2013 -0800
----------------------------------------------------------------------
examples/build_example.xml | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50e8a637/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 82f8925..118d801 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -120,7 +120,7 @@
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
- <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" failonerror="true"
+ <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
@@ -139,7 +139,16 @@
<arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/src/createjs_externals.js" />
<arg value="${basedir}/src/${example}.mxml" />
</java>
-
+ <fail>
+ <condition>
+ <not>
+ <or>
+ <equals arg1="${errorCode}" arg2="0" />
+ <equals arg1="${errorCode}" arg2="2" />
+ </or>
+ </not>
+ </condition>
+ </fail>
</target>
<target name="compileasjs" description="Cross-compiles ${example}">
@@ -148,7 +157,7 @@
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
- <java jar="${FALCONJX_HOME}/lib/mxmlc.jar"
+ <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
@@ -167,7 +176,16 @@
<arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/src/createjs_externals.js" />
<arg value="${basedir}/src/${example}.as" />
</java>
-
+ <fail>
+ <condition>
+ <not>
+ <or>
+ <equals arg1="${errorCode}" arg2="0" />
+ <equals arg1="${errorCode}" arg2="2" />
+ </or>
+ </not>
+ </condition>
+ </fail>
</target>
<macrodef name="html-wrapper">