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
The following commit(s) were added to refs/heads/feature/rename by this push:
new 7a7c45d everything compiles except tests
7a7c45d is described below
commit 7a7c45d2bf9c07eed7569e06e1cbd35bfa85bf2a
Author: Alex Harui <[email protected]>
AuthorDate: Thu Nov 16 21:36:25 2017 -0800
everything compiles except tests
---
build.xml | 97 ++--------------------
compiler-externc/build.xml | 10 ++-
compiler-jx/build.xml | 15 +---
.../internal/codegen/js/jx/IdentifierEmitter.java | 7 +-
debugger/build.properties | 2 +-
debugger/build.xml | 2 +-
6 files changed, 23 insertions(+), 110 deletions(-)
diff --git a/build.xml b/build.xml
index c2a1bfe..38086cf 100644
--- a/build.xml
+++ b/build.xml
@@ -29,39 +29,6 @@
<property name="source.kit" value="${kit.prefix}-src"/>
<property name="binary.kit" value="${kit.prefix}-bin"/>
- <target name="check-typedefs-home"
- description="Check ROYALE_TYPEDEFS_HOME">
-
- <echo message="ROYALE_TYPEDEFS_HOME is ${env.ROYALE_TYPEDEFS_HOME}"/>
-
- <available file="${env.ROYALE_TYPEDEFS_HOME}"
- type="dir"
- property="ROYALE_TYPEDEFS_HOME"
- value="${env.ROYALE_TYPEDEFS_HOME}" />
-
- <condition property="ROYALE_TYPEDEFS_HOME"
value="${basedir}/../royale-typedefs" >
- <and>
- <available file="${basedir}/../royale-typedefs" type="dir" />
- <not>
- <isset property="ROYALE_TYPEDEFS_HOME" />
- </not>
- </and>
- </condition>
-
- <condition property="ROYALE_TYPEDEFS_HOME"
value="${basedir}/royale-typedefs" >
- <and>
- <available file="${basedir}/royale-typedefs" type="dir" />
- <not>
- <isset property="ROYALE_TYPEDEFS_HOME" />
- </not>
- </and>
- </condition>
-
- <fail message="The environment variable ROYALE_TYPEDEFS_HOME is not
set to a directory"
- unless="ROYALE_TYPEDEFS_HOME"/>
-
- </target>
-
<!--
Optional jars but should be in place for a real release build.
@@ -95,17 +62,17 @@
<ant dir="compiler-build-tools" />
<ant dir="compiler-jburg-types" />
<ant dir="compiler-test-utils" />
+ <ant dir="compiler-common" />
+ <ant dir="compiler-externc" />
<ant dir="compiler" />
</target>
<target name="swf" depends="sdk, javadoc, tests" description="Builds SWF
compiler, builds Royale Javadoc, and runs SWF compiler tests."/>
- <target name="main" depends="swf, jx, typedefs, oem, debugger, anttasks"
description="Builds Royale SWF compiler, then Royale JS Transpiler"/>
+ <target name="main" depends="swf, jx, oem, debugger, anttasks"
description="Builds Royale SWF compiler, then Royale JS Transpiler"/>
<target name="jx" depends="compiler.jx, compiler.jx.tests"
description="Builds Royale JS Transpiler" />
- <target name="typedefs" depends="check-typedefs-home, typedef.swcs,
typedef.tests" description="Build typedefs and run tests"/>
-
<target name="oem" depends="compiler.oem" description="Builds FB
Integration JAR" />
<target name="tests" description="Runs the tests."
unless="skip.compiler.tests">
@@ -140,19 +107,6 @@
<ant dir="compiler-jx/src/test" target="copyLastSuccessfulBuild"/>
</target>
- <target name="typedef.swcs">
- <ant dir="${ROYALE_TYPEDEFS_HOME}" />
- </target>
- <target name="typedef.swcs.clean" >
- <ant dir="${ROYALE_TYPEDEFS_HOME}" target="clean"/>
- </target>
- <target name="typedef.swcs.wipe" >
- <ant dir="${ROYALE_TYPEDEFS_HOME}" target="wipe"/>
- </target>
- <target name="typedef.tests">
- <ant dir="compiler-jx/src/test" target="extern.tests" />
- </target>
-
<target name="clean-swf" description="Cleans the build output but leaves
any downloaded JARs.">
<ant dir="compiler" target="clean"/>
<ant dir="compiler/src/test" target="clean"/>
@@ -172,6 +126,8 @@
<ant dir="compiler-build-tools" target="wipe"/>
<ant dir="compiler-test-utils" target="wipe"/>
<ant dir="compiler-jburg-types" target="wipe"/>
+ <ant dir="compiler-common" target="wipe"/>
+ <ant dir="compiler-externc" target="wipe"/>
<ant dir="compiler" target="wipe"/>
<ant dir="compiler/src/tests" target="wipe"/>
</target>
@@ -180,6 +136,8 @@
<ant dir="compiler-build-tools" target="wipe"/>
<ant dir="compiler-jburg-types" target="wipe"/>
<ant dir="compiler-test-utils" target="wipe"/>
+ <ant dir="compiler-common" target="wipe"/>
+ <ant dir="compiler-externc" target="wipe"/>
<ant dir="compiler" target="wipe"/>
<ant dir="compiler/src/test" target="wipe"/>
<ant dir="compiler-jx" target="super-clean"/>
@@ -306,9 +264,6 @@
<!-- royale ant tasks -->
<antcall target="stage-ant-tasks"/>
- <!-- typedefs -->
- <antcall target="stage-typedefs"/>
-
<!--
Source files have Windows line endings. Most UNIX editors can handle
either type of line endings but the converse is often not true.
@@ -465,15 +420,6 @@
</copy>
</target>
- <target name="stage-typedefs" depends="check-typedefs-home">
- <copy todir="${basedir}/temp/royale-typedefs" includeEmptyDirs="false">
- <fileset dir="${ROYALE_TYPEDEFS_HOME}">
- <include name="**"/>
- <exclude name="**/target/**" />
- </fileset>
- </copy>
- </target>
-
<target name="stage-source-jx"
description="Package jx source files with other royale files required
to build in zip file" >
@@ -574,13 +520,6 @@
<antcall target="stage-source-jx" />
- <copy todir="${basedir}/temp/royale-typedefs" includeEmptyDirs="false">
- <fileset dir="${ROYALE_TYPEDEFS_HOME}">
- <include
name="createjs/target/downloads/EaselJS-0.8.0/LICENSE.txt" />
- <include
name="createjs/target/downloads/TweenJS-0.6.2/LICENSE.txt" />
- </fileset>
- </copy>
-
<!-- generated -->
<mkdir dir="${basedir}/temp/js"/>
<copy todir="${basedir}/temp/js">
@@ -607,27 +546,6 @@
<copy tofile="${basedir}/temp/js/libs/GCL.swc"
file="${ROYALE_TYPEDEFS_HOME}/GCL/target/GCL.swc" />
<copy tofile="${basedir}/temp/js/libs/node.swc"
file="${ROYALE_TYPEDEFS_HOME}/node/target/node.swc" />
- <!-- generated -->
- <mkdir dir="${basedir}/temp/royale-typedefs"/>
- <copy todir="${basedir}/temp/royale-typedefs" includeEmptyDirs="false">
- <fileset dir="${ROYALE_TYPEDEFS_HOME}">
- <include name="**/**"/>
- <exclude name="**/externs.zip" />
- <exclude name="**/target/.plxarc" />
- <exclude name="**/target/failsafe-reports/**" />
- <exclude name="**/*.swc"/>
- <exclude name="**/*.as"/>
- <exclude name="createjs/target/**"/>
- </fileset>
- </copy>
- <echo>copy easel and tween</echo>
- <copy todir="${basedir}/temp/royale-typedefs" includeEmptyDirs="false">
- <fileset dir="${ROYALE_TYPEDEFS_HOME}">
- <include name="createjs/target/downloads/Easel*/src/**"/>
- <include name="createjs/target/downloads/Tween*/src/**"/>
- </fileset>
- </copy>
-
<antcall target="binary-package-zip"/>
<antcall target="binary-package-tgz"/>
@@ -707,7 +625,6 @@
<exclude name="**/*.flv"/>
<exclude name="**/org.apache.royale.tools.RoyaleToolGroup"/>
<exclude name="debugger/META-INF/MANIFEST.MF"/>
- <exclude
name="royale-typedefs/target/maven-shared-archive-resources/META-INF/DEPENDENCIES"/>
<exclude name="**/*.patch"/>
<exclude name="LICENSE.bin"/>
<exclude name="README_MAVEN.txt"/>
diff --git a/compiler-externc/build.xml b/compiler-externc/build.xml
index 7dee418..60d12bc 100644
--- a/compiler-externc/build.xml
+++ b/compiler-externc/build.xml
@@ -113,7 +113,14 @@
</javac>
</target>
- <target name="main" depends="compile" >
+ <target name="prebuild">
+ <mkdir dir="${compiler-externc}/target/classes" />
+ <mkdir dir="${compiler-externc}/target/classes/META-INF" />
+ <mkdir dir="${sdk}/google/closure-compiler" />
+ <ant antfile="${compiler-jx}/src/main/resources/downloads.xml"
dir="${compiler-jx}/src/main/resources" inheritAll="false"/>
+ </target>
+
+ <target name="main" depends="prebuild,compile" >
<mkdir dir="${sdk}"/>
<copy file="${basedir}/../LICENSE.base"
tofile="${compiler-externc}/target/classes/META-INF/LICENSE"/>
<copy file="${basedir}/../NOTICE.base"
tofile="${compiler-externc}/target/classes/META-INF/NOTICE"/>
@@ -125,6 +132,7 @@
<attribute name="Implementation-Title"
value="${manifest.Implementation-Title}"/>
<attribute name="Implementation-Version"
value="${manifest.Implementation-Version}.${build.number}"/>
<attribute name="Implementation-Vendor"
value="${manifest.Implementation-Vendor}"/>
+ <attribute name="Main-Class"
value="org.apache.royale.compiler.clients.EXTERNC" />
<attribute name="Class-Path" value="external/commons-cli.jar
external/commons-io.jar external/guava.jar google/closure-compiler/compiler.jar
../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar .."/>
<!-- The .. in the line above allows the compiler to load the
env.properties file -->
</manifest>
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 4d52ad6..8b0bb31 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -75,6 +75,7 @@
<file name="commons-io.jar" />
<file name="guava.jar" />
<file name="flex-tool-api.jar" />
+ <file name="externc.jar" />
</filelist>
<filelist dir="${lib}/google/closure-compiler">
<file name="compiler.jar" />
@@ -149,20 +150,6 @@
</manifest>
</jar>
- <echo message="Building ${externc.jar}" />
- <jar file="${externc.jar}" basedir="${classes.dir}">
- <include name="META-INF/LICENSE"/>
- <include name="META-INF/NOTICE"/>
- <manifest>
- <attribute name="Sealed" value="${manifest.sealed}"/>
- <attribute name="Implementation-Title"
value="${manifest.Implementation-Title}"/>
- <attribute name="Implementation-Version"
value="${manifest.Implementation-Version}.${build.number}"/>
- <attribute name="Implementation-Vendor"
value="${manifest.Implementation-Vendor}"/>
- <attribute name="Main-Class"
value="org.apache.royale.compiler.clients.EXTERNC" />
- <attribute name="Class-Path" value="jsc.jar" />
- </manifest>
- </jar>
-
<echo message="Building ${asdoc.jar}" />
<jar file="${asdoc.jar}" basedir="${classes.dir}">
<include name="META-INF/LICENSE"/>
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
index 6a2f0ee..89c2080 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
@@ -28,6 +28,7 @@ import
org.apache.royale.compiler.definitions.IFunctionDefinition.FunctionClassi
import org.apache.royale.compiler.definitions.INamespaceDefinition;
import org.apache.royale.compiler.definitions.IVariableDefinition;
import
org.apache.royale.compiler.definitions.IVariableDefinition.VariableClassification;
+import
org.apache.royale.compiler.definitions.references.INamespaceResolvedReference;
import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
@@ -230,7 +231,7 @@ public class IdentifierEmitter extends JSSubEmitter
implements
{
if (isCustomNamespace)
{
- Namespace ns =
(Namespace)((FunctionDefinition)nodeDef).getNamespaceReference().resolveAETNamespace(getProject());
+ Namespace ns =
(Namespace)((INamespaceResolvedReference)((FunctionDefinition)nodeDef).getNamespaceReference()).resolveAETNamespace(getProject());
INamespaceDefinition nsDef =
((FunctionDefinition)nodeDef).getNamespaceReference().resolveNamespaceReference(getProject());
fjs.formatQualifiedName(nsDef.getQualifiedName()); // register with used names
String nsName = ns.getName();
@@ -298,7 +299,7 @@ public class IdentifierEmitter extends JSSubEmitter
implements
}
else if (isCustomNamespace)
{
- String ns =
((FunctionDefinition)nodeDef).getNamespaceReference().resolveAETNamespace(getProject()).getName();
+ String ns =
((INamespaceResolvedReference)((FunctionDefinition)nodeDef).getNamespaceReference()).resolveAETNamespace(getProject()).getName();
write("[\"" + ns + "::" + qname + "\"]");
}
else if (identifierIsAccessorFunction && isStatic)
@@ -316,7 +317,7 @@ public class IdentifierEmitter extends JSSubEmitter
implements
write(getEmitter().formatQualifiedName(qname));
else if (isCustomNamespace)
{
- String ns =
((FunctionDefinition)nodeDef).getNamespaceReference().resolveAETNamespace(getProject()).getName();
+ String ns =
((INamespaceResolvedReference)((FunctionDefinition)nodeDef).getNamespaceReference()).resolveAETNamespace(getProject()).getName();
write("[\"" + ns + "::" + qname + "\"]");
}
else if (identifierIsAccessorFunction && isStatic)
diff --git a/debugger/build.properties b/debugger/build.properties
index b45cdbd..9a4b382 100644
--- a/debugger/build.properties
+++ b/debugger/build.properties
@@ -48,7 +48,7 @@ dist=${basedir}/../compiler/lib
#JAR names
jar=fdb.jar
-jar.dependencies=compiler.jar external/commons-lang-2.6.jar
+jar.dependencies=compiler.jar compiler-common.jar external/commons-lang-2.6.jar
diff --git a/debugger/build.xml b/debugger/build.xml
index 5ed1830..3b3c34f 100644
--- a/debugger/build.xml
+++ b/debugger/build.xml
@@ -26,7 +26,7 @@
</condition>
<path id="classpath">
<fileset dir="${compiler.generated.lib}"
includes="${jar.dependencies}" />
- </path>
+ </path>
<target name="download_check" description="determine if we have
downloaded/bundled swfutils source">
<available file="${basedir}/target/downloads/java/flash/swf/Action.java"
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
