You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/04 09:57:42 UTC
[royale-asjs] branch feature/new_merge updated: Got rid of falcon
references
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/new_merge by this push:
new 7a9f983 Got rid of falcon references
7a9f983 is described below
commit 7a9f983edab77753efc1c7f3bf9dbb6dc9f75a8e
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Sep 4 12:57:34 2018 +0300
Got rid of falcon references
---
examples/royale/Flex2Royale/build.xml | 4 +-
frameworks/js/projects/TestingJS/build.xml | 59 +++++++++++-----------
frameworks/projects/Testing/build.xml | 34 ++++++-------
.../projects/Testing/src/test/royale/build.xml | 6 +--
4 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/examples/royale/Flex2Royale/build.xml b/examples/royale/Flex2Royale/build.xml
index 4458870..06b92aa 100644
--- a/examples/royale/Flex2Royale/build.xml
+++ b/examples/royale/Flex2Royale/build.xml
@@ -50,8 +50,8 @@
</target>
<target name="json" unless="json.exists" >
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <java jar="${FALCONJX_HOME}/lib/asdoc.jar" resultProperty="errorCode"
+ <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
+ <java jar="${ROYALE_COMPILER_HOME}/lib/asdoc.jar" resultProperty="errorCode"
fork="true">
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Droyalelib=${ROYALE_HOME}/frameworks}"/>
diff --git a/frameworks/js/projects/TestingJS/build.xml b/frameworks/js/projects/TestingJS/build.xml
index 63b8a0d..4467a63 100644
--- a/frameworks/js/projects/TestingJS/build.xml
+++ b/frameworks/js/projects/TestingJS/build.xml
@@ -51,23 +51,22 @@
<target name="compile" depends="check-compiler">
<echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
<mkdir dir="${basedir}/target/generated-sources/royale"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
+ <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
<jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" />
- <arg value="+royalelib=${FLEX_HOME}/frameworks" />
+ <arg value="+royalelib=${ROYALE_HOME}/frameworks" />
<arg value="-compiler.strict-xml=true" />
<arg value="-compiler.targets=SWF,JSRoyale" />
<arg value="-output=${basedir}/target/${target.name}" />
- <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config=${ROYALE_HOME}/frameworks/js-config.xml" />
<arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
</java>
<copy file="${basedir}/target/${target.name}" tofile="${ROYALE_HOME}/frameworks/js/libs/${target.name}" />
</target>
-
+
<target name="copy-js" >
<mkdir dir="${ROYALE_HOME}/frameworks/js/generated-sources"/>
<copy todir="${ROYALE_HOME}/frameworks/js/generated-sources">
@@ -77,49 +76,49 @@
</copy>
</target>
- <target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
+ <target name="check-compiler" depends="check-compiler-home, check-transpiler-home">
<path id="lib.path">
- <fileset dir="${FALCONJX_HOME}/lib" includes="falcon-royaleTasks.jar"/>
+ <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/>
</path>
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
</target>
- <target name="check-falcon-home" unless="FALCON_HOME"
- description="Check FALCON_HOME is a directory.">
+ <target name="check-compiler-home" unless="ROYALE_SWF_COMPILER_HOME"
+ description="Check ROYALE_SWF_COMPILER_HOME is a directory.">
- <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
+ <echo message="ROYALE_SWF_COMPILER_HOME is ${env.ROYALE_SWF_COMPILER_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/compiler-mxmlc.jar"
+ <available file="${env.ROYALE_SWF_COMPILER_HOME}/lib/compiler-mxmlc.jar"
type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
+ property="ROYALE_SWF_COMPILER_HOME"
+ value="${env.ROYALE_SWF_COMPILER_HOME}"/>
- <available file="${ROYALE_HOME}/../royale-falcon/compiler/lib/compiler-mxmlc.jar"
+ <available file="${ROYALE_HOME}/../royale-compiler/compiler/lib/compiler-mxmlc.jar"
type="file"
- property="FALCON_HOME"
- value="${ROYALE_HOME}/../royale-falcon/compiler"/>
+ property="ROYALE_SWF_COMPILER_HOME"
+ value="${ROYALE_HOME}/../royale-compiler/compiler"/>
- <fail message="FALCON_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"
- unless="FALCON_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"
+ unless="ROYALE_SWF_COMPILER_HOME"/>
</target>
- <target name="check-falconjx-home" unless="FALCONJX_HOME"
- description="Check FALCON_HOME is a directory.">
+ <target name="check-transpiler-home" unless="ROYALE_COMPILER_HOME"
+ description="Check ROYALE_SWF_COMPILER_HOME is a directory.">
- <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
+ <echo message="ROYALE_COMPILER_HOME is ${env.ROYALE_COMPILER_HOME}"/>
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
+ <available file="${env.ROYALE_COMPILER_HOME}/lib/jsc.jar"
type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
+ property="ROYALE_COMPILER_HOME"
+ value="${env.ROYALE_COMPILER_HOME}"/>
- <available file="${ROYALE_HOME}/../royale-falcon/compiler-jx/lib/jsc.jar"
+ <available file="${ROYALE_HOME}/../royale-compiler/compiler-jx/lib/jsc.jar"
type="file"
- property="FALCONJX_HOME"
- value="${ROYALE_HOME}/../royale-falcon/compiler-jx"/>
+ property="ROYALE_COMPILER_HOME"
+ value="${ROYALE_HOME}/../royale-compiler/compiler-jx"/>
- <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in royale-compiler repo or the js folder of a Royale SDK"
- unless="FALCONJX_HOME"/>
+ <fail message="ROYALE_COMPILER_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in royale-compiler repo or the js folder of a Royale SDK"
+ unless="ROYALE_COMPILER_HOME"/>
</target>
</project>
diff --git a/frameworks/projects/Testing/build.xml b/frameworks/projects/Testing/build.xml
index b63d0d1..e0361c4 100644
--- a/frameworks/projects/Testing/build.xml
+++ b/frameworks/projects/Testing/build.xml
@@ -62,8 +62,7 @@
<target name="compile-js">
<ant dir="${ROYALE_HOME}/frameworks/js/projects/${ant.project.name}JS/" inheritAll="false" >
- <property name="FALCON_HOME" value="${FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${FALCONJX_HOME}"/>
+ <property name="ROYALE_COMPILER_HOME" value="${ROYALE_COMPILER_HOME}"/>
<property name="FLEX_HOME" value="${FLEX_HOME}"/>
</ant>
</target>
@@ -105,11 +104,10 @@
<target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
- <echo message="FALCON_HOME: ${FALCON_HOME}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
<echo message="FLEXUNIT_HOME: ${FLEXUNIT_HOME}"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
+ <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
<jvmarg value="-Droyalelib=${FLEX_HOME}/frameworks" />
@@ -126,35 +124,35 @@
</java>
</target>
- <target name="check-compiler" depends="check-falcon-home,check-falconjx-home">
+ <target name="check-compiler" depends="check-compiler-home,check-transpiler-home">
<path id="lib.path">
- <fileset dir="${FALCONJX_HOME}/lib" includes="falcon-royaleTasks.jar"/>
+ <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="compiler-royaleTasks.jar"/>
</path>
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
</target>
- <target name="check-falcon-home"
- description="Set FALCON_HOME to point at the compiler.">
+ <target name="check-compiler-home"
+ description="Set ROYALE_SWF_COMPILER_HOME to point at the compiler.">
<available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar"
type="file"
- property="FALCON_HOME"
+ property="ROYALE_SWF_COMPILER_HOME"
value="${ROYALE_HOME}"/>
- <fail message="FALCON_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="FALCON_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 the root of a Royale SDK"
+ unless="ROYALE_SWF_COMPILER_HOME"/>
</target>
- <target name="check-falconjx-home"
- description="Set FALCONJX_HOME to point at the cross-compiler.">
+ <target name="check-transpiler-home"
+ description="Set ROYALE_COMPILER_HOME to point at the cross-compiler.">
<available file="${ROYALE_HOME}/js/lib/jsc.jar"
type="file"
- property="FALCONJX_HOME"
+ property="ROYALE_COMPILER_HOME"
value="${ROYALE_HOME}/js"/>
- <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in royale-compiler repo or the js folder of a Royale SDK"
- unless="FALCONJX_HOME"/>
+ <fail message="ROYALE_COMPILER_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in royale-compiler repo or the js folder of a Royale SDK"
+ unless="ROYALE_COMPILER_HOME"/>
</target>
-
+
</project>
diff --git a/frameworks/projects/Testing/src/test/royale/build.xml b/frameworks/projects/Testing/src/test/royale/build.xml
index b99be2f..422093e 100644
--- a/frameworks/projects/Testing/src/test/royale/build.xml
+++ b/frameworks/projects/Testing/src/test/royale/build.xml
@@ -26,7 +26,7 @@
<property environment="env"/>
<property file="${ROYALE_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
- <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
+ <property name="ROYALE_COMPILER_HOME" value="${env.ROYALE_COMPILER_HOME}"/>
<property name="target.name" value="Core-${release.version}.swc" />
<!-- adding flexuint style meta collection, and additional testing meta tags (Event,Bindable,TestMeta)-->
@@ -89,13 +89,13 @@
</target>
<path id="lib.path">
- <fileset dir="${FALCONJX_HOME}/lib" includes="falcon-royaleTasks.jar"/>
+ <fileset dir="${ROYALE_COMPILER_HOME}/lib" includes="falcon-royaleTasks.jar"/>
</path>
<target name="compile" description="Compiles FlexUnitApplication.swf">
<echo message="Compiling FlexUnitRoyaleApplication.swf"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
- <echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
<echo message="FLEXUNIT_HOME: ${FLEXUNIT_HOME}"/>
<echo message="playerglobal.version: ${playerglobal.version}"/>