Hey Alex, I'll be sure give it a try and make any necessary fixes, if it doesn't work.
- Josh On 2019/05/23 01:22:23, Alex Harui <aha...@adobe.com.INVALID> wrote: > Please make sure "ant all" from a newly cloned royale-asjs repo is not broken > by this change. > > Thanks, > -Alex > > On 5/22/19, 11:12 AM, "joshtynj...@apache.org" <joshtynj...@apache.org> > wrote: > > This is an automated email from the ASF dual-hosted git repository. > > joshtynjala pushed a commit to branch develop > in repository > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7C54fe9df3ab3848d42b6a08d6dee1081e%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C636941455501423441&sdata=GxfNLG%2FX%2FbcninbFt5K0XG9vxFHblQr5YMIuYtP1%2F4Y%3D&reserved=0 > > > The following commit(s) were added to refs/heads/develop by this push: > new e18d7d7 Build files for JS libraries find the compilers the > same way as the build files for SWF libraries > e18d7d7 is described below > > commit e18d7d747cd7898f04f07e91f2c71b217275340f > Author: Josh Tynjala <joshtynj...@apache.org> > AuthorDate: Wed May 22 11:11:54 2019 -0700 > > Build files for JS libraries find the compilers the same way as the > build files for SWF libraries > > Previously, the inconsistent detection could cause JS and SWF > libraries to be built with different local compilers. It also caused JS > builds to fail to find closure-lib in some cases. > --- > frameworks/js/projects/AceJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/BasicJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/BindingJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/ChartsJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/CollectionsJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/CoreJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/CreateJSJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/DragDropJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/EffectsJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/ExpressJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/FlatJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/FontAwesomeJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/FormattersJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/GoogleMapsJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/GraphicsJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/HTML5JS/build.xml | 34 > ++++++------------- > frameworks/js/projects/HTMLJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/IconsJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/JQueryJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/JewelJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/LanguageJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/MXRoyaleJS/build.xml | 34 > ++++++------------- > .../js/projects/MaterialDesignLiteJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/MobileJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/NetworkJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/ReflectionJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/RoyaleSiteJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/RoyaleUnitJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/SparkRoyaleJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/StorageJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/TLFJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/TextJS/build.xml | 34 > ++++++------------- > frameworks/js/projects/XMLJS/build.xml | 38 > +++++++--------------- > 33 files changed, 332 insertions(+), 794 deletions(-) > > diff --git a/frameworks/js/projects/AceJS/build.xml > b/frameworks/js/projects/AceJS/build.xml > index 5aabe59..b1444d2 100644 > --- a/frameworks/js/projects/AceJS/build.xml > +++ b/frameworks/js/projects/AceJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/BasicJS/build.xml > b/frameworks/js/projects/BasicJS/build.xml > index 436e1c9..e555ee6 100644 > --- a/frameworks/js/projects/BasicJS/build.xml > +++ b/frameworks/js/projects/BasicJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/BindingJS/build.xml > b/frameworks/js/projects/BindingJS/build.xml > index 6d6747f..a27186b 100644 > --- a/frameworks/js/projects/BindingJS/build.xml > +++ b/frameworks/js/projects/BindingJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/ChartsJS/build.xml > b/frameworks/js/projects/ChartsJS/build.xml > index 03a3fbc..55bdcce 100644 > --- a/frameworks/js/projects/ChartsJS/build.xml > +++ b/frameworks/js/projects/ChartsJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/CollectionsJS/build.xml > b/frameworks/js/projects/CollectionsJS/build.xml > index bbde442..e6569e8 100644 > --- a/frameworks/js/projects/CollectionsJS/build.xml > +++ b/frameworks/js/projects/CollectionsJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/CoreJS/build.xml > b/frameworks/js/projects/CoreJS/build.xml > index 5b3a33d..d04fd0b 100644 > --- a/frameworks/js/projects/CoreJS/build.xml > +++ b/frameworks/js/projects/CoreJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/CreateJSJS/build.xml > b/frameworks/js/projects/CreateJSJS/build.xml > index d6c86d2..d262177 100644 > --- a/frameworks/js/projects/CreateJSJS/build.xml > +++ b/frameworks/js/projects/CreateJSJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/DragDropJS/build.xml > b/frameworks/js/projects/DragDropJS/build.xml > index f0c25ec..c786ee2 100644 > --- a/frameworks/js/projects/DragDropJS/build.xml > +++ b/frameworks/js/projects/DragDropJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/EffectsJS/build.xml > b/frameworks/js/projects/EffectsJS/build.xml > index cf0012c..af55846 100644 > --- a/frameworks/js/projects/EffectsJS/build.xml > +++ b/frameworks/js/projects/EffectsJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/ExpressJS/build.xml > b/frameworks/js/projects/ExpressJS/build.xml > index d0736a1..c971e9c 100644 > --- a/frameworks/js/projects/ExpressJS/build.xml > +++ b/frameworks/js/projects/ExpressJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/FlatJS/build.xml > b/frameworks/js/projects/FlatJS/build.xml > index feda52e..859a607 100644 > --- a/frameworks/js/projects/FlatJS/build.xml > +++ b/frameworks/js/projects/FlatJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/FontAwesomeJS/build.xml > b/frameworks/js/projects/FontAwesomeJS/build.xml > index 5f313a6..6be0b50 100644 > --- a/frameworks/js/projects/FontAwesomeJS/build.xml > +++ b/frameworks/js/projects/FontAwesomeJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/FormattersJS/build.xml > b/frameworks/js/projects/FormattersJS/build.xml > index 6f0efac..6917432 100644 > --- a/frameworks/js/projects/FormattersJS/build.xml > +++ b/frameworks/js/projects/FormattersJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/GoogleMapsJS/build.xml > b/frameworks/js/projects/GoogleMapsJS/build.xml > index c3e05f6..6ba5f05 100644 > --- a/frameworks/js/projects/GoogleMapsJS/build.xml > +++ b/frameworks/js/projects/GoogleMapsJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/GraphicsJS/build.xml > b/frameworks/js/projects/GraphicsJS/build.xml > index 5f1e396..9322990 100644 > --- a/frameworks/js/projects/GraphicsJS/build.xml > +++ b/frameworks/js/projects/GraphicsJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/HTML5JS/build.xml > b/frameworks/js/projects/HTML5JS/build.xml > index 9748bf3..2d13b6f 100644 > --- a/frameworks/js/projects/HTML5JS/build.xml > +++ b/frameworks/js/projects/HTML5JS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/HTMLJS/build.xml > b/frameworks/js/projects/HTMLJS/build.xml > index a863a8a..8403149 100644 > --- a/frameworks/js/projects/HTMLJS/build.xml > +++ b/frameworks/js/projects/HTMLJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/IconsJS/build.xml > b/frameworks/js/projects/IconsJS/build.xml > index fba5946..fa47e3d 100644 > --- a/frameworks/js/projects/IconsJS/build.xml > +++ b/frameworks/js/projects/IconsJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/JQueryJS/build.xml > b/frameworks/js/projects/JQueryJS/build.xml > index 4ce8092..306717f 100644 > --- a/frameworks/js/projects/JQueryJS/build.xml > +++ b/frameworks/js/projects/JQueryJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/JewelJS/build.xml > b/frameworks/js/projects/JewelJS/build.xml > index 151360c..29435ee 100644 > --- a/frameworks/js/projects/JewelJS/build.xml > +++ b/frameworks/js/projects/JewelJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/LanguageJS/build.xml > b/frameworks/js/projects/LanguageJS/build.xml > index f07ec67..d51aed9 100644 > --- a/frameworks/js/projects/LanguageJS/build.xml > +++ b/frameworks/js/projects/LanguageJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/MXRoyaleJS/build.xml > b/frameworks/js/projects/MXRoyaleJS/build.xml > index b18022a..fcfda9c 100644 > --- a/frameworks/js/projects/MXRoyaleJS/build.xml > +++ b/frameworks/js/projects/MXRoyaleJS/build.xml > @@ -78,46 +78,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/MaterialDesignLiteJS/build.xml > b/frameworks/js/projects/MaterialDesignLiteJS/build.xml > index d6633a4..e8a8252 100644 > --- a/frameworks/js/projects/MaterialDesignLiteJS/build.xml > +++ b/frameworks/js/projects/MaterialDesignLiteJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/MobileJS/build.xml > b/frameworks/js/projects/MobileJS/build.xml > index 5eff344..b1cc93a 100644 > --- a/frameworks/js/projects/MobileJS/build.xml > +++ b/frameworks/js/projects/MobileJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/NetworkJS/build.xml > b/frameworks/js/projects/NetworkJS/build.xml > index 3c6af03..3261460 100644 > --- a/frameworks/js/projects/NetworkJS/build.xml > +++ b/frameworks/js/projects/NetworkJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/ReflectionJS/build.xml > b/frameworks/js/projects/ReflectionJS/build.xml > index 612c051..059eef0 100644 > --- a/frameworks/js/projects/ReflectionJS/build.xml > +++ b/frameworks/js/projects/ReflectionJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/RoyaleSiteJS/build.xml > b/frameworks/js/projects/RoyaleSiteJS/build.xml > index 5463375..9b49b60 100644 > --- a/frameworks/js/projects/RoyaleSiteJS/build.xml > +++ b/frameworks/js/projects/RoyaleSiteJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/RoyaleUnitJS/build.xml > b/frameworks/js/projects/RoyaleUnitJS/build.xml > index 82e5b33..cbbae4a 100644 > --- a/frameworks/js/projects/RoyaleUnitJS/build.xml > +++ b/frameworks/js/projects/RoyaleUnitJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/SparkRoyaleJS/build.xml > b/frameworks/js/projects/SparkRoyaleJS/build.xml > index 60a3a44..25b1c09 100644 > --- a/frameworks/js/projects/SparkRoyaleJS/build.xml > +++ b/frameworks/js/projects/SparkRoyaleJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/StorageJS/build.xml > b/frameworks/js/projects/StorageJS/build.xml > index bc847d3..aafdef3 100644 > --- a/frameworks/js/projects/StorageJS/build.xml > +++ b/frameworks/js/projects/StorageJS/build.xml > @@ -76,46 +76,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/TLFJS/build.xml > b/frameworks/js/projects/TLFJS/build.xml > index 4421592..365a798 100644 > --- a/frameworks/js/projects/TLFJS/build.xml > +++ b/frameworks/js/projects/TLFJS/build.xml > @@ -78,46 +78,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/TextJS/build.xml > b/frameworks/js/projects/TextJS/build.xml > index c24b747..4a80346 100644 > --- a/frameworks/js/projects/TextJS/build.xml > +++ b/frameworks/js/projects/TextJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > diff --git a/frameworks/js/projects/XMLJS/build.xml > b/frameworks/js/projects/XMLJS/build.xml > index 491d50a..423821a 100644 > --- a/frameworks/js/projects/XMLJS/build.xml > +++ b/frameworks/js/projects/XMLJS/build.xml > @@ -77,46 +77,32 @@ > </copy> > </target> > > - <target name="check-compiler" depends="check-compiler-home, > check-transpiler-home"> > + <target name="check-compiler" > depends="check-compiler-home,check-transpiler-home"> > <path id="lib.path"> > <fileset dir="${ROYALE_COMPILER_HOME}/lib" > includes="compiler-royaleTasks.jar"/> > </path> > <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> > </target> > - > - <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_SWF_COMPILER_HOME is > ${env.ROYALE_SWF_COMPILER_HOME}"/> > - > - <available > file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar" > - type="file" > - property="ROYALE_SWF_COMPILER_HOME" > - value="${env.ROYALE_SWF_COMPILER_HOME}"/> > + > + <target name="check-compiler-home" > + description="Set ROYALE_SWF_COMPILER_HOME to point at the > compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar" > + <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar" > type="file" > property="ROYALE_SWF_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler"/> > + value="${ROYALE_HOME}"/> > > - <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or a Royale SDK folder" > + <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder > with a lib sub-folder containing compiler-mxmlc.jar such as the compiler > folder in royale-compiler repo or the root of a Royale SDK" > unless="ROYALE_SWF_COMPILER_HOME"/> > </target> > - > - <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME" > - description="Check ROYALE_SWF_COMPILER_HOME is a directory."> > - > - <echo message="ROYALE_COMPILER_HOME is > ${env.ROYALE_COMPILER_HOME}"/> > - > - <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar" > - type="file" > - property="ROYALE_COMPILER_HOME" > - value="${env.ROYALE_COMPILER_HOME}"/> > + > + <target name="check-transpiler-home" > + description="Set ROYALE_COMPILER_HOME to point at the > cross-compiler."> > > - <available > file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar" > + <available file="${ROYALE_HOME}/js/lib/jsc.jar" > type="file" > property="ROYALE_COMPILER_HOME" > - value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/> > + value="${ROYALE_HOME}/js"/> > > <fail message="ROYALE_COMPILER_HOME must be set to a folder with > a lib sub-folder containing jsc.jar such as the compiler-jx folder in > royale-compiler repo or the js folder of a Royale SDK" > unless="ROYALE_COMPILER_HOME"/> > > > >
