You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/03/26 18:35:26 UTC
[royale-asjs] branch develop updated: Ant: some better handling of
playerglobal/airglobal paths and which tests are run
This is an automated email from the ASF dual-hosted git repository.
joshtynjala 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 073bcff Ant: some better handling of playerglobal/airglobal paths and which tests are run
073bcff is described below
commit 073bcff5e51ee085c234b258311e3954caf04d2a
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Fri Mar 26 11:30:42 2021 -0700
Ant: some better handling of playerglobal/airglobal paths and which tests are run
---
build.xml | 12 +++++---
frameworks/build.xml | 12 ++++++--
.../js/projects/BasicJS/src/test/royale/build.xml | 2 +-
.../projects/BindingJS/src/test/royale/build.xml | 2 +-
.../CollectionsJS/src/test/royale/build.xml | 2 +-
.../js/projects/CoreJS/src/test/royale/build.xml | 2 +-
.../projects/MXRoyaleJS/src/test/royale/build.xml | 2 +-
.../projects/NetworkJS/src/test/royale/build.xml | 2 +-
.../ReflectionJS/src/test/royale/build.xml | 2 +-
.../RoyaleUnitJS/src/test/royale/build.xml | 2 +-
.../js/projects/XMLJS/src/test/royale/build.xml | 2 +-
frameworks/projects/Ace/build.xml | 26 +++++++++++-----
frameworks/projects/Basic/build.xml | 34 +++++++++++++++-----
.../projects/Basic/src/test/royale/build.xml | 2 +-
frameworks/projects/Binding/build.xml | 36 ++++++++++++++++------
.../projects/Binding/src/test/royale/build.xml | 2 +-
frameworks/projects/Charts/build.xml | 30 +++++++++++++-----
frameworks/projects/Collections/build.xml | 34 +++++++++++++++-----
.../projects/Collections/src/test/royale/build.xml | 2 +-
frameworks/projects/Core/build.xml | 34 +++++++++++++++-----
frameworks/projects/Core/src/test/royale/build.xml | 2 +-
frameworks/projects/CreateJS/build.xml | 30 +++++++++++++-----
frameworks/projects/Crux/build.xml | 30 +++++++++++++-----
frameworks/projects/DragDrop/build.xml | 32 ++++++++++++++-----
frameworks/projects/Effects/build.xml | 32 ++++++++++++++-----
frameworks/projects/Express/build.xml | 32 ++++++++++++++-----
frameworks/projects/Flat/build.xml | 32 ++++++++++++++-----
frameworks/projects/FontAwesome/build.xml | 32 ++++++++++++++-----
frameworks/projects/Formatters/build.xml | 32 ++++++++++++++-----
frameworks/projects/GoogleMaps/build.xml | 32 ++++++++++++++-----
frameworks/projects/Graphics/build.xml | 32 ++++++++++++++-----
frameworks/projects/HTML/build.xml | 32 ++++++++++++++-----
frameworks/projects/HTML5/build.xml | 32 ++++++++++++++-----
frameworks/projects/Icons/build.xml | 32 ++++++++++++++-----
frameworks/projects/JQuery/build.xml | 32 ++++++++++++++-----
frameworks/projects/Jewel/build.xml | 32 ++++++++++++++-----
frameworks/projects/Language/build.xml | 32 ++++++++++++++-----
frameworks/projects/MXRoyale/build.xml | 36 ++++++++++++++++------
.../projects/MXRoyale/src/test/royale/build.xml | 2 +-
frameworks/projects/MaterialDesignLite/build.xml | 32 ++++++++++++++-----
frameworks/projects/Mobile/build.xml | 32 ++++++++++++++-----
frameworks/projects/Network/build.xml | 36 ++++++++++++++++------
.../projects/Network/src/test/royale/build.xml | 2 +-
frameworks/projects/Reflection/build.xml | 36 ++++++++++++++++------
.../projects/Reflection/src/test/royale/build.xml | 2 +-
frameworks/projects/RoyaleSite/build.xml | 32 ++++++++++++++-----
frameworks/projects/RoyaleUnit/build.xml | 36 ++++++++++++++++------
.../projects/RoyaleUnit/src/test/royale/build.xml | 2 +-
frameworks/projects/RoyaleUnitUI/build.xml | 36 ++++++++++++++++------
frameworks/projects/SparkRoyale/build.xml | 32 ++++++++++++++-----
frameworks/projects/Storage/build.xml | 32 ++++++++++++++-----
frameworks/projects/TLF/build.xml | 32 ++++++++++++++-----
frameworks/projects/Text/build.xml | 32 ++++++++++++++-----
frameworks/projects/XML/build.xml | 36 ++++++++++++++++------
frameworks/projects/XML/src/test/royale/build.xml | 2 +-
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Dark-NoFlat-Primary-Blue-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Dark-NoFlat-Primary-Red-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Light-Flat-Primary-Blue-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Light-Flat-Primary-Green-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Light-Flat-Primary-Red-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Light-Flat-Primary-Topaz-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Light-Flat-Secondary-Red-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../Jewel-Light-NoFlat-Primary-Red-Theme/build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
.../build.xml | 16 +++++++---
frameworks/themes/JewelTheme/build.xml | 20 ++++++++----
164 files changed, 2205 insertions(+), 745 deletions(-)
diff --git a/build.xml b/build.xml
index ab8a80d..eba823a 100644
--- a/build.xml
+++ b/build.xml
@@ -41,6 +41,14 @@
<condition property="swf.distribution">
<isset property="env.AIR_HOME" />
</condition>
+ <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="debug" value="true"/>
<property name="strict" value="true"/>
@@ -504,7 +512,6 @@ limitations under the License.
<include name="playerglobal.swc"/>
</fileset>
</copy>
- <property name="env.PLAYERGLOBAL_HOME" value="${basedir}/frameworks/libs/player"/>
</target>
<target name="copy-airglobal" depends="check-typedefs-home" unless="env.AIR_HOME">
@@ -513,7 +520,6 @@ limitations under the License.
<include name="airglobal.swc"/>
</fileset>
</copy>
- <property name="env.AIR_HOME" value="${basedir}"/>
</target>
<target name="copy-compiler" depends="check-compiler-home" description="Copy compiler jars to where they are supposed to go">
@@ -689,8 +695,6 @@ limitations under the License.
<target name="frameworks" description="Full build of all Actionscript framework SWCs, including resource bundles and themes" unless="airsdk.found">
<ant dir="${basedir}/frameworks">
<property name="locale" value="${locale}"/>
- <property name="env.PLAYERGLOBAL_HOME" value="${env.PLAYERGLOBAL_HOME}"/>
- <property name="env.AIR_HOME" value="${env.AIR_HOME}"/>
</ant>
<antcall target="tweak-for-jsonly"/>
</target>
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 1ba83df..4b39714 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -59,6 +59,14 @@
<property environment="env"/>
<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"/>
<target name="main" depends="check-compile-env,clean,prepare,compile,test,fonts"
description="Clean build of all SWCs"/>
@@ -72,7 +80,7 @@
<available file="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" />
</condition>
<condition property="playerglobal.notneeded">
- <isset property="env.PLAYERGLOBAL_HOME" />
+ <isset property="PLAYERGLOBAL_HOME" />
</condition>
</target>
@@ -81,7 +89,7 @@
<available file="${basedir}/libs/air/airglobal.swc" />
</condition>
<condition property="airglobal.notneeded">
- <isset property="env.AIR_HOME" />
+ <isset property="AIR_HOME" />
</condition>
</target>
diff --git a/frameworks/js/projects/BasicJS/src/test/royale/build.xml b/frameworks/js/projects/BasicJS/src/test/royale/build.xml
index 53db642..4868d09 100644
--- a/frameworks/js/projects/BasicJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/BasicJS/src/test/royale/build.xml
@@ -146,7 +146,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/BindingJS/src/test/royale/build.xml b/frameworks/js/projects/BindingJS/src/test/royale/build.xml
index 473c8f3..366d165 100644
--- a/frameworks/js/projects/BindingJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/BindingJS/src/test/royale/build.xml
@@ -147,7 +147,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml b/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml
index c466e53..b9ad0e9 100644
--- a/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/CollectionsJS/src/test/royale/build.xml
@@ -146,7 +146,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/CoreJS/src/test/royale/build.xml b/frameworks/js/projects/CoreJS/src/test/royale/build.xml
index 0aa64bf..41fe2cb 100644
--- a/frameworks/js/projects/CoreJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/CoreJS/src/test/royale/build.xml
@@ -146,7 +146,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/MXRoyaleJS/src/test/royale/build.xml b/frameworks/js/projects/MXRoyaleJS/src/test/royale/build.xml
index 7701ded..826afb7 100644
--- a/frameworks/js/projects/MXRoyaleJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/MXRoyaleJS/src/test/royale/build.xml
@@ -149,7 +149,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/NetworkJS/src/test/royale/build.xml b/frameworks/js/projects/NetworkJS/src/test/royale/build.xml
index c545087..183e5ca 100644
--- a/frameworks/js/projects/NetworkJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/NetworkJS/src/test/royale/build.xml
@@ -146,7 +146,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml b/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml
index bed97cb..c6c2c6d 100644
--- a/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/ReflectionJS/src/test/royale/build.xml
@@ -146,7 +146,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml b/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml
index cd4a0b1..25191ab 100644
--- a/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/RoyaleUnitJS/src/test/royale/build.xml
@@ -151,7 +151,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/js/projects/XMLJS/src/test/royale/build.xml b/frameworks/js/projects/XMLJS/src/test/royale/build.xml
index bb64824..b13c30d 100644
--- a/frameworks/js/projects/XMLJS/src/test/royale/build.xml
+++ b/frameworks/js/projects/XMLJS/src/test/royale/build.xml
@@ -146,7 +146,7 @@
<arg value="-compiler.targets=JSRoyale" />
<arg value="-js-output=target" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/Ace/build.xml b/frameworks/projects/Ace/build.xml
index 60db72c..553acf8 100644
--- a/frameworks/projects/Ace/build.xml
+++ b/frameworks/projects/Ace/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -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,10 +65,14 @@
</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>
@@ -86,7 +98,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +110,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="-external-library-path+=${basedir}/../../../js/libs/ace-1.2.3.swc" />
<arg value="-compiler.strict-xml=true" />
<arg value="-compiler.targets=JSRoyale" />
diff --git a/frameworks/projects/Basic/build.xml b/frameworks/projects/Basic/build.xml
index 6137fbc..1f267ac 100644
--- a/frameworks/projects/Basic/build.xml
+++ b/frameworks/projects/Basic/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Basic/src/test/royale/build.xml b/frameworks/projects/Basic/src/test/royale/build.xml
index 4f8dd5e..a8882c6 100644
--- a/frameworks/projects/Basic/src/test/royale/build.xml
+++ b/frameworks/projects/Basic/src/test/royale/build.xml
@@ -81,7 +81,7 @@
<arg value="-debug" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index 586ccdf..f658bd6 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -107,7 +125,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Binding/src/test/royale/build.xml b/frameworks/projects/Binding/src/test/royale/build.xml
index e309680..e39232d 100644
--- a/frameworks/projects/Binding/src/test/royale/build.xml
+++ b/frameworks/projects/Binding/src/test/royale/build.xml
@@ -86,7 +86,7 @@
<arg value="-debug=true" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index d1d4498..894a6ed 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index 6cec948..683fae4 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -107,7 +125,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Collections/src/test/royale/build.xml b/frameworks/projects/Collections/src/test/royale/build.xml
index 84fc7a5..cd3af9a 100644
--- a/frameworks/projects/Collections/src/test/royale/build.xml
+++ b/frameworks/projects/Collections/src/test/royale/build.xml
@@ -86,7 +86,7 @@
<arg value="-debug" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 898a76f..2d3e38f 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -47,7 +55,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>
@@ -58,23 +66,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>
@@ -96,7 +114,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -108,7 +126,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Core/src/test/royale/build.xml b/frameworks/projects/Core/src/test/royale/build.xml
index a6d577b..fdca408 100644
--- a/frameworks/projects/Core/src/test/royale/build.xml
+++ b/frameworks/projects/Core/src/test/royale/build.xml
@@ -86,7 +86,7 @@
<arg value="-debug" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index 00b7e30..1a5ca79 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Crux/build.xml b/frameworks/projects/Crux/build.xml
index ca0960f..4fc89f4 100644
--- a/frameworks/projects/Crux/build.xml
+++ b/frameworks/projects/Crux/build.xml
@@ -27,6 +27,14 @@
<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" />
@@ -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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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" />
@@ -104,7 +120,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index 0f38b5d..dfa6ea4 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index c67c7ee..187e9da 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Express/build.xml b/frameworks/projects/Express/build.xml
index 7f1ed2d..00a2596 100644
--- a/frameworks/projects/Express/build.xml
+++ b/frameworks/projects/Express/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index 52a2e6d..83aa437 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/FontAwesome/build.xml b/frameworks/projects/FontAwesome/build.xml
index d2cdc6b..d0dcc71 100644
--- a/frameworks/projects/FontAwesome/build.xml
+++ b/frameworks/projects/FontAwesome/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index e56517e..71963af 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index 623b528..7ee7db7 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/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>
<format property="royale.swc-date" pattern="MM/dd/yy HH:mm Z"/>
@@ -45,7 +53,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>
@@ -56,14 +64,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -85,7 +101,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -97,7 +113,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index 85b21b0..da2d0d2 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 56d45a1..2c66bac 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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="-js-output-optimization=skipAsCoercions"/>
<arg value="-compiler.targets=SWF,JSRoyale" />
diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml
index cc0a262..184965d 100644
--- a/frameworks/projects/HTML5/build.xml
+++ b/frameworks/projects/HTML5/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Icons/build.xml b/frameworks/projects/Icons/build.xml
index cd4910b..a78dcfc 100644
--- a/frameworks/projects/Icons/build.xml
+++ b/frameworks/projects/Icons/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml
index 8c9e08c..7470aad 100644
--- a/frameworks/projects/JQuery/build.xml
+++ b/frameworks/projects/JQuery/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Jewel/build.xml b/frameworks/projects/Jewel/build.xml
index fb3ce9b..91b8e184 100644
--- a/frameworks/projects/Jewel/build.xml
+++ b/frameworks/projects/Jewel/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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" />
@@ -104,7 +120,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Language/build.xml b/frameworks/projects/Language/build.xml
index 035db4b..3c5a1cd 100644
--- a/frameworks/projects/Language/build.xml
+++ b/frameworks/projects/Language/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/MXRoyale/build.xml b/frameworks/projects/MXRoyale/build.xml
index 92c2207..f22649e 100644
--- a/frameworks/projects/MXRoyale/build.xml
+++ b/frameworks/projects/MXRoyale/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" />
diff --git a/frameworks/projects/MXRoyale/src/test/royale/build.xml b/frameworks/projects/MXRoyale/src/test/royale/build.xml
index 8755bd2..809e288 100644
--- a/frameworks/projects/MXRoyale/src/test/royale/build.xml
+++ b/frameworks/projects/MXRoyale/src/test/royale/build.xml
@@ -90,7 +90,7 @@
<!--<arg value="-debug" />-->
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/MaterialDesignLite/build.xml b/frameworks/projects/MaterialDesignLite/build.xml
index 8961b9e..920081f 100644
--- a/frameworks/projects/MaterialDesignLite/build.xml
+++ b/frameworks/projects/MaterialDesignLite/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index 6e037d7..8fe068e 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -29,7 +29,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>
@@ -48,7 +56,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>
@@ -59,14 +67,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -88,7 +104,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -100,7 +116,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml
index 659ce4a..208a2ba 100644
--- a/frameworks/projects/Network/build.xml
+++ b/frameworks/projects/Network/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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -107,7 +125,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Network/src/test/royale/build.xml b/frameworks/projects/Network/src/test/royale/build.xml
index 7dde218..4c5d627 100644
--- a/frameworks/projects/Network/src/test/royale/build.xml
+++ b/frameworks/projects/Network/src/test/royale/build.xml
@@ -86,7 +86,7 @@
<arg value="-debug" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml
index 7e09f5c..e0fcee4 100644
--- a/frameworks/projects/Reflection/build.xml
+++ b/frameworks/projects/Reflection/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>
<format property="royale.swc-date" pattern="MM/dd/yy HH:mm Z"/>
@@ -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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -107,7 +125,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/Reflection/src/test/royale/build.xml b/frameworks/projects/Reflection/src/test/royale/build.xml
index 3318e35..1c5bff8 100644
--- a/frameworks/projects/Reflection/src/test/royale/build.xml
+++ b/frameworks/projects/Reflection/src/test/royale/build.xml
@@ -86,7 +86,7 @@
<arg value="-debug" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/RoyaleSite/build.xml b/frameworks/projects/RoyaleSite/build.xml
index 58c17e7..d85bfc8 100644
--- a/frameworks/projects/RoyaleSite/build.xml
+++ b/frameworks/projects/RoyaleSite/build.xml
@@ -29,7 +29,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>
@@ -48,7 +56,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>
@@ -59,14 +67,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -88,7 +104,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -100,7 +116,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/RoyaleUnit/build.xml b/frameworks/projects/RoyaleUnit/build.xml
index 08323d4..da8b292 100644
--- a/frameworks/projects/RoyaleUnit/build.xml
+++ b/frameworks/projects/RoyaleUnit/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>
@@ -47,7 +55,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>
@@ -58,23 +66,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>
@@ -96,7 +114,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -108,7 +126,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml
index 21e1141..20c14d0 100644
--- a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml
+++ b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml
@@ -86,7 +86,7 @@
<arg value="-debug" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/projects/RoyaleUnitUI/build.xml b/frameworks/projects/RoyaleUnitUI/build.xml
index 7c00f01..0be4aaf 100644
--- a/frameworks/projects/RoyaleUnitUI/build.xml
+++ b/frameworks/projects/RoyaleUnitUI/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>
@@ -47,7 +55,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>
@@ -58,23 +66,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>
@@ -96,7 +114,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -108,7 +126,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/SparkRoyale/build.xml b/frameworks/projects/SparkRoyale/build.xml
index 28aafb1..c087140 100644
--- a/frameworks/projects/SparkRoyale/build.xml
+++ b/frameworks/projects/SparkRoyale/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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" />
@@ -104,7 +120,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" />
diff --git a/frameworks/projects/Storage/build.xml b/frameworks/projects/Storage/build.xml
index 5fca2c6..98e8b11 100644
--- a/frameworks/projects/Storage/build.xml
+++ b/frameworks/projects/Storage/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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 line="-metadata.date="${royale.swc-date}"" />
diff --git a/frameworks/projects/TLF/build.xml b/frameworks/projects/TLF/build.xml
index 07ff7d0..9515272 100644
--- a/frameworks/projects/TLF/build.xml
+++ b/frameworks/projects/TLF/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>
<format property="royale.swc-date" pattern="MM/dd/yy HH:mm Z"/>
@@ -45,7 +53,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>
@@ -56,14 +64,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -85,7 +101,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -97,7 +113,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="-warn-public-vars=false" />
<arg value="-js-output-optimization=skipAsCoercions"/>
diff --git a/frameworks/projects/Text/build.xml b/frameworks/projects/Text/build.xml
index 1f25239..24cda6f 100644
--- a/frameworks/projects/Text/build.xml
+++ b/frameworks/projects/Text/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,14 +65,22 @@
</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">
+ <antcall target="test-swf" />
+ </target>
+
+ <target name="test-swf" unless="skip-swf-tests">
<ant dir="src/test/royale" />
</target>
@@ -86,7 +102,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -98,7 +114,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="-warn-public-vars=false" />
<arg value="-compiler.targets=SWF,JSRoyale" />
diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml
index c65fcc5..ed85da8 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -107,7 +125,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="-warn-public-vars=false" />
<arg value="-compiler.targets=SWF,JSRoyale" />
diff --git a/frameworks/projects/XML/src/test/royale/build.xml b/frameworks/projects/XML/src/test/royale/build.xml
index d509f87..0d88f9c 100644
--- a/frameworks/projects/XML/src/test/royale/build.xml
+++ b/frameworks/projects/XML/src/test/royale/build.xml
@@ -86,7 +86,7 @@
<arg value="-debug" />
<arg value="-compiler.targets=SWF" />
<arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${PLAYERGLOBAL_HOME}" />
</mxmlc>
</target>
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/build.xml
index 237e338..755618a 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/build.xml
index 471efd2..36d853d 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/build.xml
index c9f4fe0..cb06821 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/build.xml
index a86e8b9..362f710 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/build.xml
index 03ed0f7..9434f29 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/build.xml
index 80c8926..66d28eb 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/build.xml
index 2c1dcca..d48348b 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/build.xml
index 1994847..4d7c17b 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/build.xml
index ed372f0..3af9672 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/build.xml
index f9968f7..99ccbcb 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/build.xml
index c20c0ed..35d6d70 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/build.xml
index 2bcdd0f..4696b27 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/build.xml
index 7dabeef..1c46d37 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/build.xml
index 8cb9c8b..6c458fa 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/build.xml
index 258adc9..faaaecf 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/build.xml
index 6acb2c5..af2b4a5 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/build.xml
index 863d764..bb25f7b 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/build.xml
index 091c685..83e8726 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/build.xml
index e6f0269..1f4bc06 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/build.xml
index b90da5e..13fcd6a 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/build.xml
index b1b771d..e2b32a9 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/build.xml
index 78f755b..7a8ac4a 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/build.xml
index a349361..6e8cb1f 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/build.xml
index d50ea88..adfe1c3 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/build.xml
index deb0b4b..86c201e 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/build.xml
index f256419..0447a18 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/build.xml
index c821ebb..b2f6db5 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/build.xml
index b2d033e..a845364 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/build.xml
index ee090a2..3abbbe3 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/build.xml
index f758c70..6778ba4 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/build.xml
index 21cbc71..02cb4b3 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/build.xml
index 8a31f55..7c6f1e8 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/build.xml
index 6a1c997..b8cefe8 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/build.xml
index 18d633d..0344114 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/build.xml
index 8787a4b..6d62976 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/build.xml
index 99fda1d..d717b0c 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/build.xml
index 84ba469..fd2bd3e 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/build.xml
index 9d71d52..5b9de3f 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/build.xml
index 1a92bbe..1f1a979 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/build.xml
index 8703612..7bced1c 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/build.xml
index e809231..7c0ac7c 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/build.xml
index 378b250..a0b9a09 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/build.xml
index 73643ee..4ceee81 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/build.xml
index 4dfa0a2..c1c33a8 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/build.xml
index 5d7644e..7e3c390 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/build.xml
index f7a751c..6ee275f 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/build.xml
index 8e18b12..7cb13b0 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/build.xml
index b69d3f7..1240c8f 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/build.xml
index 0ed529b..05664d8 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/build.xml
index 258abf0..9508a9a 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/build.xml
index e27c074..eb6c579 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/build.xml
index 22c0b3d..5086f27 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/build.xml
index b0605ab..e9d3275 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/build.xml
index f989f80..f667411 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/build.xml
index 1fdccf4..98712c5 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/build.xml
index e9b68b2..8e4603e 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/build.xml
index 0c3d1dc..2a3c6e4 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/build.xml
index 4f2d748..d7d8432 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/build.xml
index 76c2462..c8f7884 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/build.xml
index a915e73..bda430c 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/build.xml
index 6ffbe8b..6438f36 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/build.xml
index b308ff9..db44a6a 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/build.xml
index 12c451d..f3aa298 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/build.xml
index f598863..21cf648 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/build.xml
index 7dbca28..a98ae41 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/build.xml
index c3f51b9..567e4c9 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/build.xml
index b4c181c..f149d4d 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/build.xml
index b4acb96..b2f48f0 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/build.xml
index 7ceb5b6..62e7a45 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/build.xml
index b08521a..d8a86c5 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/build.xml
index cc8d9ac..2c52867 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/build.xml
index f069cfc..c91f774 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/build.xml
index 54451a8..8500c66 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/build.xml
index 48026cd..94c0e80 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/build.xml
index 1c9ee07..ef6b6f3 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/build.xml
index 2af8235..fb09203 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/build.xml
index 669b87d..d4fc512 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/build.xml
index 9c2980b..2fcb6a8 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/build.xml
index d94eb9d..a40866d 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/build.xml
index 0703c9a..efb0dfa 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/build.xml
index eaa14df..ce0dfd1 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/build.xml
index 0b2fae3..682f81b 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/build.xml
index 2d76d9e..a0f1012 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/build.xml
index 23da6da..f6b3a20 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/build.xml
index 4c9680a..d4cc689 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/build.xml
index 25f82db..3683da7 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/build.xml
index 16fc6d2..bf03dd6 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/build.xml
index 7fe6c76..635f0be 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/build.xml
index 5ab582d..e091177 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/build.xml
index b5a8690..cf348d6 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/build.xml
index ba1e99d..150881f 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/build.xml
index ffdbb31..e551773 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/build.xml
index e3fbe03..146f3da 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/build.xml
index fb7ada3..d571108 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/build.xml
index 3ae945a..1d10961 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/build.xml
index 0b0e77b..991ca8d 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/build.xml
index 2d7d0c1..d1d345b 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/build.xml
index 945ecba..9f693c6 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/build.xml
index 3608474..e751845 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/build.xml
index 5c84154..39eac93 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/build.xml
index 8482b5b..6209071 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/build.xml
index 63297af..afd474a 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/build.xml
index 842bbf2..2f958de 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/build.xml
index 6e87caf..beb3d6a 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/build.xml
index e0c505a..3c28c1a 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/build.xml
index 6634d73..c85b03c 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/build.xml
index 6c61058..75b6bc7 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/build.xml
index c61dd28..ce99262 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/build.xml
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/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" />
<!-- doesn't contain compiled files so only need to compile JS version -->
@@ -44,7 +52,7 @@
-->
</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>
@@ -78,7 +86,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -90,7 +98,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="-output=${basedir}/target/${target.name}" />
diff --git a/frameworks/themes/JewelTheme/build.xml b/frameworks/themes/JewelTheme/build.xml
index 4c6b871..8144af5 100644
--- a/frameworks/themes/JewelTheme/build.xml
+++ b/frameworks/themes/JewelTheme/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>
@@ -35,13 +43,13 @@
</tstamp>
<echo>swc-date is ${royale.swc-date}</echo>
- <echo>AIR_HOME is ${env.AIR_HOME}</echo>
+ <echo>AIR_HOME is ${AIR_HOME}</echo>
<!-- doesn't contain compiled files so only need to compile JS version -->
<target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
</target>
- <target name="compile-js" unless="env.AIR_HOME">
+ <target name="compile-js" unless="AIR_HOME">
<ant dir="${ROYALE_HOME}/frameworks/js/themes/${ant.project.name}JS/" inheritAll="false" >
<property name="ROYALE_SWF_COMPILER_HOME" value="${ROYALE_SWF_COMPILER_HOME}"/>
<property name="ROYALE_COMPILER_HOME" value="${ROYALE_COMPILER_HOME}"/>
@@ -51,7 +59,7 @@
<copy file="${ROYALE_HOME}/frameworks/js/themes/${ant.project.name}JS/target/${ant.project.name}JS.swc" tofile="${ROYALE_HOME}/frameworks/libs/${target.name}" />
</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>
@@ -85,7 +93,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">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
<echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
@@ -97,7 +105,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 line="-metadata.date="${royale.swc-date}"" />