You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/04/08 13:19:31 UTC
[28/43] git commit: [flex-asjs] [refs/heads/e4x] - get ant examples
to build from an IDE-compatible folder structure
get ant examples to build from an IDE-compatible folder structure
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f742bc28
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f742bc28
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f742bc28
Branch: refs/heads/e4x
Commit: f742bc285c2cb97ccddb589e5f4059658ee23a11
Parents: a97af6e
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 24 08:50:46 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 24 08:50:46 2016 -0700
----------------------------------------------------------------------
build.xml | 10 ++++++++++
examples/build_example.xml | 18 ++++++++++++++++++
2 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f742bc28/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5548c14..6ec2fbc 100644
--- a/build.xml
+++ b/build.xml
@@ -282,6 +282,11 @@
property="FALCON_HOME"
value="${env.FALCON_HOME}"/>
+ <available file="${basedir}/lib/falcon-mxmlc.jar"
+ type="file"
+ property="FALCON_HOME"
+ value="${basedir}"/>
+
<available file="${basedir}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
type="file"
property="FALCON_HOME"
@@ -306,6 +311,11 @@
property="FALCONJX_HOME"
value="${basedir}/../flex-falcon/compiler.jx"/>
+ <available file="${basedir}/js/lib/jsc.jar"
+ type="file"
+ property="FALCONJX_HOME"
+ value="${basedir}/js"/>
+
<fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler.jx folder in flex-falcon repo or the js folder if it has been converted into an FB-compatible SDK"
unless="FALCONJX_HOME"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f742bc28/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 47d2ae8..44c88a7 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -38,6 +38,15 @@
</and>
</condition>
+ <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+ <and>
+ <not>
+ <isset property="FALCON_HOME" />
+ </not>
+ <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar" type="file" />
+ </and>
+ </condition>
+
<condition property="FALCONJX_HOME" value="${env.FALCONJX_HOME}">
<and>
<not>
@@ -47,6 +56,15 @@
</and>
</condition>
+ <condition property="FALCONJX_HOME" value="${FLEXJS_HOME}/js">
+ <and>
+ <not>
+ <isset property="FALCONJX_HOME" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/lib/jsc.jar" type="file" />
+ </and>
+ </condition>
+
<condition property="FALCONJX_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler.jx">
<and>
<not>