You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2017/10/31 00:24:00 UTC
[royale-compiler] 04/06: remove most references to 'falcon' and
rewrite README and RELEASE_NOTES
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit b10908bb42fcb153526e7b099e4d88130c7fa5bf
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Oct 24 12:10:12 2017 -0700
remove most references to 'falcon' and rewrite README and RELEASE_NOTES
---
ApproveFalcon.xml | 12 +-
README | 202 +++++++++++----------
README_JX | 143 ---------------
RELEASE_NOTES | 74 +-------
RELEASE_NOTES_JX | 201 --------------------
apache-flex-falcon-installer-config.xml | 2 +-
build.xml | 12 +-
compiler-jx/.classpath | 2 +-
compiler-jx/.project | 4 +-
compiler-jx/build.xml | 8 +-
.../internal/codegen/as/TestStatements.java | 2 +-
.../codegen/js/goog/TestGoogStatements.java | 2 +-
.../codegen/js/royale/TestRoyaleExpressions.java | 12 +-
.../codegen/js/royale/TestRoyaleStatements.java | 4 +-
.../royale/compiler/internal/test/ASTestBase.java | 2 +-
compiler/build.xml | 36 ++--
compiler/pom.xml | 4 +-
compiler/src/assembly/scripts/swcdepends | 12 +-
compiler/src/assembly/scripts/swcdepends.bat | 4 +-
.../compiler/config/ConfigurationBuffer.java | 2 +-
.../compiler/fxg/flex/FlexFXG2SWFTranscoder.java | 2 +-
.../royale/compiler/internal/mxml/MXMLData.java | 4 +-
.../internal/mxml/MXMLTagAttributeData.java | 2 +-
.../royale/compiler/internal/mxml/MXMLTagData.java | 2 +-
compiler/src/test/build.xml | 38 ++--
jenkins.xml | 12 +-
royale-ant-tasks/build.xml | 18 +-
.../org/apache/royale/compiler/ant/FlexTask.java | 4 +-
royale-ant-tasks/src/test/build.xml | 8 +-
29 files changed, 223 insertions(+), 607 deletions(-)
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index e799008..be9dd1e 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -59,7 +59,7 @@
<property name="apache.rat.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/0.11" />
<property name="apache.rat.tasks.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat-tasks/0.11" />
- <property file="${basedir}/approvefalcon.properties"/>
+ <property file="${basedir}/approveroyale.properties"/>
<property name="mac.text.display" value="cat" />
<property name="win.text.display" value="type" />
@@ -111,7 +111,7 @@
unless="release.version"/>
<condition property="package.url.path"
- value="http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon%20release%20branch/lastSuccessfulBuild/artifact/out">
+ value="http://apacheflexbuild.cloudapp.net:8080/job/flex-royale%20release%20branch/lastSuccessfulBuild/artifact/out">
<not>
<isset property="rc" />
</not>
@@ -123,11 +123,11 @@
</not>
</condition>
- <property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/falcon/${release.version}/rc${rc}" />
+ <property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/royale/${release.version}/rc${rc}" />
<property name="src.package.url.path" value="${package.url.path}" />
<property name="bin.package.url.path" value="${package.url.path}/binaries" />
- <property name="src.package.url.name" value="apache-flex-falconjx-${release.version}-src" />
- <property name="bin.package.url.name" value="apache-flex-falconjx-${release.version}-bin" />
+ <property name="src.package.url.name" value="apache-flex-royalejx-${release.version}-src" />
+ <property name="bin.package.url.name" value="apache-flex-royalejx-${release.version}-bin" />
<condition property="zip.package">
<equals arg1="zip" arg2="${package.suffix}" />
@@ -189,7 +189,7 @@
<delete file="jars.txt" />
<!-- this is a comma-delimited, no spaces, no-line-breaks list used to decide which jars
to skip in the rat-check of the binaries and which jars to examine before approval -->
- <property name="jars-list" value="compiler/lib/compc.jar,compiler/lib/compiler.jar,compiler/lib/compiler-asc.jar,compiler/lib/compiler-compc.jar,compiler/lib/compiler-mxmlc.jar,compiler/lib/compiler-optimizer.jar,compiler/lib/compiler-swfdump.jar,compiler/lib/fdb.jar,compiler/lib/flex-compiler-oem.jar,js/lib/asdoc.jar,js/lib/falcon-flexTasks.jar,js/lib/compc.jar,js/lib/externc.jar,js/lib/jsc.jar,js/lib/mxmlc.jar"/>
+ <property name="jars-list" value="compiler/lib/compc.jar,compiler/lib/compiler.jar,compiler/lib/compiler-asc.jar,compiler/lib/compiler-compc.jar,compiler/lib/compiler-mxmlc.jar,compiler/lib/compiler-optimizer.jar,compiler/lib/compiler-swfdump.jar,compiler/lib/fdb.jar,compiler/lib/flex-compiler-oem.jar,js/lib/asdoc.jar,js/lib/royale-flexTasks.jar,js/lib/compc.jar,js/lib/externc.jar,js/lib/jsc.jar,js/lib/mxmlc.jar"/>
<echo file="${basedir}/jars.txt" message="${jars-list}"/>
<echo file="${basedir}/jarexcludes.txt" message="${jars-list}"/>
<replaceregexp file="${basedir}/jarexcludes.txt" match="," flags="g" replace="${line.separator}" />
diff --git a/README b/README
index 71caa47..8b87274 100644
--- a/README
+++ b/README
@@ -1,19 +1,14 @@
Apache Royale Compiler
====================
- This Apache Flex Compiler is also known as the 'Falcon' compiler. It is
- the next-generation replacement to the MXMLC compiler that is currently
- bundled with the Apache Flex SDK and is based on the Adobe ASC2.0 code base
- donated to Apache by Adobe Systems Inc.
-
- This Compiler may also be packaged with the Apache Flex Cross-Compiler which
- has additional information in the README_JX file.
-
- For detailed information about Apache Flex please visit
- http://flex.apache.org/
-
- This compiler may eventually replace MXMLC in the Apache Flex SDK, but is
- also being used as the compiler for the Apache Royale SDK. Royale is a
+ This Apache Royale Compiler was formerly known as the 'Falcon' compiler. It was
+ originally destined to be the next-generation replacement to the MXMLC compiler
+ that is currently bundled with the Apache Flex SDK. This compiler is based on the
+ Adobe ASC2.0 code base donated to Apache by Adobe Systems Inc.
+
+ The compiler has been modified and extended to transpile MXML and ActionScript
+ to JavaScript and potentially other output definitions and is
+ now being used as the compiler for the Apache Royale SDK. Royale is a
next-generation SDK that allows the developer to leverage MXML and ActionScript
to build applications that not only run as a SWF, but can also be cross-compiled
to JavaScript and run natively in a browser or anywhere JavaScript runs.
@@ -21,8 +16,9 @@ Apache Royale Compiler
Getting the latest sources via git
==================================
- Getting the source code is the recommended way to get the Apache Flex Compiler.
- We also offer an automated installer along with binary distributions on our
+ Getting the source code is the recommended way to get the Apache Royale Compiler.
+ The compiler can also be installed by installing an Apache Royale SDK via NPM
+ or by unpacking an Apache Royale binary distributions available from link on our
website at http://royale.apache.org/.
You can always checkout the latest source via git using the following
@@ -32,68 +28,65 @@ Getting the latest sources via git
cd royale-compiler
git checkout develop
- When working with the sources from Git, the Apache Flex Compiler
- also requires code from other Apache Flex git repositories or an Apache Flex SDK.
- These Apache Flex SDK source files are bundled in Apache Flex Falcon
+ When working with the sources from Git, the Apache Royale Compiler
+ also requires code from the Apache Royale Typedefs git repositories.
+ These Apache Royale Typedefs source files are bundled in Apache Royale Compiler
source code distributions, so this step is optional when using source code
distributions.
- To get the latest source via git for the Apache Flex SDK use the following command:
+ To get the latest source via git for the Apache Royale Typedefs use the
+ following command:
- git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git flex-sdk
- cd flex-sdk
+ git clone https://github.com/apache/royale-typedefs.git royale-typedefs
+ cd royale-typedefs
git checkout develop
- The Apache Flex SDK requires the Text Layout Framework repository which
- you can get as follows:
-
- git clone https://git-wip-us.apache.org/repos/asf/flex-tlf.git flex-tlf
- cd flex-tlf
- git checkout develop
-
- To use an Apache Flex SDK, install an Apache Flex SDK on your computer and
- follow the instructions in 'Install Prerequisites'.
-
-Building the Apache Flex Compiler
+Building the Apache Royale Compiler
=================================
- The Apache Flex Compiler is a large project. It requires some build tools
+ The Apache Royale Compiler is a large project. It requires some build tools
which must be installed prior to building the compiler and it depends on
some external software which are downloaded as part of the build process.
Some of these have different licenses. See the Software Dependencies section
for more information on the external software dependencies.
- Linux support is currently experimental and while it is possible to compile
- the SDK it has not been fully tested so you may run into issues.
+ Linux support is currently experimental has not been fully tested so you
+ may run into issues.
Install Prerequisites
---------------------
+
+ You can build the Apache Royale Compiler with Apache Maven or Apache Ant.
+ See build instructions later in this file.
- Before building the Apache Flex Compiler you must install the following software
- and set the corresponding environment variables using absolute file paths.
- Relative file paths will result in build errors.
+ Before building the Apache Royale Compiler with Apache Ant you must install
+ the following software and set the corresponding environment variables using
+ absolute file paths. Relative file paths will result in build errors. If
+ you do not want to set environment variables for the optional settings,
+ you may put the entries in an env.properties file as described in the
+ Running Tests section.
==================================================================================
SOFTWARE ENVIRONMENT VARIABLE (absolute paths)
==================================================================================
- Java SDK 1.6 or greater (*1) JAVA_HOME
+ Java SDK 1.7 or greater (*1) JAVA_HOME
(for Java 1.7 see note at (*2))
- Ant 1.7.1 or greater (*1) ANT_HOME
+ Ant 1.7.1 or greater (*1) ANT_HOME
(for Java 1.7 see note at (*2))
- Adobe AIR Integration Kit (*3) AIR_HOME
+ Optional: Apache Royale SDK or repository (*3) ASJS_HOME
- Adobe Flash Player Content Debugger (*4) FLASHPLAYER_DEBUGGER
+ Optional: Adobe AIR Integration Kit (*4) AIR_HOME
- Adobe Flash Player playerglobal swcs (*5) PLAYERGLOBAL_HOME
+ Optional: Adobe Flash Player Content Debugger (*5) FLASHPLAYER_DEBUGGER
- Optional: Apache Flex SDK or repository (*6) FLEX_HOME
+ Optional: Adobe Flash Player playerglobal swcs (*6) PLAYERGLOBAL_HOME
- Optional: Apache Flex TLF source (*7) TLF_HOME
+ Optional: Apache Flex SDK or repository (*7) FLEX_HOME
- Optional: Flex Messaging Common (*8) BLAZEDS_HOME
+ Optional: Apache Flex TLF source (*8) TLF_HOME
==================================================================================
@@ -115,7 +108,16 @@ Install Prerequisites
version as 1.6 so the JVM args for the data model (-d32/-d64) will not
be set correctly and you will get compile errors.
- *3) The Adobe AIR integration kit for Windows can be downloaded from:
+ *3) This option is only required to run additional tests to verify that the compiler
+ can output Royale applications that use Royale framework SWCs.
+
+ Set the ASJS_HOME variable to the root of the Apache Royale SDK or
+ royale-asjs repository.
+
+ *4) This option is only required to run additional tests to verify that the compiler
+ can output SWFs.
+
+ The Adobe AIR integration kit for Windows can be downloaded from:
http://airdownload.adobe.com/air/win/download/4.0/AdobeAIRSDK.zip
The Adobe AIR integration kit for Mac can be downloaded from:
@@ -127,7 +129,10 @@ Install Prerequisites
Download the AIR SDK for your platform and unzip it. Set AIR_HOME to the
absolute path of the AIR SDK directory.
- *4) The Adobe Flash Player content debuggers can be found here:
+ *5) This option is only required to run additional tests to verify that the compiler
+ can output SWFs.
+
+ The Adobe Flash Player content debuggers can be found here:
http://www.adobe.com/support/flashplayer/downloads.html
On Windows, set FLASHPLAYER_DEBUGGER to the absolute path including the
@@ -141,7 +146,10 @@ Install Prerequisites
On Linux, set FLASHPLAYER_DEBUGGER to the absolute path of
flashplayerdebugger
- *5) The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
+ *6) This option is only required to run additional tests to verify that the compiler
+ can output SWFs.
+
+ The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc
Use URL above to download playerglobal11_1.swc.
@@ -160,31 +168,29 @@ Install Prerequisites
frameworks/libs/player/<version.major>.<version.minor>/playerglobal.swc
- These can be used with the Apache Flex Compiler but not all have not been fully
+ These can be used with the Apache Royale Compiler but not all have not been fully
tested.
- *6) The FLEX_HOME variable should point to a folder of the flex-sdk sources.
+ *7) This option is only required to run additional tests to verify that the compiler
+ can output SWFs.
+
+ The FLEX_HOME variable should point to a folder of the flex-sdk sources.
If you don’t provide this variable (and TLF_HOME and BLAZEDS_HOME),
you may not be able to run all of the tests in the compiler
and compiler-jx folders.
- *7) The TLF_HOME variable should point to a folder containing a folder
+ *8) This option is only required to run additional tests to verify that the compiler
+ can output SWFs.
+
+ The TLF_HOME variable should point to a folder containing a folder
named textLayout that contains a src folder of the TLF sources.
This should be the root of the flex-tlf repository, or can be
- the frameworks/projects folder of an IDE compatible Flex SDK.
-
- *8) The build scripts assume that the root folder containing the source code
- for Apache Flex BlazeDS ('flex-blazeds') is at the same level as the
- SDK root folder ('flex-sdk'). See 'Getting the source code', below. If this
- is not the case on your system, then you must set the BLAZEDS_HOME environment
- variable to point to your BLAZEDS root folder. If you are using a released
- artifact, the source should be included in the artifact, so setting
- BLAZEDS_HOME is not required.
+ the frameworks/projects folder of an IDE compatible Royale SDK.
Software Dependencies
---------------------
- The Apache Flex Compiler uses third-party code that will be downloaded as
+ The Apache Royale Compiler uses third-party code that will be downloaded as
part of the build.
The Apache Version 2.0 license is in the LICENSE file.
@@ -192,9 +198,10 @@ Software Dependencies
The following dependencies have licenses which are, or are compatible with,
the Apache Version 2.0 license. You will not be prompted to acknowledge the
download. Most of the jars are installed in lib/external when installed
- into an Apache Flex SDK and the lib folder in the repository working copy.
+ into an Apache Royale SDK and the lib folder in the repository working copy.
antlr - https://repo1.maven.org/maven2/org/antlr/antlr-complete/3.5.2/antlr-3.5.2-complete.jar
+ args4j = http://search.maven.org/remotecontent?filepath=args4j/args4j/2.0.28/args4j-2.0.28.jar
commons-cli - https://repo1.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2-bin.tar.gz
commons-io - https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.tar.gz
commons-lang - https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.tar.gz
@@ -204,45 +211,48 @@ Software Dependencies
jburg - https://repo1.maven.org/maven2/net/sourceforge/jburg/jburg/1.10.2/jburg-1.10.2.jar
jflex - http://jflex.de/jflex-1.6.0.tar.gz
lzma - http://www.java2s.com/Code/JarDownload/lzma/lzma-9.20.jar.zip
+ Google Closure Compiler - http://github.com/google/closure-compiler/archive/v 20151015.zip
-Using the Binary Distribution
------------------------------
+Running Tests
+-------------
+
+ The build processes will attempt to run some tests. Before running some of the
+ functional or feature tests you will need to set the environment variables described
+ earlier, or set up a env.properties file with those settings.
- The binary distribution is intended to be installed into an existing Apache Flex
- SDK or Apache Royale SDK.
+ A template is found here: env-template.properties.
- There is an Apache Ant script in the binary distribution that will copy the
- files into the right places.
+ Some tests of SWF output may use the Adobe Flash Player or Adobe AIR to
+ run a SWF. If you plan to run those tests, ensure that the folder
+ containing the source code is in your Flash Player Trust files.
- To run it, use:
- ant -f installer.xml -DFLEX_HOME=<path to Flex or Royale SDK
+Building the Source in the Source Distribution
+----------------------------------------------
- The script does not check the FLEX_HOME environment variable as that often
- points to your primary Flex SDK.
+ You can build the compiler via Apache Maven or Apache Ant.
- If you expand the binary distribution into the "in" folder of an Apache Flex or
- Royale SDK, the installer.xml script should find FLEX_HOME automatically.
+ To build the Apache Royale Compiler with Apache Maven, you must first build
+ the utils profile without the main profile and then the main profile.
+ So, first run:
- Another option is to use the InstallApacheFlex (version 3.0 or higher).
+ mvn clean install -P -main,utils
-Building the Source in the Source Distribution
-----------------------------------------------
+ Then run
- When you have all the prerequisites in place and the environment variables
- set (see Install Prerequisites above), one final thing to check is whether
- the folder contain the source code is in your Flash Player Trust files as
- the build script runs the Flash Player Debugger as part of its automated
- tests. Once you've done that, use
+ mvn clean install
+
+ To build the Apache Royale Compiler with Apache Ant, first make sure you
+ have all the prerequisites in place and the environment variables
+ set (see Install Prerequisites above). Once you've done that, use
- cd <falcon.dir>
ant main (or just ant since the default target is main)
- to download the thirdparty dependencies and build the source. Since the
+ to download the third-party dependencies and build the source. Since the
third-party dependencies take a little while to download and they don't
change very often, they are not cleaned with the regular clean target.
- To clean the build, of everything other than the downloaded third-party
+ To clean the build of everything other than the downloaded third-party
dependencies use
ant clean
@@ -263,14 +273,24 @@ Building the Source in the Source Distribution
ant -projecthelp
-Running Tests
--------------
+Using the Binary Distribution
+-----------------------------
+
+ The binary artifacts produced by the Maven build are then used by Maven projects
+ to build Apache Royale applications. See the archetypes in the royale-asjs repo
+ or the examples in the royale-asjs repo.
-Before running unit-, functional- or feature-tests you may need to create a
-compiler/src/tests/unittest.properties file
+ The binaries produced by the Apache Ant build are intended to be packaged into an
+ Apache Royale SDK to create Apache Royale applications via Ant.
-A template is found here compiler/src/main/resources/template-unittest.properties.
+ To temporarily use a set of binary artifacts when building Apache Royale
+ applications with Apache Ant, set the ROYALE_COMPILER_HOME property as an
+ environment variable or property when running Ant to build the Apache Royale
+ application.
+ To replace the current Royale Compiler binaries in a Apache Royale SDK,
+ run the copy-compiler target from the Ant script in the Apache Royale SDK and
+ set ROYALE_COMPILER_HOME when running that target.
Thanks for using Apache Royale. Enjoy!
diff --git a/README_JX b/README_JX
deleted file mode 100644
index c728349..0000000
--- a/README_JX
+++ /dev/null
@@ -1,143 +0,0 @@
-Apache Royale Cross-Compiler
-====================
-
- This Apache Royale Cross-Compiler is also known as the 'FalconJX' compiler. It
- leverages code from the Apache Royale Compiler but outputs JavaScript
- instead of a SWF.
-
- For detailed information about Apache Royale please visit
- http://royale.apache.org/
-
- This compiler is used in the Apache Royale SDK. Royale is a
- next-generation SDK that allows the developer to leverage MXML and ActionScript
- to build applications that not only run as a SWF, but can also be cross-compiled
- to JavaScript and run natively in a browser or anywhere JavaScript runs.
-
-Getting the latest sources via git
-==================================
-
- Getting the source code is the recommended way to get the Apache Royale Cross-Compiler.
- We also offer an automated installer along with binary distributions on our
- website at http://royale.apache.org/.
-
- You can always checkout the latest source via git using the following
- command:
-
- git clone https://github.com/apache/royale-compiler.git royale-compiler
- cd royale-compiler
- git checkout develop
-
- See the main README for instructions on setting up and building the Apache
- Royale cross-compiler.
-
-Building the Apache Royale Cross-Compiler
-=======================================
-
- The Apache Royale Cross-Compiler is a large project. It requires that the
- Apache Royale Compiler has been built. See the main README for instructions.
-
- Linux support is currently experimental and while it is possible to compile
- the SDK it has not been fully tested so you may run into issues.
-
-Install Prerequisites
----------------------
-
- Before building the Apache Royale FalconJX Compiler you must install the same
- software as specified in the main README. In addition, you may also need:
-
- ==================================================================================
- SOFTWARE ENVIRONMENT VARIABLE (absolute paths)
- ==================================================================================
-
- Apache Royale SDK or repository ASJS_HOME
-
- ==================================================================================
-
- *1) Set the ASJS_HOME variable to the root of the Apache Royale SDK or repository.
- This is optional and only required to run the Royale dependent tests in
- the compiler-jx folder.
-
-Software Dependencies
----------------------
-
- The Apache Royale Cross-Compiler uses third-party code that will be downloaded as
- part of the build.
-
- The Apache Version 2.0 license is in the LICENSE file.
-
- The following dependencies have licenses which are, or are compatible with,
- the Apache Version 2.0 license. You will not be prompted to acknowledge the
- download. Most of the jars are installed in lib/external when installed
- into an Apache Royale SDK and the lib folder in the repository working copy.
-
- args4j = http://search.maven.org/remotecontent?filepath=args4j/args4j/2.0.28/args4j-2.0.28.jar
- Google Closure Compiler - http://github.com/google/closure-compiler/archive/v 20151015.zip
- commons-io - https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.tar.gz
-
-
-Using the Binary Distribution
------------------------------
-
- The binary distribution is intended to be installed into an existing
- Apache Royale SDK.
-
- There is an Apache Ant script in the binary distribution that will copy the
- files into the right places.
-
- To run it, use:
- ant -f installer.xml -DFLEX_HOME=<path to Royale SDK
-
- The script does not check the FLEX_HOME environment variable as that often
- points to your primary Flex SDK.
-
- If you expand the binary distribution into the "in" folder of an Apache
- Royale SDK, the installer.xml script should find FLEX_HOME automatically.
-
- Another option is to use the InstallApacheFlex (version 3.0 or higher).
-
-Building the Source in the Source Distribution
-----------------------------------------------
-
- When you have all the prerequisites in place and the environment variables
- set (see Install Prerequisites above), use
-
- cd <falcon.dir>
- ant all
-
- to download the thirdparty dependencies and build the source. Since the
- third-party dependencies take a little while to download and they don't
- change very often, they are not cleaned with the regular clean target.
-
- To clean the build, of everything other than the downloaded third-party
- dependencies use
-
- ant clean-all
-
- To clean the build, of everything, including the downloaded third-party
- dependencies use
-
- ant wipe-all (which is just thirdparty-clean followed by clean)
-
- To generate a source distribution package and a binary distribution package
- use
-
- ant -Dbuild.number=<YYYYMMDD> -Dbuild.noprompt= release
-
- The packages can be found in the "out" subdirectory.
-
- To get a brief listing of all the targets type
-
- ant -projecthelp
-
-
-Running Tests
----------------------
-
-Before running unit-, functional- or feature-tests you may need to create a unittest.properties file ( template is found here compiler/src/main/resources/template-unittest.properties ).
-
-
-
-Thanks for using Apache Royale. Enjoy!
-
- The Apache Royale Project
- <http://royale.apache.org>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 6d24f5f..0dceb98 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,68 +1,18 @@
-Apache Flex 'Falcon' Compiler 0.8.0
+Apache Royale Compiler 0.9.0
=================
-Apache Flex 'Falcon' Compiler 0.8.0 is the sixth release of a next-generation
-compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
-compiler for Apache FlexJS SDKs.
+Apache Royale Compiler 0.9.0 is the first release of a next-generation
+compiler for building Apache Royale applications.
-The compiler is now biased towards building Apache FlexJS projects. The Ant
-tasks now point to the cross-compiler, which can now build both SWFs and
-cross-compiler (transpile) MXML and AS to JS.
-
-Lots of bug fixes and other small improvements are included in this release.
-See the RELEASE_NOTES_JX file for a list of resolved issues.
-
-Apache Flex 'Falcon' Compiler 0.7.0
-=================
-Apache Flex 'Falcon' Compiler 0.7.0 is the fifth release of a next-generation
-compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
-compiler for Apache FlexJS SDKs.
-
-This release includes Maven artifacts.
-
-Lots of bug fixes and other small improvements are included in this release.
-
-Apache Flex 'Falcon' Compiler 0.6.0
-=================
-Apache Flex 'Falcon' Compiler 0.6.0 is the fourth release of a next-generation
-compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
-compiler for Apache FlexJS SDKs.
-
-Lots of bug fixes and other small improvements are included in this release.
-
-Apache Flex 'Falcon' Compiler 0.5.0
-=================
-Apache Flex 'Falcon' Compiler 0.5.0 is the third release of a next-generation
-compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
-compiler for Apache FlexJS SDKs.
-
-Lots of bug fixes and other small improvements are included in this release.
-
-Apache Flex 'Falcon' Compiler 0.0.2
-=================
-Apache Flex 'Falcon' Compiler 0.0.2 is the second release of a next-generation
-compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
-compiler for Apache FlexJS SDKs.
-
-The only changes in this release are for build script dependencies.
-
-Apache Flex 'Falcon' Compiler 0.0.1
-=================
-
-Apache Flex 'Falcon' Compiler 0.0.1 is the initial release of a next-generation
-compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
-compiler for Apache FlexJS SDKs. It is based on the Adobe ASC2.0 compiler but
-officially supports MXML compilation and includes some bug fixes. This is an
-'alpha' type of release. Expect to find lots of bugs and missing features, but
-please file bugs and contribute fixes.
+The compiler was previously released by the Apache Flex project. You can
+see RELEASE_NOTES for earlier releases in the Apache Flex releases.
Known Issues
_____________
Adobe Flash Builder Integration
-The Apache Flex Falcon compiler should work in Adobe Flash Builder 4.7, but does
-not support incremental compilation and may compile the project even if nothing
-has changed.
+The Apache Royale Compiler can be used in Adobe Flash Builder 4.7, but does
+not support incremental compilation or clean non-SWF output.
Unit Test results in compiler.tests
@@ -73,16 +23,6 @@ Compilation Warnings
The Java compiler will report warnings for several files in this release.
-Files in compiler/src/assembly/scripts
-
-The files in compiler/src/assembly/scripts are templates used to create a 'final' SDK. You cannot run the files in compiler/src/assembly/scripts. Instead, the installer.xml script or Apache Flex SDK Installer will create a bin folder with working scripts.
-
-Compiling with the Flex SDK
-
-This compiler has only been tested against the FlexJS SDK which does not exercise all
-of the features of the Flex SDK, so results of compiling against the Flex SDK are
-not guaranteed.
-
Please report new issues to our bugbase at:
https://issues.apache.org/jira/browse/FLEX
diff --git a/RELEASE_NOTES_JX b/RELEASE_NOTES_JX
deleted file mode 100644
index f683ea8..0000000
--- a/RELEASE_NOTES_JX
+++ /dev/null
@@ -1,201 +0,0 @@
-Apache Flex 'FalconJX' Cross-Compiler 0.8.0
-=================
-
-Apache Flex 'FalconJX' Compiler 0.8.0 is the next-generation
-compiler that, instead of creating a SWF or SWC, cross compiles MXML and ActionScript
-to JavaScript. It is intended for use as the cross-compiler for Apache FlexJS SDKs.
-
-This release includes Maven artifacts.
-
-In addition, lots of bug fixes and small improvements are included in this release.
-
-New Features
-=================
--FLEX-35186 Generate source maps for MXML files
-
-Bug Fixes
----------
--FLEX-35323 NullPointerException when setting property of <fx:Object/> with binding
--FLEX-35317 Generated require() call for Node.js modules does not produce valid code if module name includes dashes
--FLEX-35316 -version compiler option does not show version
--FLEX-35300 Could not find file for class: Error
--FLEX-35239 Runtime error when setting a property to a constant value
--FLEX-35236 Binding is not working when [Bindable] is set for the class
--FLEX-35231 [FalconJX] Context Lost on Event Listeners
--FLEX-35230 [FlexJS] Add SonarQube support and setup build jobs to run sonar scans of all modules
--FLEX-35229 [FlexJS] extend the flexjs-maven-plugin to be able to generate static asdoc html
--FLEX-35228 [FlexJS] Usage of statics in JSSharedData causes problems
--FLEX-35227 [FlexJS] Data Binding Fails When Following Multiple References
--FLEX-35226 [Falcon] Compiler crashes with stack trace if MXML file is empty
--FLEX-35221 EXTERNC stops reading input files if one is missing, but continues without creating a problem
--FLEX-35218 FlexJS Errors unable to debug
--FLEX-35209 [FalconJX] asjsc prints Java exeception when using -skip-transpile=true
--FLEX-35206 Javascript isn't produced correctly when beads are not the first element of View
--FLEX-35199 Array.removeAt() is broken in javascript mode in 0.8 dev
--FLEX-35196 [FlexJS] [FalconJX] Default method parameter that is static constant does not emit fully-qualified class name
--FLEX-35195 [FalconJX] "Generated byte code contains an operand stack underflow." when creating <js:Tree> with <js:HierarchicalCollection> in MXML
--FLEX-35190 [FlexJS] DataItemRenderer breaks if extends as MXML file
--FLEX-35184 Unclosed CDATA in MXML Script tag or AS E4x leads to infinite loop in compiler
--FLEX-35183 Unclosed XML comment in MXML or E4X leads to infinite loop in compiler
--FLEX-35173 In MXML CDATA Can't have EOF characters
--FLEX-35171 CSS color RGB not set in component
--FLEX-35143 Backslash escape problem
--FLEX-35141 [FlexJS] XML literals don't add quotes when interpolated to values
--FLEX-35140 uncaught exception on missing parens
--FLEX-35133 Make FalconJX console error output match MXMLC output
--FLEX-35131 XML literal not outputting correctly
--FLEX-35116 private setter not accessible from class using this
--FLEX-35114 static constants in constructor don't compile correctly
--FLEX-35113 Error evaluating XML variable
--FLEX-35112 Escape Backslashes not Retained in String Literals, Result in Syntax Error
--FLEX-35070 "for each" not working in XMLList
--FLEX-35060 Local function doesn't use self to reference class members
--FLEX-35050 NullPointerException in compiler.jx
--FLEX-35014 new vector
--FLEX-34873 implement --keep-as3-metadata in FLEXJS_INFO
-
-Apache Flex 'FalconJX' Cross-Compiler 0.7.0
-=================
-
-Apache Flex 'FalconJX' Compiler 0.7.0 is the fifth release of a next-generation
-compiler that, instead of creating a SWF or SWC, cross compiles MXML and ActionScript
-to JavaScript. It is intended for use as the cross-compiler for Apache FlexJS SDKs.
-
-This release includes Maven artifacts.
-
-The ability to use source maps to see your ActionScript source in the browser debugger is introduced in this release. The implementation is likely to have bugs.
-
-In addition, lots of bug fixes and small improvements are included in this release.
-
-Bug Fixes
----------
--FLEX-35109 falcon compiler's build.xml error
--FLEX-35107 Error setting property of class when the type is XML
--FLEX-35104 [FlexJS] Binding Problem in Flash
--FLEX-35091 Style 'box-shadow': Compiler wrongly adds commas as separators between values
--FLEX-35081 Null Pointer Exception in attempt of overriding data property in item renderer
--FLEX-35077 Missed case of XML assingment
--FLEX-35074 Wrong method used for setting XML attributes
--FLEX-35073 Multiline XML literal not compiled correctly
--FLEX-35072 "+" operator failure on XMLList
--FLEX-35071 Extra "this" causing error
--FLEX-35067 XML literals are not compiled into constructors when the variable was already initialized
--FLEX-35066 XML literals passed into functions are not compiled correctly
--FLEX-35065 Object literals don't always work
-
-Apache Flex 'FalconJX' Cross-Compiler 0.6.0
-=================
-
-Apache Flex 'FalconJX' Compiler 0.6.0 is the fourth release of a next-generation
-compiler that, instead of creating a SWF or SWC, cross compiles MXML and ActionScript
-to JavaScript. It is intended for use as the cross-compiler for Apache FlexJS SDKs.
-
-Highlights in this release include:
-- Output data structures required for reflection.
-- Initial implementation of Proxy.
-- Support for functions and variables in packages.
-
-In addition, lots of bug fixes and small improvements are included in this release.
-
-Bug Fixes
----------
--FLEX-35053 Compiler does not respect the implements="..." attribute in MXML
--FLEX-35033 State Transition issue in FlexJS
--FLEX-35006 bug in mxmlc/compc/etc scripts when flexjs path contains spaces
--FLEX-35005 internal class members do not get prefixed with "this." when cross-compiling
--FLEX-35004 package-level functions do not get cross-compiled
--FLEX-34995 call to Language.closure() generated incorrectly when function is static
--FLEX-34994 single-line asdoc comment /**...*/ generates invalid JS output
--FLEX-34993 implicit super() constructor call receives subclass constructor params
--FLEX-34992 Missing FLEXJS_CLASS_INFO in class internal to a file
--FLEX-34991 Problem with setter/getter in .as file with multiple classes
--FLEX-34990 "new" operator combined with function invocation cross-compiles incorrectly
--FLEX-34989 String literals cross-compile incorrectly
--FLEX-34987 Parentheses are lost around ternary operator
--FLEX-34986 const class member variables get initialized incorrectly
--FLEX-34985 "is" and "as" operators cross-compile incorrectly when using class member variables
--FLEX-34984 for-each loops cross-compile incorrectly
--FLEX-34983 Variables get annotated incorrectly when the class name contains "String"
--FLEX-34771 Cross-Compile from AS to JS fails to generate "super" call.
--FLEX-33918 Unknown type error generated for known type
--FLEX-33917 Fully qualified class missing
-
-Apache Flex 'FalconJX' Cross-Compiler 0.5.0
-=================
-
-Apache Flex 'FalconJX' Compiler 0.5.0 is the third release of a next-generation
-compiler that, instead of creating a SWF or SWC, cross compiles MXML and ActionScript
-to JavaScript. It is intended for use as the cross-compiler for Apache FlexJS SDKs.
-
-Highlights in this release include:
-- ExternC compiler that generates ActionScript SWCs from Google Closure Library
-Externs for Common Libraries. This enables the use of ActionScript to write
-JavaScript for native JavaScript applications.
-- Integration with IntelliJ. You can now use Falcon and FalconJX in IntelliJ. See
-the wiki for instructions: https://cwiki.apache.org/confluence/display/FLEX/Using+FlexJS+with+IntelliJ+IDEA
-
-In addition, lots of bug fixes and small improvements are included in this release.
-
-Bug Fixes
----------
--FLEX-34915 Shorthand for Vector (new <String>[]) doesn't transpile to []
--FLEX-34913 Types passed by reference should not be stored on the prototype because they are shared by all instances
--FLEX-34912 Object class in JS.swc is not dynamic, resulting in error when setting properties
--FLEX-34897 Scope is wrong when calling member function from a variable reference
--FLEX-34875 spec for the d.as (ActionScript definition) file (a library SWC)
--FLEX-34874 d.ts parser/tokenizer for simple API generation
--FLEX-34872 A HTML.swc needs to be created for the DOM API
--FLEX-34871 A builtin.swc, non playerglobal needs to be created for non FlexJS compiler runs
--FLEX-34552 FalconJX should be aware of Date properties
--FLEX-34544 Preserve ASDoc style comments
-
-
-Apache Flex 'FalconJX' Cross-Compiler 0.0.2
-=================
-
-Apache Flex 'FalconJX' Compiler 0.0.2 is the second release of a next-generation
-compiler that, instead of creating a SWF or SWC, cross compiles MXML and ActionScript
-to JavaScript. It is intended for use as the cross-compiler for Apache FlexJS SDKs.
-
-The only major change in this release is to speed up cross-compilation by only copying a subset of the Google Closure Library files to the output folder.
-
-Bug Fixes
----------
--FLEX-34258 Error cross-compiling on Windows
--FLEX-34225 Configurations dependent on loading order of methods
-
-Apache Flex 'FalconJX' Cross-Compiler 0.0.1
-=================
-
-Apache Flex 'FalconJX' Compiler 0.0.1 is the initial release of a next-generation
-compiler that, instead of creating a SWF or SWC, cross compiles MXML and ActionScript
-to JavaScript. It is intended for use as the cross-compiler for Apache FlexJS SDKs.
-It is an extension of the Apache Flex 'Falcon' Compiler.
-
-Bug Fixes
----------
--FLEX-34224 An option to specifiy the output folder is missing
--FLEX-33925 goog.require not being generated
-
-Known Issues
-_____________
-
-Unimplemented Compiler Features
-
-The FlexJS SDK does not support embedding of assets or fonts and the compiler may
-not handle embedding correctly and may even throw errors.
-
-Flex SDK is not supported.
-
-The FalconJX cross-compiler only supports compilation against a FlexJS SDK, not the Apache Flex SDK.
-
-Command-line Usage
-
-The FalconJX cross-compiler supports multiple output types. They are specified to mxmlc and compc scripts and batch files via the options -js-output-type. Only -js-output-type=FLEXJS is supported.
-
-Please report new issues to our bugbase at:
-
- https://issues.apache.org/jira/browse/FLEX
-
- The Apache Flex Project
- <http://flex.apache.org/>
diff --git a/apache-flex-falcon-installer-config.xml b/apache-flex-falcon-installer-config.xml
index 29fa919..5a07168 100644
--- a/apache-flex-falcon-installer-config.xml
+++ b/apache-flex-falcon-installer-config.xml
@@ -79,7 +79,7 @@
<en_US>Copy Falcon Compiler files</en_US>
</step>
</steps>
- <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexfalcon.install">
+ <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexroyale.install">
<el_GR>
<label>Apache Flex Falcon (Απαιτούμενο)</label>
<message>Για το Apache Flex Falcon ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache Flex Falcon;</message>
diff --git a/build.xml b/build.xml
index beb9085..12c24cd 100644
--- a/build.xml
+++ b/build.xml
@@ -18,15 +18,15 @@
-->
-<project name="falcon" default="main" basedir=".">
+<project name="royale" default="main" basedir=".">
<property file="${basedir}/env.properties"/>
<property environment="env"/>
<property file="${basedir}/local.properties"/>
<property file="${basedir}/build.properties"/>
- <property name="kit.prefix" value="apache-flex-falcon-${release.version}"/>
- <property name="kit.jx.prefix" value="apache-flex-falconjx-${release.version}"/>
+ <property name="kit.prefix" value="apache-flex-royale-${release.version}"/>
+ <property name="kit.jx.prefix" value="apache-flex-royalejx-${release.version}"/>
<property name="source.kit" value="${kit.prefix}-src"/>
<property name="binary.kit" value="${kit.prefix}-bin"/>
<property name="source.jx.kit" value="${kit.jx.prefix}-src"/>
@@ -495,7 +495,7 @@
</target>
<target name="stage-source-jx"
- description="Package jx source files with other falcon files required to build in zip file" >
+ description="Package jx source files with other royale files required to build in zip file" >
<copy tofile="${basedir}/temp/LICENSE" file="${basedir}/LICENSE.jx" overwrite="true"/>
<copy todir="${basedir}/temp" >
@@ -667,8 +667,8 @@
<copy todir="${basedir}/out">
<fileset dir="${basedir}">
- <include name="apache-flex-falcon-installer-config.xml"/>
- <include name="apache-flex-falconjx-installer-config.xml"/>
+ <include name="apache-flex-royale-installer-config.xml"/>
+ <include name="apache-flex-royalejx-installer-config.xml"/>
</fileset>
</copy>
</target>
diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath
index 35c205d..419d10a 100644
--- a/compiler-jx/.classpath
+++ b/compiler-jx/.classpath
@@ -13,6 +13,6 @@
<classpathentry kind="lib" path="lib/flex-tool-api.jar"/>
<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/COMMONS_COMPRESS"/>
- <classpathentry kind="lib" path="/Users/aharui/git/flex/master/flex-falcon/compiler/lib/external/commons-lang-2.6.jar"/>
+ <classpathentry kind="lib" path="/Users/aharui/git/royale/ant/royale-compiler/compiler/lib/external/commons-lang-2.6.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/compiler-jx/.project b/compiler-jx/.project
index f6d9327..83db59b 100644
--- a/compiler-jx/.project
+++ b/compiler-jx/.project
@@ -29,11 +29,11 @@
<variableList>
<variable>
<name>COMPILER_BUILD_TOOLS</name>
- <value>file:/Users/aharui/git/flex/master/flex-falcon/compiler-build-tools/src/main/java</value>
+ <value>file:/Users/aharui/git/royale/ant/royale-compiler/compiler-build-tools/src/main/java</value>
</variable>
<variable>
<name>COMPILER_TEST_UTILS</name>
- <value>file:/Users/aharui/git/flex/master/flex-falcon/compiler-test-utils/src/main/java</value>
+ <value>file:/Users/aharui/git/royale/ant/royale-compiler/compiler-test-utils/src/main/java</value>
</variable>
</variableList>
</projectDescription>
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 35a9367..78fead6 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -47,8 +47,8 @@
<property name="src" value="${basedir_clean}/src/main/java" />
<property name="lib" value="${basedir_clean}/lib" />
- <property name="falcon.basedir" value="${basedir_clean}/../compiler" />
- <property name="falcon.lib.dir" value="${falcon.basedir}/lib" />
+ <property name="royale.basedir" value="${basedir_clean}/../compiler" />
+ <property name="royale.lib.dir" value="${royale.basedir}/lib" />
<property name="classes.dir" value="${basedir_clean}/target/classes" />
@@ -65,7 +65,7 @@
<property name="build.number" value="0"/>
<path id="classpath">
- <filelist dir="${falcon.lib.dir}/external">
+ <filelist dir="${royale.lib.dir}/external">
<file name="antlr.jar" />
<file name="commons-lang-2.6.jar" />
</filelist>
@@ -88,7 +88,7 @@
source="${javac.src}" target="${javac.src}">
<src path="${src}" />
<classpath>
- <pathelement path="${falcon.basedir}/target/classes" />
+ <pathelement path="${royale.basedir}/target/classes" />
</classpath>
</javac>
</target>
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
index 41f0c01..f3bcec6 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
@@ -464,6 +464,6 @@ public class TestStatements extends ASTestBase
+ "foo: for each(var i:int in obj) break foo;",
IFileNode.class);
asBlockWalker.visitFile(node);
- assertOut("package {\n\tpublic class FalconTest_A {\n\t\tfunction falconTest_a():void {\n\t\t\ttry {\n\t\t\t\ta;\n\t\t\t} catch (e:Error) {\n\t\t\t\tif (a) {\n\t\t\t\t\tif (b) {\n\t\t\t\t\t\tif (c)\n\t\t\t\t\t\t\tb;\n\t\t\t\t\t\telse if (f)\n\t\t\t\t\t\t\ta;\n\t\t\t\t\t\telse\n\t\t\t\t\t\t\te;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} finally {\n\t\t\t}\n\t\t\tif (d)\n\t\t\t\tfor (var i:int = 0; i < len; i++)\n\t\t\t\t\tbreak;\n\t\t\tif (a) {\n\t\t\t\twith (ab) {\n\t\t\t\t\tc();\n\t\t\t\t [...]
+ assertOut("package {\n\tpublic class FalconTest_A {\n\t\tfunction royaleTest_a():void {\n\t\t\ttry {\n\t\t\t\ta;\n\t\t\t} catch (e:Error) {\n\t\t\t\tif (a) {\n\t\t\t\t\tif (b) {\n\t\t\t\t\t\tif (c)\n\t\t\t\t\t\t\tb;\n\t\t\t\t\t\telse if (f)\n\t\t\t\t\t\t\ta;\n\t\t\t\t\t\telse\n\t\t\t\t\t\t\te;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} finally {\n\t\t\t}\n\t\t\tif (d)\n\t\t\t\tfor (var i:int = 0; i < len; i++)\n\t\t\t\t\tbreak;\n\t\t\tif (a) {\n\t\t\t\twith (ab) {\n\t\t\t\t\tc();\n\t\t\t\t [...]
}
}
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
index 7b795db..d9a644e 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
@@ -298,7 +298,7 @@ public class TestGoogStatements extends TestStatements
+ "foo: for each(var i:int in obj) break foo;",
IFileNode.class);
asBlockWalker.visitFile(node);
- assertOut("goog.provide('FalconTest_A');\n\n/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\nFalconTest_A.prototype.falconTest_a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\ [...]
+ assertOut("goog.provide('FalconTest_A');\n\n/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\nFalconTest_A.prototype.royaleTest_a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\ [...]
}
@Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
index 75c4f86..e3dc0e6 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
@@ -91,7 +91,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
" * Prevent renaming of class. Needed for reflection.\n" +
" */\n" +
"goog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
- "FalconTest_A.prototype.falconTest_a = function() {\n" +
+ "FalconTest_A.prototype.royaleTest_a = function() {\n" +
" var self = this;\n" +
" ;\n" +
" function isDefaultPrevented() {\n" +
@@ -1073,7 +1073,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
IFunctionNode node = (IFunctionNode) getNode("var a = function(){};",
IFunctionNode.class);
asBlockWalker.visitFunction(node);
- assertOut("FalconTest_A.prototype.falconTest_a = function() {\n" +
+ assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
" var self = this;\n" +
" var /** @type {Function} */ __localFn0__ = function() {\n" +
" }\n" +
@@ -1089,7 +1089,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
"var a:Object = function(foo:int, bar:String = 'goo'):int{return -1;};",
IFunctionNode.class);
asBlockWalker.visitFunction(node);
- assertOut("FalconTest_A.prototype.falconTest_a = function() {\n" +
+ assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
" var self = this;\n" +
" var /** @type {Function} */ __localFn0__ = function(foo, bar) {\n" +
" bar = typeof bar !== 'undefined' ? bar : 'goo';\n" +
@@ -1107,7 +1107,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
"addListener('foo', function(event:Object):void{doit();})",
IFunctionNode.class);
asBlockWalker.visitFunction(node);
- assertOut("FalconTest_A.prototype.falconTest_a = function() {\n" +
+ assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
" var self = this;\n" +
" var /** @type {Function} */ __localFn0__ = function(event) {\n" +
" doit();\n" +
@@ -1123,7 +1123,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
"var a:Object = {}; var b:Function = function(foo:Object) { foo.bar = 10 }; var c:Object = b(a);",
IFunctionNode.class);
asBlockWalker.visitFunction(node);
- assertOut("FalconTest_A.prototype.falconTest_a = function() {\n" +
+ assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
" var self = this;\n" +
" var /** @type {Function} */ __localFn0__ = function(foo) {\n foo.bar = 10;\n }\n" +
" var /** @type {Object} */ a = {};\n" +
@@ -1138,7 +1138,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
"var a:Object = {}; function b(foo:Object) { foo.bar = 10 }; var c:Object = b(a);",
IFunctionNode.class);
asBlockWalker.visitFunction(node);
- assertOut("FalconTest_A.prototype.falconTest_a = function() {\n" +
+ assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
" var self = this;\n" +
" function b(foo) {\n foo.bar = 10;\n };\n" +
" var /** @type {Object} */ a = {};\n" +
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
index c540f6c..a46d97a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
@@ -52,7 +52,7 @@ public class TestRoyaleStatements extends TestGoogStatements
@Test
public void testObjectListeral_withPropertyNameMatchingConst()
{
- ILiteralNode node = (ILiteralNode) getNode("static const myConst:int; function falconTest_a():Object { return { myConst : myConst } }",
+ ILiteralNode node = (ILiteralNode) getNode("static const myConst:int; function royaleTest_a():Object { return { myConst : myConst } }",
ILiteralNode.class, WRAP_LEVEL_CLASS);
asBlockWalker.visitLiteral(node);
assertOut("{myConst:FalconTest_A.myConst}");
@@ -516,7 +516,7 @@ public class TestRoyaleStatements extends TestGoogStatements
" */\n" +
"FalconTest_A = function() {\n" +
"};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
- "FalconTest_A.prototype.falconTest_a = function() {\n" +
+ "FalconTest_A.prototype.royaleTest_a = function() {\n" +
" var self = this;\n" +
" var /** @type {Function} */ __localFn0__ = function(foo, bar) {\n" +
" bar = typeof bar !== 'undefined' ? bar : 'goo';\n" +
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
index aa66c6d..32df58b 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
@@ -103,7 +103,7 @@ public class ASTestBase extends TestBase
int wrapLevel, boolean includePackage)
{
if (wrapLevel == WRAP_LEVEL_MEMBER)
- code = "function falconTest_a():void {" + code + "}";
+ code = "function royaleTest_a():void {" + code + "}";
if (wrapLevel >= WRAP_LEVEL_CLASS)
code = "public class FalconTest_A {" + code + "}";
diff --git a/compiler/build.xml b/compiler/build.xml
index 42a8aa5..be3c863 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -222,7 +222,7 @@
targetfile="${compiler}/target/generated-sources/jflex/org/apache/royale/compiler/internal/parsing/as/RawASTokenizer.java">
<srcfiles dir="${compiler}/src/main/jflex/org/apache/royale/compiler/internal/parsing/as">
<include name="RawASTokenizer.lex"/>
- <include name="skeleton.falcon"/>
+ <include name="skeleton.royale"/>
</srcfiles>
</uptodate>
</target>
@@ -231,7 +231,7 @@
description="Generates RawASTokenizer.java">
<echo message="Generating RawASTokenizer"/>
<jflex input="${compiler}/src/main/jflex/org/apache/royale/compiler/internal/parsing/as/RawASTokenizer.lex"
- skeleton="${compiler}/src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.falcon"
+ skeleton="${compiler}/src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.royale"
output="${compiler}/target/generated-sources/jflex/org/apache/royale/compiler/internal/parsing/as"/>
</target>
@@ -559,8 +559,8 @@
</jar>
</target>
- <target name="set.falcon.asc.jar.uptodate">
- <uptodate property="falcon.asc.jar.uptodate"
+ <target name="set.royale.asc.jar.uptodate">
+ <uptodate property="royale.asc.jar.uptodate"
targetfile="${sdk}/compiler-asc.jar">
<srcfiles dir="${compiler}/target/classes">
<include name="**/*.class"/>
@@ -569,7 +569,7 @@
</uptodate>
</target>
- <target name="falcon.asc.jar" depends="compiler.jar, set.falcon.asc.jar.uptodate" unless="falcon.asc.jar.uptodate">
+ <target name="royale.asc.jar" depends="compiler.jar, set.royale.asc.jar.uptodate" unless="royale.asc.jar.uptodate">
<mkdir dir="${sdk}"/>
<jar file="${sdk}/compiler-asc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
<include name="META-INF/LICENSE"/>
@@ -585,8 +585,8 @@
</jar>
</target>
- <target name="set.falcon.mxmlc.jar.uptodate">
- <uptodate property="falcon.mxmlc.jar.uptodate"
+ <target name="set.royale.mxmlc.jar.uptodate">
+ <uptodate property="royale.mxmlc.jar.uptodate"
targetfile="${sdk}/compiler-mxmlc.jar">
<srcfiles dir="${compiler}/target/classes">
<include name="**/*.class"/>
@@ -595,7 +595,7 @@
</uptodate>
</target>
- <target name="falcon.mxmlc.jar" depends="compiler.jar, set.falcon.mxmlc.jar.uptodate" unless="falcon.mxmlc.jar.uptodate">
+ <target name="royale.mxmlc.jar" depends="compiler.jar, set.royale.mxmlc.jar.uptodate" unless="royale.mxmlc.jar.uptodate">
<mkdir dir="${sdk}"/>
<jar file="${sdk}/compiler-mxmlc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
<include name="META-INF/LICENSE"/>
@@ -611,8 +611,8 @@
</jar>
</target>
- <target name="set.falcon.compc.jar.uptodate">
- <uptodate property="falcon.compc.jar.uptodate"
+ <target name="set.royale.compc.jar.uptodate">
+ <uptodate property="royale.compc.jar.uptodate"
targetfile="${sdk}/compiler-compc.jar">
<srcfiles dir="${compiler}/target/classes">
<include name="**/*.class"/>
@@ -621,7 +621,7 @@
</uptodate>
</target>
- <target name="falcon.compc.jar" depends="compiler.jar, set.falcon.compc.jar.uptodate" unless="falcon.compc.jar.uptodate">
+ <target name="royale.compc.jar" depends="compiler.jar, set.royale.compc.jar.uptodate" unless="royale.compc.jar.uptodate">
<mkdir dir="${sdk}"/>
<jar file="${sdk}/compiler-compc.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
<include name="META-INF/LICENSE"/>
@@ -637,8 +637,8 @@
</jar>
</target>
- <target name="set.falcon.optimizer.jar.uptodate">
- <uptodate property="falcon.optimizer.jar.uptodate"
+ <target name="set.royale.optimizer.jar.uptodate">
+ <uptodate property="royale.optimizer.jar.uptodate"
targetfile="${sdk}/compiler-optimizer.jar">
<srcfiles dir="${compiler}/target/classes">
<include name="**/*.class"/>
@@ -647,7 +647,7 @@
</uptodate>
</target>
- <target name="falcon.optimizer.jar" depends="compiler.jar, set.falcon.optimizer.jar.uptodate" unless="falcon.optimizer.jar.uptodate">
+ <target name="royale.optimizer.jar" depends="compiler.jar, set.royale.optimizer.jar.uptodate" unless="royale.optimizer.jar.uptodate">
<mkdir dir="${sdk}"/>
<jar file="${sdk}/compiler-optimizer.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
<include name="META-INF/LICENSE"/>
@@ -663,8 +663,8 @@
</jar>
</target>
- <target name="set.falcon.swfdump.jar.uptodate">
- <uptodate property="falcon.swfdump.jar.uptodate"
+ <target name="set.royale.swfdump.jar.uptodate">
+ <uptodate property="royale.swfdump.jar.uptodate"
targetfile="${sdk}/compiler-swfdump.jar">
<srcfiles dir="${compiler}/target/classes">
<include name="**/*.class"/>
@@ -673,7 +673,7 @@
</uptodate>
</target>
- <target name="falcon.swfdump.jar" depends="compiler.jar, set.falcon.swfdump.jar.uptodate" unless="falcon.swfdump.jar.uptodate">
+ <target name="royale.swfdump.jar" depends="compiler.jar, set.royale.swfdump.jar.uptodate" unless="royale.swfdump.jar.uptodate">
<mkdir dir="${sdk}"/>
<jar file="${sdk}/compiler-swfdump.jar" basedir="${compiler}/target/classes" whenmanifestonly="create">
<include name="META-INF/LICENSE"/>
@@ -689,7 +689,7 @@
</jar>
</target>
- <target name="jar" depends="compiler.jar, falcon.asc.jar, falcon.mxmlc.jar, falcon.compc.jar, falcon.optimizer.jar, falcon.swfdump.jar"
+ <target name="jar" depends="compiler.jar, royale.asc.jar, royale.mxmlc.jar, royale.compc.jar, royale.optimizer.jar, royale.swfdump.jar"
description="Creates JAR files"/>
<!--
diff --git a/compiler/pom.xml b/compiler/pom.xml
index e2a3e6c..9c454ec 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -52,7 +52,7 @@
<lexDefinitions>
<lexDefinition>src/main/jflex/org/apache/royale/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
</lexDefinitions>
- <skeleton>src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.falcon</skeleton>
+ <skeleton>src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.royale</skeleton>
</configuration>
</execution>
<execution>
@@ -236,7 +236,7 @@
</plugin>
<!--
- Do all the custom processing with the falcon build tools.
+ Do all the custom processing with the royale build tools.
-->
<plugin>
<groupId>org.apache.royale.compiler</groupId>
diff --git a/compiler/src/assembly/scripts/swcdepends b/compiler/src/assembly/scripts/swcdepends
index 4d07f86..2d55227 100755
--- a/compiler/src/assembly/scripts/swcdepends
+++ b/compiler/src/assembly/scripts/swcdepends
@@ -29,15 +29,15 @@ then
SCRIPT_HOME=`dirname "$0"`
FALCON_HOME=${SCRIPT_HOME}/..
else
- echo Using Falcon codebase: $FALCON_HOME
+ echo Using Royale Compiler codebase: $FALCON_HOME
fi
-if [ "x${FLEX_HOME}" = "x" ]
+if [ "x${ROYALE_HOME}" = "x" ]
then
SCRIPT_HOME=`dirname "$0"`
- FLEX_HOME=${SCRIPT_HOME}/..
+ ROYALE_HOME=${SCRIPT_HOME}/..
else
- echo Using Flex SDK: $FLEX_HOME
+ echo Using Royale SDK: $ROYALE_HOME
fi
case `uname` in
@@ -53,7 +53,7 @@ D32=''
if [ $OS = "Windows" ]; then
FALCON_HOME=`cygpath -m $FALCON_HOME`
- FLEX_HOME=`cygpath -m $FLEX_HOME`
+ ROYALE_HOME=`cygpath -m $ROYALE_HOME`
elif [ $OS = "Unix" ]; then
@@ -68,4 +68,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexlib="$FLEX_HOME/frameworks" -jar "${FALCON_HOME}/lib/falcon-swcdepends.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${FALCON_HOME}/lib/royale-swcdepends.jar" "$@"
diff --git a/compiler/src/assembly/scripts/swcdepends.bat b/compiler/src/assembly/scripts/swcdepends.bat
index 8f07c43..0b97215 100644
--- a/compiler/src/assembly/scripts/swcdepends.bat
+++ b/compiler/src/assembly/scripts/swcdepends.bat
@@ -18,7 +18,7 @@ rem limitations under the License.
rem
rem
-rem swcdepends.bat script to launch falcon-swcdepends.jar in Windows Command Prompt.
+rem swcdepends.bat script to launch royale-swcdepends.jar in Windows Command Prompt.
rem On OSX, Unix, or Cygwin, use the swcdepends shell script instead.
rem
@@ -28,4 +28,4 @@ if "x%FALCON_HOME%"=="x" (set FALCON_HOME=%~dp0..) else echo Using Falcon codeb
if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\falcon-swcdepends.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\royale-swcdepends.jar" %*
diff --git a/compiler/src/main/java/org/apache/royale/compiler/config/ConfigurationBuffer.java b/compiler/src/main/java/org/apache/royale/compiler/config/ConfigurationBuffer.java
index 2a9d795..cd45662 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/config/ConfigurationBuffer.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/config/ConfigurationBuffer.java
@@ -833,7 +833,7 @@ public final class ConfigurationBuffer
String newDepvar = car + "." + depvar;
- // Since in falcon we have collapsed sub-configurations into one
+ // Since in royale we have collapsed sub-configurations into one
// configuration, some options that were in sub-configurations now
// have prerequisites on options in the same configuration. We
// need to keep the old configuration mappings so old configurations
diff --git a/compiler/src/main/java/org/apache/royale/compiler/fxg/flex/FlexFXG2SWFTranscoder.java b/compiler/src/main/java/org/apache/royale/compiler/fxg/flex/FlexFXG2SWFTranscoder.java
index 2935a48..ad15a05 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/fxg/flex/FlexFXG2SWFTranscoder.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/fxg/flex/FlexFXG2SWFTranscoder.java
@@ -740,7 +740,7 @@ public class FlexFXG2SWFTranscoder extends FXG2SWFTranscoder
buf.append(" {\r\n");
//TODO: This line causes a stack overflow, even though the super class has the same setter.
- //Bug filed against falcon for this: <will file a bug for this as soon as I come up with a basic repro case>
+ //Bug filed against royale for this: <will file a bug for this as soon as I come up with a basic repro case>
//Uncomment this when the bug is fixed.
//buf.append(" super.moduleFactory = factory;\r\n");
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java
index c1de84a..663c9ac 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java
@@ -710,7 +710,7 @@ public class MXMLData implements IMXMLData
* @param offset test offset
* @return unit that contains (or immediately follows) the offset A few
* subtleties: In Falcon we have endeavored to preserve the existing
- * definition of "nearest", so that for a given MXML file, falcon will find
+ * definition of "nearest", so that for a given MXML file, royale will find
* the same "nearest" unit.
*/
@@ -737,7 +737,7 @@ public class MXMLData implements IMXMLData
// unit is a match if it "contains" the offset.
// We are using a somewhat bizarre form of "contains" here, in that we are
// using getStart() and getConentEnd(). This asymmetric mismatch is for several reasons:
- // * it's the only way to match the existing (non-falcon) behavior
+ // * it's the only way to match the existing (non-royale) behavior
// * If our cursor is before the <, we want to match the tag.
// example: |<foo > will find "foo" as the nearest tag.
// So we need to use start here (not content start)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagAttributeData.java b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagAttributeData.java
index c64c8bf..6299f62 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagAttributeData.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagAttributeData.java
@@ -386,7 +386,7 @@ public class MXMLTagAttributeData extends SourceLocation implements IMXMLTagAttr
/**
* Returns the {@link PrefixMap} that represents all prefix->namespace
* mappings are in play on this tag. For example, if a parent tag defines
- * <code>xmlns:m="falcon"</code> and this tag defines
+ * <code>xmlns:m="royale"</code> and this tag defines
* <code>xmlns:m="eagle"</code> then in this prefix map, m will equal
* "eagle"
*
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java
index a30722c..a8a85ac 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java
@@ -216,7 +216,7 @@ public class MXMLTagData extends MXMLUnitData implements IMXMLTagData
ArrayList<IMXMLTagAttributeData> attrs = new ArrayList<IMXMLTagAttributeData>();
attributeMap = new LinkedHashMap<String, IMXMLTagAttributeData>(); //preserve order of attrs
boolean foundTagEnd = false;
- boolean putTokenBack = false; // This is a pre-falcon algorithm that helped recover from tag nesting errors
+ boolean putTokenBack = false; // This is a pre-royale algorithm that helped recover from tag nesting errors
// I am bringing it back to life
while (tokenIterator.hasNext() && !foundTagEnd)
{
diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml
index b830adc..9acd33f 100644
--- a/compiler/src/test/build.xml
+++ b/compiler/src/test/build.xml
@@ -45,10 +45,10 @@
<property name="playerglobal.version" value="11.1" />
<property name="compiler" value="${compiler.tests}/../.."/>
- <property name="falcon" value="${compiler}"/>
+ <property name="royale" value="${compiler}"/>
<path id="lib.path">
- <fileset dir="${falcon}/lib" includes="falcon-flexTasks.jar"/>
+ <fileset dir="${royale}/lib" includes="royale-flexTasks.jar"/>
</path>
<target name="download" description="Downloads third-party JARs">
@@ -61,11 +61,11 @@
</target>
<target name="jar.tests">
- <java jar="${falcon}/lib/compiler-mxmlc.jar" fork="true"/>
- <java jar="${falcon}/lib/compiler-compc.jar" fork="true"/>
- <java jar="${falcon}/lib/compiler-asc.jar" fork="true"/>
- <java jar="${falcon}/lib/compiler-optimizer.jar" fork="true"/>
- <java jar="${falcon}/lib/compiler-swfdump.jar" fork="true"/>
+ <java jar="${royale}/lib/compiler-mxmlc.jar" fork="true"/>
+ <java jar="${royale}/lib/compiler-compc.jar" fork="true"/>
+ <java jar="${royale}/lib/compiler-asc.jar" fork="true"/>
+ <java jar="${royale}/lib/compiler-optimizer.jar" fork="true"/>
+ <java jar="${royale}/lib/compiler-swfdump.jar" fork="true"/>
</target>
<!-- tests used to be divided up like this
@@ -78,7 +78,7 @@
<compilerarg value="-Xlint:all,-path"/>
<classpath>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
</javac>
</target>
@@ -94,7 +94,7 @@
<classpath>
<pathelement location="${compiler}/target/test-classes"/>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler}/target/junit-reports">
<fileset dir="${compiler}/target/test-classes">
@@ -124,7 +124,7 @@
<classpath>
<pathelement location="${compiler}/target/test-classes"/>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler}/target/junit-reports">
<fileset dir="${compiler}/target/test-classes">
@@ -150,7 +150,7 @@
<classpath>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
<fileset dir="${compiler.tests}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
</javac>
</target>
@@ -167,7 +167,7 @@
<pathelement location="${compiler.tests}/classes"/>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
<fileset dir="${compiler.tests}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler.tests}/results">
<fileset dir="${compiler.tests}/classes">
@@ -196,7 +196,7 @@
<pathelement location="${compiler.tests}/classes"/>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
<fileset dir="${compiler.tests}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler.tests}/results">
<fileset dir="${compiler.tests}/classes">
@@ -223,7 +223,7 @@
<classpath>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
<fileset dir="${compiler.tests}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
</javac>
</target>
@@ -240,7 +240,7 @@
<pathelement location="${compiler.tests}/classes"/>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
<fileset dir="${compiler.tests}/lib" includes="**/*.jar"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler.tests}/results">
<fileset dir="${compiler.tests}/classes">
@@ -254,7 +254,7 @@
end of old test organization -->
<target name="compile.tests">
- <echo>compiler is ${compiler} falcon is ${falcon}</echo>
+ <echo>compiler is ${compiler} royale is ${royale}</echo>
<delete dir="${compiler}/target/test-classes"/>
<mkdir dir="${compiler}/target/test-classes"/>
<javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/test-classes" includeAntRuntime="true">
@@ -264,7 +264,7 @@
<fileset dir="${compiler}/lib/external" includes="**/*.jar"/>
<pathelement location="${compiler}/../compiler-build-tools/target/classes"/>
<pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
</javac>
</target>
@@ -282,7 +282,7 @@
<fileset dir="${compiler}/lib/external" includes="**/*.jar"/>
<pathelement location="${compiler}/../compiler-build-tools/target/classes"/>
<pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler}/target/junit-reports">
<fileset dir="${compiler}/target/test-classes">
@@ -323,7 +323,7 @@
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
<pathelement location="${compiler}/../compiler-build-tools/target/classes"/>
<pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
- <pathelement location="${falcon}/lib/compiler.jar"/>
+ <pathelement location="${royale}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler}/target/junit-reports">
<fileset dir="${compiler}/target/test-classes">
diff --git a/jenkins.xml b/jenkins.xml
index 029202b..91e83de 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -20,11 +20,11 @@
<project name="framework" default="main" basedir=".">
- <property name="falcon.jenkins.home" value="${basedir}/jenkins" />
+ <property name="royale.jenkins.home" value="${basedir}/jenkins" />
- <property name="jflex.temp.filename" value="${falcon.jenkins.home}/temp/JFlex.zip" />
+ <property name="jflex.temp.filename" value="${royale.jenkins.home}/temp/JFlex.zip" />
<property name="jflex.filename" value="jflex-1.4.3" />
- <property name="jflex.root" value="${falcon.jenkins.home}/JFlex" />
+ <property name="jflex.root" value="${royale.jenkins.home}/JFlex" />
<property name="jflex.home" value="${jflex.root}/${jflex.filename}/lib" />
<!-- (erikdebruin) Hard coded path for Windows, sorry ;-) -->
@@ -33,8 +33,8 @@
<target name="main" depends="clean,init,jflex-download,closure-lib-download,env-properties"/>
<target name="init">
- <mkdir dir="${falcon.jenkins.home}" />
- <mkdir dir="${falcon.jenkins.home}/temp"/>
+ <mkdir dir="${royale.jenkins.home}" />
+ <mkdir dir="${royale.jenkins.home}/temp"/>
<mkdir dir="${jflex.root}" />
<mkdir dir="${closure.root}" />
@@ -61,7 +61,7 @@
</target>
<target name="clean" description="Cleans third party downloaded files.">
- <delete dir="${falcon.jenkins.home}/temp" />
+ <delete dir="${royale.jenkins.home}/temp" />
<delete dir="${jflex.root}" />
diff --git a/royale-ant-tasks/build.xml b/royale-ant-tasks/build.xml
index f9689d9..7baac0c 100644
--- a/royale-ant-tasks/build.xml
+++ b/royale-ant-tasks/build.xml
@@ -93,9 +93,9 @@
</copy>
</target>
- <target name="set.falcon.royaletasks.jar.uptodate">
- <uptodate property="falcon.royaletasks.jar.uptodate"
- targetfile="${sdk}/falcon-royaleTasks.jar">
+ <target name="set.royale.royaletasks.jar.uptodate">
+ <uptodate property="royale.royaletasks.jar.uptodate"
+ targetfile="${sdk}/royale-royaleTasks.jar">
<srcfiles dir="${royaletasks}/target/classes">
<include name="**/*.class"/>
<include name="**/*.properties"/>
@@ -103,12 +103,12 @@
</uptodate>
</target>
- <target name="falcon.royaletasks.jar" depends="set.falcon.royaletasks.jar.uptodate" unless="falcon.royaletasks.jar.uptodate">
+ <target name="royale.royaletasks.jar" depends="set.royale.royaletasks.jar.uptodate" unless="royale.royaletasks.jar.uptodate">
<mkdir dir="${royaletasks}/target/classes/META-INF"/>
<copy file="${basedir}/../LICENSE.base" tofile="${royaletasks}/target/classes/META-INF/LICENSE"/>
<copy file="${basedir}/../NOTICE.base" tofile="${royaletasks}/target/classes/META-INF/NOTICE"/>
<mkdir dir="${sdk}"/>
- <jar file="${sdk}/falcon-royaleTasks.jar" basedir="${royaletasks}/target/classes" >
+ <jar file="${sdk}/royale-royaleTasks.jar" basedir="${royaletasks}/target/classes" >
<include name="META-INF/LICENSE"/>
<include name="META-INF/NOTICE"/>
<manifest>
@@ -123,7 +123,7 @@
</jar>
</target>
- <target name="jar" depends="compile,falcon.royaletasks.jar"
+ <target name="jar" depends="compile,royale.royaletasks.jar"
description="Creates JAR files"/>
<!--
@@ -132,9 +132,9 @@
-->
- <target name="sdk" depends="jar, test" description="Builds the falcon-royaleTasks.jar"/>
+ <target name="sdk" depends="jar, test" description="Builds the royale-royaleTasks.jar"/>
- <target name="main" depends="sdk" description="Default target - Builds the falcon-royaleTasks.jar">
+ <target name="main" depends="sdk" description="Default target - Builds the royale-royaleTasks.jar">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa"/>
</tstamp>
@@ -153,7 +153,7 @@
<target name="clean" description="clean">
<delete dir="${royaletasks}/target" failonerror="false"/>
- <delete file="${sdk}/falcon-royaletasks.jar" failonerror="false"/>
+ <delete file="${sdk}/royale-royaletasks.jar" failonerror="false"/>
</target>
<target name="wipe" depends="clean" description="Wipes everything that didn't come from Git.">
diff --git a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java
index 10fbd17..f20fecf 100644
--- a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java
+++ b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java
@@ -237,8 +237,8 @@ public abstract class FlexTask extends Java
if (royaleHomeProperty == null)
throw new BuildException("FLEX_HOME must be set to use the Flex Ant Tasks");
- String falconHomeProperty = getProject().getProperty("FALCONJX_HOME");
- if (falconHomeProperty == null)
+ String royaleHomeProperty = getProject().getProperty("FALCONJX_HOME");
+ if (royaleHomeProperty == null)
throw new BuildException("FALCONJX_HOME must be set to use the Flex Ant Tasks");
System.setProperty("FLEX_HOME", royaleHomeProperty);
diff --git a/royale-ant-tasks/src/test/build.xml b/royale-ant-tasks/src/test/build.xml
index 6cd10d6..2021333 100644
--- a/royale-ant-tasks/src/test/build.xml
+++ b/royale-ant-tasks/src/test/build.xml
@@ -60,16 +60,16 @@
<property name="playerglobal.version" value="11.1" />
<property name="royaletasks" value="${royaletasks.tests}/../.."/>
- <property name="falcon" value="${compiler}"/>
+ <property name="royale" value="${compiler}"/>
<path id="lib.path">
- <fileset dir="${falcon}/lib" includes="falcon-royaleTasks.jar"/>
- <fileset dir="${falcon}/lib" includes="jsc.jar"/>
+ <fileset dir="${royale}/lib" includes="royale-royaleTasks.jar"/>
+ <fileset dir="${royale}/lib" includes="jsc.jar"/>
</path>
<target name="ant.tests">
<property name="FLEX_HOME" value="${flexsdk}"/>
- <property name="FALCONJX_HOME" value="${falcon}"/>
+ <property name="FALCONJX_HOME" value="${royale}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<echo>FLEX_HOME=${flexsdk}</echo>
<echo>FALCONJX_HOME=${FALCONJX_HOME}</echo>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.