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/04 22:35:00 UTC
[royale-compiler] 07/20: change more flexjs references to royale
per Issue #17
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 d7d9e6b3c6ac50d93040e59da52157219fd38b40
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Oct 3 10:30:38 2017 -0700
change more flexjs references to royale per Issue #17
---
apache-flex-falconjx-installer-config.xml | 2 +-
build.xml | 14 +++++++-------
compiler-jx/pom.xml | 6 +++---
compiler-jx/src/test/build.xml | 6 +++---
compiler-test-utils/pom.xml | 2 +-
compiler/pom.xml | 2 +-
debugger/pom.xml | 2 +-
flex-compiler-oem/pom.xml | 2 +-
installer.xml | 6 +++---
pom.xml | 6 +++---
royale-ant-tasks/pom.xml | 4 ++--
royale-maven-extension/pom.xml | 2 +-
royale-maven-plugin/pom.xml | 2 +-
13 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/apache-flex-falconjx-installer-config.xml b/apache-flex-falconjx-installer-config.xml
index 76aa897..e74825a 100644
--- a/apache-flex-falconjx-installer-config.xml
+++ b/apache-flex-falconjx-installer-config.xml
@@ -86,7 +86,7 @@
<en_US>Copy FalconJX SDK files</en_US>
</step>
</steps>
- <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexjs.install">
+ <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.royale.install">
<el_GR>
<label>Apache Flex Falcon (Απαιτούμενο)</label>
<message>Για το Apache Flex FalconJX ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache Flex FalconJX;</message>
diff --git a/build.xml b/build.xml
index bdd5101..08730d0 100644
--- a/build.xml
+++ b/build.xml
@@ -112,7 +112,7 @@
</target>
<target name="anttasks" description="Builds ant tasks JAR">
- <ant dir="flexjs-ant-tasks" target="jar"/>
+ <ant dir="royale-ant-tasks" target="jar"/>
</target>
<target name="debugger" description="Builds FDB JAR">
@@ -128,7 +128,7 @@
</target>
<target name="ant.tests" description="Runs the tests." unless="skip.compiler.jx.tests">
- <ant dir="flexjs-ant-tasks" target="test"/>
+ <ant dir="royale-ant-tasks" target="test"/>
</target>
<target name="copyLastSuccessfulBuild" description="Copies last flex-asjs build.">
@@ -161,7 +161,7 @@
<ant dir="compiler-jx" target="clean"/>
<ant dir="compiler-jx/src/test" target="clean"/>
<ant dir="flex-compiler-oem" target="clean"/>
- <ant dir="flexjs-ant-tasks" target="clean"/>
+ <ant dir="royale-ant-tasks" target="clean"/>
<ant dir="debugger" target="clean"/>
</target>
@@ -182,7 +182,7 @@
<ant dir="compiler-jx" target="super-clean"/>
<ant dir="compiler-jx/src/test" target="wipe"/>
<ant dir="flex-compiler-oem" target="wipe"/>
- <ant dir="flexjs-ant-tasks" target="wipe"/>
+ <ant dir="royale-ant-tasks" target="wipe"/>
<ant dir="debugger" target="clean"/>
<delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
@@ -462,8 +462,8 @@
</target>
<target name="stage-ant-tasks">
- <copy todir="${basedir}/temp/flexjs-ant-tasks" includeEmptyDirs="false">
- <fileset dir="${basedir}/flexjs-ant-tasks">
+ <copy todir="${basedir}/temp/royale-ant-tasks" includeEmptyDirs="false">
+ <fileset dir="${basedir}/royale-ant-tasks">
<include name="**"/>
<exclude name=".classpath" />
<exclude name=".project" />
@@ -892,7 +892,7 @@
<ant dir="compiler/src/test" target="sdk.dependent.tests" />
<ant dir="compiler-jx/src/test" target="integration.tests.sdk" />
</target>
- <target name="flexjs.dependent.tests" >
+ <target name="royale.dependent.tests" >
<ant dir="compiler-jx/src/test" target="integration.tests.asjs" />
</target>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index c213f41..9b3fd15 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
@@ -44,7 +44,7 @@
</includes>
<excludes>
<exclude>org/apache/flex/compiler/internal/codegen/externals/**</exclude>
- <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**</exclude>
+ <exclude>org/apache/flex/compiler/internal/codegen/js/royale/**</exclude>
<exclude>**/TestGoogClass.java</exclude>
<exclude>**/TestGoogEmitter.java</exclude>
<exclude>**/TestGoogFile.java</exclude>
@@ -62,7 +62,7 @@
<version>2.18.1</version>
<configuration>
<includes>
- <include>org/apache/flex/compiler/internal/codegen/js/flexjs/Test*.java</include>
+ <include>org/apache/flex/compiler/internal/codegen/js/royale/Test*.java</include>
<!-- Disabled for now as these tests require the flex-typedefs repo to be located in a pre-defined location -->
<!--include>org/apache/flex/compiler/internal/codegen/externals/Test*.java</include-->
</includes>
diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml
index 212bce9..9413f66 100644
--- a/compiler-jx/src/test/build.xml
+++ b/compiler-jx/src/test/build.xml
@@ -193,13 +193,13 @@
value="true" />
</target>
<target name="get_asjs" unless="asjs.ok" >
- <get src="http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/lastSuccessfulBuild/artifact/out/apache-flex-flexjs-0.9.0-bin.zip" dest="${compiler}/target/junit-temp/flexjs.zip"/>
- <unzip src="${compiler}/target/junit-temp/flexjs.zip" dest="${env.ASJS_HOME}">
+ <get src="http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/lastSuccessfulBuild/artifact/out/apache-flex-royale-0.9.0-bin.zip" dest="${compiler}/target/junit-temp/royale.zip"/>
+ <unzip src="${compiler}/target/junit-temp/royale.zip" dest="${env.ASJS_HOME}">
<patternset>
<include name="frameworks/libs/*.swc"/>
</patternset>
</unzip>
- <delete file="${compiler}/target/junit-temp/flexjs.zip" />
+ <delete file="${compiler}/target/junit-temp/royale.zip" />
</target>
<target name="main" depends="unit.tests"/>
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index 41cf86f..795f839 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index e920103..cca3f32 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 8122568..25957cc 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index f72cdcc..21a8fa3 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
diff --git a/installer.xml b/installer.xml
index 4a42283..1a3f2fd 100644
--- a/installer.xml
+++ b/installer.xml
@@ -18,7 +18,7 @@
-->
-<project name="flexjs_compiler_install" default="overlay" basedir=".">
+<project name="royale_compiler_install" default="overlay" basedir=".">
<!-- this script supports the usingDownloadCache property and
downloadCacheFolder property to cache downloads in the
@@ -109,7 +109,7 @@
<mkdir dir="${FLEX_HOME}/js/lib/google/closure-compiler" />
</target>
- <target name="movefiles" description="move SDK files into -legacy folders" unless="flexjs">
+ <target name="movefiles" description="move SDK files into -legacy folders" unless="royale">
<mkdir dir="${FLEX_HOME}/lib-legacy" />
<move todir="${FLEX_HOME}/lib-legacy" overwrite="true" includeEmptyDirs="false">
<fileset dir="${FLEX_HOME}/lib">
@@ -145,7 +145,7 @@
<copy tofile="${FLEX_HOME}/lib/mxmlc.jar" file="${FLEX_HOME}/lib/falcon-mxmlc.jar" overwrite="true"/>
</target>
- <target name="bin-legacy" unless="flexjs">
+ <target name="bin-legacy" unless="royale">
<mkdir dir="${FLEX_HOME}/bin-legacy" />
<move todir="${FLEX_HOME}/bin-legacy" overwrite="true" includeEmptyDirs="false">
<fileset dir="${FLEX_HOME}/bin">
diff --git a/pom.xml b/pom.xml
index 0db9aaf..3e47b62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -101,9 +101,9 @@
<module>compiler-test-utils</module>
<module>debugger</module>
<module>flex-compiler-oem</module>
- <module>flexjs-ant-tasks</module>
+ <module>royale-ant-tasks</module>
<!-- Commented out for now -->
- <!--module>flexjs-maven-extension</module-->
+ <!--module>royale-maven-extension</module-->
<module>royale-maven-plugin</module>
</modules>
diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml
index 228ee83..0bb2944 100644
--- a/royale-ant-tasks/pom.xml
+++ b/royale-ant-tasks/pom.xml
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <artifactId>flexjs-ant-tasks</artifactId>
+ <artifactId>royale-ant-tasks</artifactId>
<version>0.9.0-SNAPSHOT</version>
<name>Apache Flex - Royale: Royale Ant Tasks</name>
diff --git a/royale-maven-extension/pom.xml b/royale-maven-extension/pom.xml
index be4a590..ad060b8 100644
--- a/royale-maven-extension/pom.xml
+++ b/royale-maven-extension/pom.xml
@@ -29,7 +29,7 @@
</parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-maven-extension</artifactId>
+ <artifactId>royale-maven-extension</artifactId>
<version>0.9.0-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/royale-maven-plugin/pom.xml b/royale-maven-plugin/pom.xml
index ec4d077..805ac08 100644
--- a/royale-maven-plugin/pom.xml
+++ b/royale-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
- <artifactId>flexjs-compiler-parent</artifactId>
+ <artifactId>royale-compiler-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.