This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 7da840d Update MXRoyaleBase build.xml to match the one in MXRoyale.
new ad38c5a Merge pull request #1156 from
estanglerbm/mxroyalebase-buildxml
7da840d is described below
commit 7da840d618befe41a93fc2156cabc2aa6c03a25b
Author: Edward Stangler <[email protected]>
AuthorDate: Wed Oct 13 21:12:30 2021 -0500
Update MXRoyaleBase build.xml to match the one in MXRoyale.
---
frameworks/projects/MXRoyaleBase/build.xml | 41 +++++++++++++++++++++++-------
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/frameworks/projects/MXRoyaleBase/build.xml
b/frameworks/projects/MXRoyaleBase/build.xml
index 838b0b3..86b82fc 100644
--- a/frameworks/projects/MXRoyaleBase/build.xml
+++ b/frameworks/projects/MXRoyaleBase/build.xml
@@ -27,7 +27,15 @@
<property file="${ROYALE_HOME}/local.properties"/>
<property file="${ROYALE_HOME}/build.properties"/>
<property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
-
+ <condition property="AIR_HOME" value="${env.AIR_HOME}">
+ <isset property="env.AIR_HOME" />
+ </condition>
+ <property name="AIR_HOME" value="${ROYALE_HOME}"/>
+ <condition property="PLAYERGLOBAL_HOME" value="${env.PLAYERGLOBAL_HOME}">
+ <isset property="env.PLAYERGLOBAL_HOME" />
+ </condition>
+ <property name="PLAYERGLOBAL_HOME"
value="${ROYALE_HOME}/frameworks/libs/player"/>
+
<property name="target.name" value="${ant.project.name}.swc" />
<tstamp>
@@ -46,7 +54,7 @@
</ant>
</target>
- <target name="copy-swc" if="env.AIR_HOME">
+ <target name="copy-swc" if="AIR_HOME">
<copy file="${basedir}/target/${target.name}"
tofile="${ROYALE_HOME}/frameworks/libs/${target.name}" />
</target>
@@ -57,23 +65,33 @@
</not>
</condition>
<!-- exclude from js-only build -->
- <condition property="skip-tests" >
- <not>
- <isset property="env.AIR_HOME" />
- </not>
+ <condition property="skip-swf-tests">
+ <or>
+ <isset property="skip-tests" />
+ <not>
+ <!-- env.AIR_HOME is how we determine if it's a SWF
distritbution -->
+ <isset property="env.AIR_HOME" />
+ </not>
+ </or>
</condition>
</target>
<target name="test" depends="check-for-tests,check-compiler"
unless="skip-tests">
- <ant dir="src/test/royale" />
+ <antcall target="test-swf" />
<antcall target="test-js" />
</target>
+
+ <target name="test-swf" unless="skip-swf-tests">
+ <ant dir="src/test/royale" />
+ </target>
<target name="test-js">
<ant
dir="${ROYALE_HOME}/frameworks/js/projects/${ant.project.name}JS/"
inheritAll="false" target="test">
<property name="ROYALE_SWF_COMPILER_HOME"
value="${ROYALE_SWF_COMPILER_HOME}"/>
<property name="ROYALE_COMPILER_HOME"
value="${ROYALE_COMPILER_HOME}"/>
<property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
+ <property name="AIR_HOME" value="${AIR_HOME}"/>
+ <property name="PLAYERGLOBAL_HOME" value="${PLAYERGLOBAL_HOME}"/>
</ant>
</target>
@@ -95,7 +113,7 @@
<ant dir="src/test/royale" target="clean"/>
</target>
- <target name="compile" description="Compiles .as files into .swc"
if="env.AIR_HOME">
+ <target name="compile" description="Compiles .as files into .swc"
if="AIR_HOME">
<!-- use antcall so that resultproperty can be used in other projects
and
they don't collide when being run one after the other -->
<antcall target="compile-swf" />
@@ -114,7 +132,7 @@
<jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" />
<arg value="+royalelib=${ROYALE_HOME}/frameworks" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+ <arg value="+env.AIR_HOME=${AIR_HOME}" />
<arg value="-compiler.strict-xml=true" />
<arg value="-compiler.targets=SWF,JSRoyale" />
<arg value="-compiler.define+=GOOG::DEBUG,true" />
@@ -169,6 +187,11 @@
type="file"
property="ROYALE_COMPILER_HOME"
value="${ROYALE_HOME}/js"/>
+
+ <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar"
+ type="file"
+ property="ROYALE_COMPILER_HOME"
+ value="${env.ROYALE_COMPILER_HOME}"/>
<fail message="ROYALE_COMPILER_HOME must be set to a folder with a lib
sub-folder containing jsc.jar such as the compiler-jx folder in royale-compiler
repo or the js folder of a Royale SDK"
unless="ROYALE_COMPILER_HOME"/>
