You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2014/02/28 10:47:58 UTC
[01/50] git commit: [flex-falcon] [refs/heads/maven] - Modified tests
for the 'another not fully qualified class type' issue (FLEX-33918)
Repository: flex-falcon
Updated Branches:
refs/heads/maven 23a413741 -> 87e5047d2 (forced update)
Modified tests for the 'another not fully qualified class type' issue (FLEX-33918)
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/16551fb2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/16551fb2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/16551fb2
Branch: refs/heads/maven
Commit: 16551fb2a883b9b1bda81341411632feaea2f242
Parents: d56aaa9
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 20 00:13:35 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 20 00:13:35 2013 +0100
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/TestFlexJSExpressions.java | 2 +-
compiler.jx.tests/test-files/flexjs/projects/interfaces/Test.as | 4 ++++
.../test-files/flexjs/projects/interfaces/Test_result.js | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/16551fb2/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index c378343..76f86e7 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -701,7 +701,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions
"public class B {public function b(o:Object):int { var a:B; a = o as B; }}",
IFunctionNode.class, WRAP_LEVEL_PACKAGE, true);
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @expose\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {B} */ a;\n a = org.apache.flex.utils.Language.as(o, foo.bar.B);\n}");
+ assertOut("/**\n * @expose\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a;\n a = org.apache.flex.utils.Language.as(o, foo.bar.B);\n}");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/16551fb2/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test.as
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test.as b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test.as
index 6f251c9..0e26861 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test.as
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test.as
@@ -16,6 +16,10 @@ package
public function doSomething(ic:IC):IC
{
+ for (var i:int = 0; i < 3; i++ {
+ var a:A = null;
+ }
+
return ic;
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/16551fb2/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
index 838e617..ced2a20 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
@@ -35,6 +35,9 @@ goog.inherits(Test, classes.A);
* @return {interfaces.IC}
*/
Test.prototype.doSomething = function(ic) {
+ for (var /** @type {number} */ i = 0; i < 3; i++) {
+ var /** @type {classes.A} */ a = null;
+ }
return ic;
};
[22/50] git commit: [flex-falcon] [refs/heads/maven] - Proper JSDoc
annotations for interface members.
Posted by jo...@apache.org.
Proper JSDoc annotations for interface members.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/17ccd49c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/17ccd49c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/17ccd49c
Branch: refs/heads/maven
Commit: 17ccd49c9510102d7507cea0ef92730190e44e82
Parents: dfa5892
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 11:15:21 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 11:15:21 2013 +0100
----------------------------------------------------------------------
.../codegen/js/goog/IJSGoogDocEmitter.java | 3 ++
.../codegen/js/flexjs/JSFlexJSDocEmitter.java | 41 ++++++++++++++++++++
.../codegen/js/flexjs/JSFlexJSEmitter.java | 2 +
.../codegen/js/goog/JSGoogDocEmitter.java | 7 ++++
4 files changed, 53 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/17ccd49c/compiler.jx/src/org/apache/flex/compiler/codegen/js/goog/IJSGoogDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/codegen/js/goog/IJSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/codegen/js/goog/IJSGoogDocEmitter.java
index b3d3ad9..6903da8 100644
--- a/compiler.jx/src/org/apache/flex/compiler/codegen/js/goog/IJSGoogDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/codegen/js/goog/IJSGoogDocEmitter.java
@@ -25,6 +25,7 @@ import org.apache.flex.compiler.definitions.IDefinition;
import org.apache.flex.compiler.definitions.ITypeDefinition;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.tree.as.IASNode;
+import org.apache.flex.compiler.tree.as.IDefinitionNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.apache.flex.compiler.tree.as.IInterfaceNode;
import org.apache.flex.compiler.tree.as.IParameterNode;
@@ -51,6 +52,8 @@ public interface IJSGoogDocEmitter extends IJSDocEmitter
void emitInterfaceDoc(IInterfaceNode node, ICompilerProject project);
+ void emitInterfaceMemberDoc(IDefinitionNode node, ICompilerProject project);
+
void emitFieldDoc(IVariableNode node, IDefinition def);
void emitMethodDoc(IFunctionNode node, ICompilerProject project);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/17ccd49c/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
index adb3b60..ab75379 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
@@ -34,6 +34,7 @@ import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
import org.apache.flex.compiler.internal.definitions.InterfaceDefinition;
import org.apache.flex.compiler.internal.scopes.ASScope;
import org.apache.flex.compiler.projects.ICompilerProject;
+import org.apache.flex.compiler.tree.as.IDefinitionNode;
import org.apache.flex.compiler.tree.as.IExpressionNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.apache.flex.compiler.tree.as.IParameterNode;
@@ -153,6 +154,46 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter
end();
}
}
+
+ public void emitInterfaceMemberDoc(IDefinitionNode node, ICompilerProject project)
+ {
+ boolean hasDoc = false;
+
+ String returnType = ((IFunctionNode) node).getReturnType();
+ if (returnType != ""
+ && returnType != ASEmitterTokens.VOID.getToken()) // has return
+ {
+ begin();
+ hasDoc = true;
+
+ ITypeDefinition tdef = ((IFunctionDefinition)node.getDefinition())
+ .resolveReturnType(project);
+
+ String packageName = "";
+ if (tdef instanceof InterfaceDefinition)
+ packageName = tdef.getPackageName();
+ else
+ packageName = node.getPackageName();
+
+ emitReturn((IFunctionNode) node, packageName);
+ }
+
+ IParameterNode[] parameters = ((IFunctionNode) node).getParameterNodes();
+ for (IParameterNode pnode : parameters)
+ {
+ if (!hasDoc)
+ {
+ begin();
+ hasDoc = true;
+ }
+
+ IExpressionNode enode = pnode.getNameExpressionNode();
+ emitParam(pnode, enode.resolveType(project).getPackageName());
+ }
+
+ if (hasDoc)
+ end();
+ }
@Override
public void emitMethodAccess(IFunctionNode node)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/17ccd49c/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index 947a268..e2d26f1 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -230,6 +230,8 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
writeNewline();
writeNewline();
+ getDoc().emitInterfaceMemberDoc((IFunctionNode) mnode, project);
+
write(qname);
write(ASEmitterTokens.MEMBER_ACCESS);
write(JSEmitterTokens.PROTOTYPE);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/17ccd49c/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
index 915265a..1ca5781 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
@@ -42,6 +42,7 @@ import org.apache.flex.compiler.internal.semantics.SemanticUtils;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.as.IClassNode;
+import org.apache.flex.compiler.tree.as.IDefinitionNode;
import org.apache.flex.compiler.tree.as.IExpressionNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.apache.flex.compiler.tree.as.IInterfaceNode;
@@ -94,6 +95,12 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
end();
}
+ public void emitInterfaceMemberDoc(IDefinitionNode node, ICompilerProject project)
+ {
+ // (erikdebruin) placeholder method, so we don't have to further complicate
+ // the interface structure
+ }
+
@Override
public void emitFieldDoc(IVariableNode node, IDefinition def)
{
[32/50] git commit: [flex-falcon] [refs/heads/maven] - add jar to
fixcrlf excludes
Posted by jo...@apache.org.
add jar to fixcrlf excludes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/544a36a9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/544a36a9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/544a36a9
Branch: refs/heads/maven
Commit: 544a36a9b9d68b2fcd17af10b6bb622e6fcaa1b3
Parents: aab2352
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 18 13:48:56 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 18 13:48:56 2013 -0800
----------------------------------------------------------------------
build.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/544a36a9/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9994b1f..241a0c3 100644
--- a/build.xml
+++ b/build.xml
@@ -228,8 +228,9 @@
<exclude name="**/*.fla"/>
<exclude name="**/*.flv"/>
<exclude name="**/*.gif"/>
- <exclude name="**/*.mp3"/>
+ <exclude name="**/*.jar"/>
<exclude name="**/*.jpg"/>
+ <exclude name="**/*.mp3"/>
<exclude name="**/*.pbj"/>
<exclude name="**/*.png"/>
<exclude name="**/*.sh"/>
@@ -317,8 +318,9 @@
<exclude name="**/*.fla"/>
<exclude name="**/*.flv"/>
<exclude name="**/*.gif"/>
- <exclude name="**/*.mp3"/>
+ <exclude name="**/*.jar"/>
<exclude name="**/*.jpg"/>
+ <exclude name="**/*.mp3"/>
<exclude name="**/*.pbj"/>
<exclude name="**/*.png"/>
<exclude name="**/*.sh"/>
[45/50] git commit: [flex-falcon] [refs/heads/maven] - put more echos
in the downloads script because it is used in the installer
Posted by jo...@apache.org.
put more echos in the downloads script because it is used in the installer
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c252ce96
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c252ce96
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c252ce96
Branch: refs/heads/maven
Commit: c252ce961ba64c0123ccecddfaad11eb732976d9
Parents: b5a0626
Author: Alex Harui <ah...@apache.org>
Authored: Fri Feb 14 21:43:12 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Feb 14 21:43:54 2014 -0800
----------------------------------------------------------------------
compiler.jx/downloads.xml | 35 +++++++++++++++++++++++++++++++-
compiler/downloads.xml | 46 +++++++++++++++++++++++++++++++++++-------
2 files changed, 73 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c252ce96/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index ccf2bc8..3db5ae7 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -180,6 +180,17 @@
<target name="closure-jar" depends="closure-jar-check" unless="closure.jar.exists"
description="Copies the closure build jars.">
<mkdir dir="${lib.dir}/google/closure-compiler" />
+ <antcall target="echo-closure-jar">
+ <param name="srcUrl" value="http://dl.google.com/closure-compiler"/>
+ <!--
+ erikdebruin: because of a dependency Falcon has on an old version of Guava,
+ any versions of the Closure compiler after sept. 17, 2012 cause exceptions
+ when doing a release build with FalconJx.
+
+ Was: param name="zipFile" value="compiler-latest.zip"
+ -->
+ <param name="zipFile" value="${closure.download.filename}"/>
+ </antcall>
<antcall target="download-zip">
<param name="srcUrl" value="http://dl.google.com/closure-compiler"/>
<!--
@@ -201,7 +212,16 @@
<fileset dir="${download.dir}/temp" includes="**/*"/>
</delete>
</target>
-
+
+ <target name="echo-closure-jar" if="installer">
+ <echo file="${basedir}/closure.properties">closure.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/closure.properties" token="{0}" value="${zipFile}" />
+ <replace file="${basedir}/closure.properties" token="{1}" value="${srcUrl}" />
+ <property file="${basedir}/closure.properties" />
+ <delete file="${basedir}/closure.properties" />
+ <echo>${closure.echo}</echo>
+ </target>
+
<!--
commons-io
-->
@@ -214,6 +234,10 @@
unless="commons.io.jar.exists"
description="Copies commons-io.jar to the lib directory.">
+ <antcall target="echo-commons-jar">
+ <param name="srcUrl" value="http://archive.apache.org/dist/commons/io/binaries"/>
+ <param name="zipFile" value="${commons-io.name}-bin.tar.gz"/>
+ </antcall>
<antcall target="download-zip">
<param name="srcUrl" value="http://archive.apache.org/dist/commons/io/binaries"/>
<param name="zipFile" value="${commons-io.name}-bin.tar.gz"/>
@@ -230,6 +254,15 @@
<delete dir="${download.dir}/temp/${commons-io.name}"/>
</target>
+ <target name="echo-commons-jar" if="installer">
+ <echo file="${basedir}/commons.properties">commons.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/commons.properties" token="{0}" value="${zipFile}" />
+ <replace file="${basedir}/commons.properties" token="{1}" value="${srcUrl}" />
+ <property file="${basedir}/commons.properties" />
+ <delete file="${basedir}/commons.properties" />
+ <echo>${commons.echo}</echo>
+ </target>
+
<!--
Cleanup
-->
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c252ce96/compiler/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler/downloads.xml b/compiler/downloads.xml
index db2eca7..3938b2a 100644
--- a/compiler/downloads.xml
+++ b/compiler/downloads.xml
@@ -51,7 +51,9 @@
<property name="antlr.src.url" value="http://antlr3.org/download"/>
<property name="antlr.src.file" value="antlr-3.3-complete.jar"/>
-
+
+ <property name="INFO_DOWNLOADING_FILE_FROM" value="Downloading {0} from: {1}" />
+
<!--
Because the downloads requires a network connection and the JARs don't change very often,
they are each downloaded only if they don't already exist.
@@ -213,7 +215,12 @@
<target name="antlr-jar" depends="antlr-jar-check" unless="antlr.jar.exists"
description="Copies the antlr jar to the lib directory.">
- <echo message="Obtaining lib/antlr.jar"/>
+ <echo file="${basedir}/antlr.properties">antlr.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/antlr.properties" token="{0}" value="${antlr.src.file}" />
+ <replace file="${basedir}/antlr.properties" token="{1}" value="${antlr.src.url}" />
+ <property file="${basedir}/antlr.properties" />
+ <delete file="${basedir}/antlr.properties" />
+ <echo>${antlr.echo}</echo>
<antcall target="antlr-download-jar"/>
<echo file="${lib.dir}/antlr-LICENSE.TXT">http://www.antlr.org/license.html</echo>
</target>
@@ -245,7 +252,12 @@
<target name="commons-cli-jar" depends="commons-cli-jar-check" unless="commons.cli.jar.exists"
description="Downloads and copies common-cli.jar to the lib directory.">
- <echo message="Obtaining lib/commons-cli.jar"/>
+ <echo file="${basedir}/cli.properties">cli.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/cli.properties" token="{0}" value="${commons-cli.name}-bin.tar.gz" />
+ <replace file="${basedir}/cli.properties" token="{1}" value="http://archive.apache.org/dist/commons/cli/binaries" />
+ <property file="${basedir}/cli.properties" />
+ <delete file="${basedir}/cli.properties" />
+ <echo>${cli.echo}</echo>
<antcall target="download-zip">
<param name="srcUrl" value="http://archive.apache.org/dist/commons/cli/binaries"/>
<param name="zipFile" value="${commons-cli.name}-bin.tar.gz"/>
@@ -273,7 +285,12 @@
<target name="commons-io-jar" depends="commons-io-jar-check"
unless="commons.io.jar.exists"
description="Copies commons-io.jar to the lib directory.">
- <echo message="Obtaining lib/commons-io.jar"/>
+ <echo file="${basedir}/io.properties">io.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/io.properties" token="{0}" value="${commons-io.name}-bin.tar.gz" />
+ <replace file="${basedir}/io.properties" token="{1}" value="http://archive.apache.org/dist/commons/io/binaries" />
+ <property file="${basedir}/io.properties" />
+ <delete file="${basedir}/io.properties" />
+ <echo>${io.echo}</echo>
<antcall target="download-zip">
<param name="srcUrl" value="http://archive.apache.org/dist/commons/io/binaries"/>
<param name="zipFile" value="${commons-io.name}-bin.tar.gz"/>
@@ -302,7 +319,12 @@
<target name="guava-jar" depends="guava-jar-check"
unless="guava.jar.exists"
description="Downloads and copies guava.jar to the lib directory.">
- <echo message="Obtaining lib/guava.jar"/>
+ <echo file="${basedir}/guava.properties">guava.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/guava.properties" token="{0}" value="guava-15.0.jar" />
+ <replace file="${basedir}/guava.properties" token="{1}" value="http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0" />
+ <property file="${basedir}/guava.properties" />
+ <delete file="${basedir}/guava.properties" />
+ <echo>${guava.echo}</echo>
<antcall target="download-jar">
<param name="srcUrl" value="http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0"/>
<param name="srcJarFile" value="guava-15.0.jar"/>
@@ -321,7 +343,12 @@
<target name="jburg-jar" depends="jburg-jar-check" unless="jburg.jar.exists"
description="Copies jburg.jar to the lib directory.">
- <echo message="Obtaining lib/jburg.jar"/>
+ <echo file="${basedir}/jburg.properties">jburg.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/jburg.properties" token="{0}" value="${jburg.name}.tar.gz" />
+ <replace file="${basedir}/jburg.properties" token="{1}" value="http://downloads.sourceforge.net/project/jburg" />
+ <property file="${basedir}/jburg.properties" />
+ <delete file="${basedir}/jburg.properties" />
+ <echo>${jburg.echo}</echo>
<antcall target="download-zip">
<param name="srcUrl" value="http://downloads.sourceforge.net/project/jburg"/>
<param name="zipFile" value="${jburg.name}.tar.gz"/>
@@ -350,7 +377,12 @@
<target name="lzma-jar" depends="lzma-jar-check" unless="lzma.jar.exists"
description="Copies the lzma build jars.">
- <echo message="Obtaining lib/lzma.jar"/>
+ <echo file="${basedir}/lzma.properties">lzma.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
+ <replace file="${basedir}/lzma.properties" token="{0}" value="lzma-9.20.jar.zip" />
+ <replace file="${basedir}/lzma.properties" token="{1}" value="http://www.java2s.com/Code/JarDownload/lzma" />
+ <property file="${basedir}/lzma.properties" />
+ <delete file="${basedir}/lzma.properties" />
+ <echo>${lzma.echo}</echo>
<antcall target="download-zip">
<param name="srcUrl" value="http://www.java2s.com/Code/JarDownload/lzma"/>
<param name="zipFile" value="lzma-9.20.jar.zip"/>
[38/50] git commit: [flex-falcon] [refs/heads/maven] - more tweaks to
compiler.jx download script
Posted by jo...@apache.org.
more tweaks to compiler.jx download script
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/1df3151f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1df3151f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1df3151f
Branch: refs/heads/maven
Commit: 1df3151f9b97d4bb604c09536d95a77cefc17a0e
Parents: 358194f
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jan 14 22:31:58 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jan 14 22:31:58 2014 -0800
----------------------------------------------------------------------
compiler.jx/downloads.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1df3151f/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index 58e4265..ccf2bc8 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -48,7 +48,7 @@
description="Downloads all the required thirdparty JARs"/>
<target name="prepare" >
- <echo message="Making lib directory ${basedir}/${lib.dir}"/>
+ <echo message="Making lib directory ${lib.dir}"/>
<mkdir dir="${lib.dir}" />
</target>
@@ -210,7 +210,7 @@
<available file="${lib.dir}/commons-io.jar" property="commons.io.jar.exists"/>
</target>
- <target name="commons-io-jar" depends="commons-io-jar-check"
+ <target name="commons-io-jar-jx" depends="commons-io-jar-check"
unless="commons.io.jar.exists"
description="Copies commons-io.jar to the lib directory.">
[30/50] git commit: [flex-falcon] [refs/heads/maven] - add installer
to packages
Posted by jo...@apache.org.
add installer to packages
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/41c7be47
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/41c7be47
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/41c7be47
Branch: refs/heads/maven
Commit: 41c7be4793f78ba482babb9159e6841c8d60aabb
Parents: 6280785
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 16 12:13:16 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 16 12:13:16 2013 -0800
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/41c7be47/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c522b45..9994b1f 100644
--- a/build.xml
+++ b/build.xml
@@ -202,6 +202,8 @@
<include name="env-template.properties"/>
<include name="READme"/>
<include name="RELEASE_NOTES"/>
+ <include name="installer.xml"/>
+ <include name="installer.properties/**"/>
</fileset>
<fileset dir="${FLEX_SDK_HOME}">
<include name="LICENSE"/>
[48/50] git commit: [flex-falcon] [refs/heads/maven] - first two poms
for mavenizing flex falcon project and main compiler. Both build successful.
Note that JBurg dependency is not available in public repository yet
Posted by jo...@apache.org.
first two poms for mavenizing flex falcon project and main compiler. Both build successful. Note that JBurg dependency is not available in public repository yet
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b8ba2086
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b8ba2086
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b8ba2086
Branch: refs/heads/maven
Commit: b8ba2086577ce54460a4747e7590110c5938673b
Parents: 9fdf5bf
Author: Jose Barragan <jo...@apache.org>
Authored: Fri Feb 28 10:45:22 2014 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Fri Feb 28 10:47:34 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 21 ++++++++++++++
2 files changed, 98 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b8ba2086/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
new file mode 100644
index 0000000..3aa8061
--- /dev/null
+++ b/compiler/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>falcon</artifactId>
+ <groupId>org.apache.flex</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>compiler</artifactId>
+ <name>Falcon Compiler</name>
+ <description>Falcon Flex main compiler</description>
+
+ <packaging>jar</packaging>
+
+ <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>de.jflex</groupId>
+ <artifactId>maven-jflex-plugin</artifactId>
+ <version>1.4.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- antlr - http://www.antlr.org/download/antlr-3.3-complete.jar -->
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.3</version>
+ </dependency>
+ <!-- commons-cli - http://archive.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz -->
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <!-- commons-io - http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1-bin.tar.gz -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <!-- guava - http://guava-libraries.googlecode.com/files/guava-r08.zip -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r08</version>
+ </dependency>
+ <!-- JBurg - http://downloads.sourceforge.net/project/jburg/jburg-1.10.1.tar.gz (warning! this is not avaialbe publicly, I'm using a private maven repo for this one-->
+ <dependency>
+ <groupId>net.sourceforge</groupId>
+ <artifactId>jburg</artifactId>
+ <version>1.10.1</version>
+ </dependency>
+ <!-- lzma-sdk - http://downloads.sourceforge.net/project/sevenzip/LZMA%20SDK/lzma920.tar.bz2 -->
+ <dependency>
+ <groupId>com.github.jponge</groupId>
+ <artifactId>lzma-java</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b8ba2086/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..eb992e6
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.flex</groupId>
+ <artifactId>falcon</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Falcon</name>
+ <description>Flex Java Compiler Modules</description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>compiler</module>
+ </modules>
+
+</project>
\ No newline at end of file
[40/50] git commit: [flex-falcon] [refs/heads/maven] - clean up rat
report for falcon
Posted by jo...@apache.org.
clean up rat report for falcon
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c9ead982
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c9ead982
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c9ead982
Branch: refs/heads/maven
Commit: c9ead9824b9f7339bbab6b784d40c10af74534ad
Parents: cc6debf
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jan 15 22:17:33 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 15 22:17:33 2014 -0800
----------------------------------------------------------------------
compiler.tests/Hello.as | 18 ++++++++++++++++++
compiler.tests/template-unittest.properties | 19 +++++++++++++++++++
.../compiler/internal/css/CSSBaseTests.java | 19 +++++++++++++++++++
.../as/codegen/CompoundAssignmentPatterns.jbg | 19 +++++++++++++++++++
.../as/codegen/CompoundAssignmentRules.jbg | 19 +++++++++++++++++++
.../codegen/CompoundLogicalAssignmentRules.jbg | 19 +++++++++++++++++++
.../internal/as/codegen/FunctionPatterns.jbg | 19 +++++++++++++++++++
.../internal/as/codegen/FunctionRules.jbg | 19 +++++++++++++++++++
.../internal/as/codegen/SemanticErrors.jbg | 19 +++++++++++++++++++
.../as/codegen/UnknownTreeHandlerPatterns.xml | 20 ++++++++++++++++++++
.../parsing/as/ImportMetadataTokenTypes.txt | 18 ++++++++++++++++++
.../internal/parsing/as/skeleton.default | 18 ++++++++++++++++++
.../internal/parsing/as/skeleton.falcon | 18 ++++++++++++++++++
.../internal/targets/NilTargetAttributes.java | 19 +++++++++++++++++++
.../apache/flex/compiler/tree/mxml/index.html | 20 +++++++++++++++++++-
15 files changed, 282 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler.tests/Hello.as
----------------------------------------------------------------------
diff --git a/compiler.tests/Hello.as b/compiler.tests/Hello.as
index f80a8c2..487dac4 100644
--- a/compiler.tests/Hello.as
+++ b/compiler.tests/Hello.as
@@ -1,3 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
package
{
import flash.display.Sprite;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler.tests/template-unittest.properties
----------------------------------------------------------------------
diff --git a/compiler.tests/template-unittest.properties b/compiler.tests/template-unittest.properties
index 1b5fa11..96648da 100644
--- a/compiler.tests/template-unittest.properties
+++ b/compiler.tests/template-unittest.properties
@@ -1,3 +1,22 @@
+################################################################################
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+################################################################################
+
# copy template-unittest.properties to unittest.properties
#
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler.tests/unit-tests/org/apache/flex/compiler/internal/css/CSSBaseTests.java
----------------------------------------------------------------------
diff --git a/compiler.tests/unit-tests/org/apache/flex/compiler/internal/css/CSSBaseTests.java b/compiler.tests/unit-tests/org/apache/flex/compiler/internal/css/CSSBaseTests.java
index 613331e..1e139d0 100644
--- a/compiler.tests/unit-tests/org/apache/flex/compiler/internal/css/CSSBaseTests.java
+++ b/compiler.tests/unit-tests/org/apache/flex/compiler/internal/css/CSSBaseTests.java
@@ -1,3 +1,22 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
package org.apache.flex.compiler.internal.css;
import static org.hamcrest.core.IsNot.not;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentPatterns.jbg
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentPatterns.jbg b/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentPatterns.jbg
index 65ed418..521205c 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentPatterns.jbg
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentPatterns.jbg
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
// x op= foo
Pattern compoundAssignToName
Op_COMPOUND_ASSIGN(name operand, expression expr);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentRules.jbg
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentRules.jbg b/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentRules.jbg
index dda9482..0cd819a 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentRules.jbg
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundAssignmentRules.jbg
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
void_expression = Pattern compoundAssignToName : 4
JBurg.Reduction reducer.generateCompoundAssignment(__p, operand, expr, opcode, DISCARD_VALUE);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundLogicalAssignmentRules.jbg
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundLogicalAssignmentRules.jbg b/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundLogicalAssignmentRules.jbg
index a207b56..510f11c 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundLogicalAssignmentRules.jbg
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/CompoundLogicalAssignmentRules.jbg
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
void_expression = Pattern compoundAssignToName : 4
JBurg.Reduction reducer.generateCompoundLogicalAssignment(__p, operand, expr, IsAnd, DISCARD_VALUE);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionPatterns.jbg
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionPatterns.jbg b/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionPatterns.jbg
index 41e4bbb..c10e313 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionPatterns.jbg
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionPatterns.jbg
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
// Prototype patterns for function nodes.
// Getter/Setter functions specialize the
// pattern with their own node ID.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionRules.jbg
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionRules.jbg b/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionRules.jbg
index 74ede87..14868b0 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionRules.jbg
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/FunctionRules.jbg
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
// Reduction actions for function support,
// placed in their own .jbg file so they
// can be included in a parameterized fashion.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/as/codegen/SemanticErrors.jbg
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/SemanticErrors.jbg b/compiler/src/org/apache/flex/compiler/internal/as/codegen/SemanticErrors.jbg
index 6f7dc0e..8871ae7 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/SemanticErrors.jbg
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/SemanticErrors.jbg
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
/*
* ***********************
* ** Semantic Errors **
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/as/codegen/UnknownTreeHandlerPatterns.xml
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/UnknownTreeHandlerPatterns.xml b/compiler/src/org/apache/flex/compiler/internal/as/codegen/UnknownTreeHandlerPatterns.xml
index 4ca1c84..2e70856 100644
--- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/UnknownTreeHandlerPatterns.xml
+++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/UnknownTreeHandlerPatterns.xml
@@ -1,3 +1,23 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+
<SEW>
<!-- "Known malformed" patterns -->
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/parsing/as/ImportMetadataTokenTypes.txt
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/as/ImportMetadataTokenTypes.txt b/compiler/src/org/apache/flex/compiler/internal/parsing/as/ImportMetadataTokenTypes.txt
index f30edf0..478e80d 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/as/ImportMetadataTokenTypes.txt
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/as/ImportMetadataTokenTypes.txt
@@ -1,3 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
Metadata // output token type name
EOF=1
TOKEN_NUMBER=4
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.default
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.default b/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.default
index cb01e6b..a53e545 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.default
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.default
@@ -1,3 +1,21 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
/** This character denotes the end of file */
public static final int YYEOF = -1;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon b/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon
index 8fb74ef..f906c80 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon
@@ -1,3 +1,21 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
/** This character denotes the end of file */
public static final int YYEOF = -1;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/internal/targets/NilTargetAttributes.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/NilTargetAttributes.java b/compiler/src/org/apache/flex/compiler/internal/targets/NilTargetAttributes.java
index 7cb8358..cc2241d 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/NilTargetAttributes.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/NilTargetAttributes.java
@@ -1,3 +1,22 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
package org.apache.flex.compiler.internal.targets;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9ead982/compiler/src/org/apache/flex/compiler/tree/mxml/index.html
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/tree/mxml/index.html b/compiler/src/org/apache/flex/compiler/tree/mxml/index.html
index bcf427d..04e6c56 100644
--- a/compiler/src/org/apache/flex/compiler/tree/mxml/index.html
+++ b/compiler/src/org/apache/flex/compiler/tree/mxml/index.html
@@ -1 +1,19 @@
-This package contains interfaces providing a read-only view of MXML-specific nodes in MXML trees.
\ No newline at end of file
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+This package contains interfaces providing a read-only view of MXML-specific nodes in MXML trees.
[03/50] git commit: [flex-falcon] [refs/heads/maven] - remove some
asserts
Posted by jo...@apache.org.
remove some asserts
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3d87ef91
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3d87ef91
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3d87ef91
Branch: refs/heads/maven
Commit: 3d87ef91a00cbc30778c8e54028da66031a93631
Parents: 685f5f1
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 20 12:21:13 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 20 12:21:43 2013 -0800
----------------------------------------------------------------------
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 +-
.../internal/codegen/databinding/MXMLBindingDirectiveHelper.java | 1 -
.../flex/compiler/internal/css/codegen/CSSCompilationSession.java | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d87ef91/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index f722223..fc7392b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -413,7 +413,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
{
// TODO: figure out what this looks like
// propertyGetterFunction = this.propertyGetter;
- assert propertyGetterFunction != null;
+ // assert propertyGetterFunction != null;
}
else if (watcherInfoBase.isRoot && makeStaticWatcher)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d87ef91/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
index b4ea1c3..0fb28a8 100644
--- a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
+++ b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
@@ -290,7 +290,6 @@ public class MXMLBindingDirectiveHelper
if (watcherInfoBase.isRoot && !makeStaticWatcher)
{
propertyGetterFunction = this.propertyGetter;
- assert propertyGetterFunction != null;
}
else if (watcherInfoBase.isRoot && makeStaticWatcher)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d87ef91/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java b/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
index ce9c50d..29d0c9a 100644
--- a/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
+++ b/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
@@ -168,8 +168,6 @@ public class CSSCompilationSession
*/
protected ICSSDocument synthesisNormalizedCSS()
{
- assert singleSelectorRules.isEmpty() && rulesWithMediaQueries.isEmpty() : "CSSCompilationSession.synthesisNormalizedCSS() can only be called once per compilation session.";
-
for (final ICSSDocument cssDocument : cssDocuments)
{
for (final ICSSRule newRule : cssDocument.getRules())
[08/50] git commit: [flex-falcon] [refs/heads/maven] - Fixing
"resource leak" warning.
Posted by jo...@apache.org.
Fixing "resource leak" warning.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7dbe7e70
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7dbe7e70
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7dbe7e70
Branch: refs/heads/maven
Commit: 7dbe7e70b1230fe0681fc11e2a05b14f37420592
Parents: 4bac1cf
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Nov 22 09:03:55 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Mon Nov 25 09:21:33 2013 +0100
----------------------------------------------------------------------
.../src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dbe7e70/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index 5add337..fac47a3 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -264,6 +264,7 @@ public class GoogDepsWriter {
deps.add(s);
}
}
+ scanner.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
}
[07/50] git commit: [flex-falcon] [refs/heads/maven] - add media
query to generated CSS
Posted by jo...@apache.org.
add media query to generated CSS
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4bac1cff
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4bac1cff
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4bac1cff
Branch: refs/heads/maven
Commit: 4bac1cfffd50a68ffba57ef6c0ba47c88792b203
Parents: 45c6be9
Author: Alex Harui <ah...@apache.org>
Authored: Fri Nov 22 09:30:09 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Nov 22 09:30:09 2013 -0800
----------------------------------------------------------------------
.../internal/css/codegen/CSSReducer.java | 46 +++++++++++++++++++-
.../css/codegen/ICSSRuntimeConstants.java | 3 +-
2 files changed, 46 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4bac1cff/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSReducer.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSReducer.java b/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSReducer.java
index f41aafb..db63df3 100644
--- a/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSReducer.java
+++ b/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSReducer.java
@@ -172,8 +172,18 @@ public class CSSReducer implements ICSSCodeGenResult
* The "factory" with which the styles will be registered.
*/
private final Integer factory;
+
+ /**
+ * The media query string building up for the selector
+ */
+ private String mediaQueryString;
/**
+ * The map of media query to factory functions
+ */
+ private HashMap<String,ArrayList<String>> mediaQueryMap = new HashMap<String, ArrayList<String>>();
+
+ /**
* Root reduction rule. It aggregates all the instructions and emit ABC code
* of {@code StyleDateClass}.
*
@@ -469,7 +479,26 @@ public class CSSReducer implements ICSSCodeGenResult
{
// Generate anonymous function.
final MethodInfo methodInfo = new MethodInfo();
- methodInfo.setMethodName(((CSSRule)site).getSelectorGroup().get(0).getElementName());
+ String miName = ((CSSRule)site).getSelectorGroup().get(0).getElementName();
+ if (mediaQueryString != null)
+ {
+ pushNumericConstant(ICSSRuntimeConstants.MEDIA_QUERY, selector.arrayReduction);
+ selector.arrayReduction.addInstruction(ABCConstants.OP_pushstring, mediaQueryString);
+
+ miName = mediaQueryString + "_" + miName;
+ if (mediaQueryMap.containsKey(mediaQueryString))
+ {
+ ArrayList<String> factoryList = mediaQueryMap.get(mediaQueryString);
+ factoryList.add(miName);
+ }
+ else
+ {
+ ArrayList<String> factoryList = new ArrayList<String>();
+ factoryList.add(miName);
+ mediaQueryMap.put(mediaQueryString, factoryList);
+ }
+ }
+ methodInfo.setMethodName(miName);
methodInfo.setParamTypes(EMPTY_PARAM_TYPES);
final IMethodVisitor methodVisitor = abcVisitor.visitMethod(methodInfo);
methodVisitor.visit();
@@ -488,8 +517,17 @@ public class CSSReducer implements ICSSCodeGenResult
// Populate the closure name-body map with method info objects.
for (final String name : selector.closureReduction.keySet())
{
- selector.closureReduction.put(name, methodInfo);
+ if (mediaQueryString != null)
+ {
+ selector.closureReduction.remove(name);
+ selector.closureReduction.put(mediaQueryString + "_" + name,
+ methodInfo);
+ }
+ else
+ selector.closureReduction.put(name, methodInfo);
}
+
+ mediaQueryString = null;
return selector;
}
@@ -636,6 +674,10 @@ public class CSSReducer implements ICSSCodeGenResult
public PairOfInstructionLists reduceMediaQueryCondition(ICSSNode site)
{
// TODO Implement @media code generation
+ if (mediaQueryString == null)
+ mediaQueryString = site.toString();
+ else
+ mediaQueryString += "and " + site.toString();
return null;
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4bac1cff/compiler/src/org/apache/flex/compiler/internal/css/codegen/ICSSRuntimeConstants.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/css/codegen/ICSSRuntimeConstants.java b/compiler/src/org/apache/flex/compiler/internal/css/codegen/ICSSRuntimeConstants.java
index 42287ce..ef6bc8d 100644
--- a/compiler/src/org/apache/flex/compiler/internal/css/codegen/ICSSRuntimeConstants.java
+++ b/compiler/src/org/apache/flex/compiler/internal/css/codegen/ICSSRuntimeConstants.java
@@ -32,7 +32,8 @@ public interface ICSSRuntimeConstants
static final Integer SELECTOR = 0;
static final Integer CONDITION = 1;
static final Integer STYLE_DECLARATION = 2;
-
+ static final Integer MEDIA_QUERY = 3;
+
// From CSSFactory
static final Integer DEFAULT_FACTORY = 0;
static final Integer FACTORY = 1;
[44/50] git commit: [flex-falcon] [refs/heads/maven] - guarantee that
target-player gets processed before library-path otherwise wrong player gets
checked
Posted by jo...@apache.org.
guarantee that target-player gets processed before library-path otherwise wrong player gets checked
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b5a06269
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b5a06269
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b5a06269
Branch: refs/heads/maven
Commit: b5a06269f51aa1843cc6da79dd3a6eb0f4848345
Parents: 8966eda
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jan 22 16:42:40 2014 +0000
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 22 16:42:40 2014 +0000
----------------------------------------------------------------------
.../compiler/config/ConfigurationBuffer.java | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b5a06269/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java b/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
index b6484fd..f76bf17 100644
--- a/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
+++ b/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
@@ -102,6 +102,8 @@ import com.google.common.collect.ImmutableList;
*/
public final class ConfigurationBuffer
{
+ private static final String TARGET_PLAYER = "target-player";
+
public ConfigurationBuffer(Class<? extends Configuration> configClass)
{
this(configClass, new HashMap<String, String>());
@@ -714,6 +716,27 @@ public final class ConfigurationBuffer
Set<String> done = new HashSet<String>();
boolean success = true;
+ // get target-player first because its setting affect expansion of some
+ // tokens later. The varList is populated by getMethods() which returns
+ // the methods in random order and can result in compiler.library-path being
+ // evaluated before target-player and then we end up looking up the wrong
+ // version of playerglobal.
+ if (varList.contains(TARGET_PLAYER))
+ {
+ varList.remove(TARGET_PLAYER);
+ if (varMap.containsKey(TARGET_PLAYER))
+ {
+ try
+ {
+ commitVariable(config, TARGET_PLAYER, done);
+ }
+ catch (ConfigurationException e)
+ {
+ problems.add(new ConfigurationProblem(e));
+ success = false;
+ }
+ }
+ }
for (Iterator<String> vars = varList.iterator(); vars.hasNext();)
{
String var = vars.next();
[25/50] git commit: [flex-falcon] [refs/heads/maven] - release
packaging scripts
Posted by jo...@apache.org.
release packaging scripts
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/66bd328e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/66bd328e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/66bd328e
Branch: refs/heads/maven
Commit: 66bd328ea8c197281331fab05609250fa3715b30
Parents: f95e2d2
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 15 08:48:13 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Dec 15 23:34:47 2013 -0800
----------------------------------------------------------------------
build.xml | 317 ++++++++++++++++++++++++++++++++++++++++++++++++
compiler/build.xml | 8 +-
2 files changed, 324 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/66bd328e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2ed7945..ee9ff96 100644
--- a/build.xml
+++ b/build.xml
@@ -21,6 +21,13 @@
<project name="falcon" default="main" basedir=".">
+ <property name="kit.prefix" value="apache-flex-falcon-${release.version}"/>
+ <property name="kit.jx.prefix" value="apache-flex-falconjx-${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"/>
+ <property name="binary.jx.kit" value="${kit.jx.prefix}-bin"/>
+
<target name="javadoc" description="Builds Falcon's Javadoc at generated/javadoc.">
<ant dir="compiler" target="javadoc"/>
</target>
@@ -40,6 +47,10 @@
<target name="jx" depends="compiler.jx, compiler.jx.tests" description="Builds FalconJX" />
+ <target name="compiler.binary.release" >
+ <ant dir="compiler" target="binary-release" />
+ </target>
+
<target name="tests" description="Runs the tests.">
<ant dir="compiler.tests" target="main"/>
</target>
@@ -76,4 +87,310 @@
<ant dir="compiler.jx.tests" target="wipe"/>
</target>
+ <target name="check-flex-home" unless="mxmlc.jar.exists"
+ description="Check FLEX_HOME for both a directory and an exe file">
+
+ <echo message="FLEX_HOME is ${env.FLEX_HOME}"/>
+
+ <available file="${env.FLEX_HOME}"
+ type="dir"
+ property="FLEX_SDK_HOME"
+ value="${env.FLEX_HOME}" />
+
+ <fail message="The environment variable FLEX_HOME is not set to a directory"
+ unless="FLEX_SDK_HOME"/>
+
+ <condition property="mxmlc.jar.exists">
+ <available file="${env.FLEX_HOME}/lib/mxmlc.jar" type="file"/>
+ </condition>
+
+ <fail message="The directory ${env.FLEX_HOME} does not contain mxmlc.jar"
+ unless="mxmlc.jar.exists"/>
+ </target>
+
+ <!--
+ Can set build.additional-packages to build additional-packages as part of a release.
+ This does not build the docs. Use doc-packages or asdoc-packages.
+ -->
+ <target name="release"
+ depends="check-flex-home,source-release,binary-release,rat-check"
+ description="Creates source and binary kits for Apache Falcon and FalconJX."/>
+
+ <target name="source-release"
+ depends="wipe-all,source-package"
+ description="Packages the source release kit which is the official Apache release."/>
+
+ <target name="binary-release"
+ depends="setup-binary-release,compiler.binary.release,compiler.jx,javadoc,binary-package"
+ description="Builds and packages the binary kit which is provided as a convenience."/>
+
+ <!--
+ Package up the Apache Flex sources. Do not include empty directories.
+
+ Note: even if cleaned, this will package up unversioned files that happen
+ to be in the tree.
+
+ FixMe: clean needs to clean - add code to detect unversioned files
+ -->
+ <target name="source-package" depends="stage-source,source-package-zip,source-package-tgz,stage-source-jx,source-package-jx-zip,source-package-jx.tgz"
+ description="Package source files required to build in zip and tar-gzip file">
+ </target>
+
+ <!--
+ Packages the source distribution with ZIP.
+ -->
+ <target name="source-package-zip" unless="no.zip">
+ <mkdir dir="${basedir}/out"/>
+ <zip destfile="${basedir}/out/${source.kit}.zip" basedir="${basedir}/temp"/>
+ </target>
+
+ <!--
+ Packages the source distribution with TAR-GZIP.
+ -->
+ <target name="source-package-tgz" unless="no.zip">
+ <tar-gzip name="${source.kit}" />
+ </target>
+
+ <!--
+ Packages the source distribution with ZIP.
+ -->
+ <target name="source-package-jx-zip" unless="no.zip">
+ <mkdir dir="${basedir}/out"/>
+ <zip destfile="${basedir}/out/${source.jx.kit}.zip" basedir="${basedir}/temp"/>
+ </target>
+
+ <!--
+ Packages the source distribution with TAR-GZIP.
+ -->
+ <target name="source-package-jx-tgz" unless="no.zip">
+ <tar-gzip name="${source.jx.kit}" />
+ </target>
+
+ <target name="stage-source"
+ description="Package source files required to build in zip file" >
+ <antcall target="clean-temp"/>
+
+ <copy todir="${basedir}/temp" includeEmptyDirs="false">
+ <fileset dir="${basedir}">
+ <include name="build.xml"/>
+ <include name="build.properties"/>
+ <include name="env-template.properties"/>
+ <include name="READme"/>
+ <include name="RELEASE_NOTES"/>
+ </fileset>
+ <fileset dir="${FLEX_SDK_HOME}">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </fileset>
+ </copy>
+
+ <!-- compiler -->
+ <antcall target="stage-compiler"/>
+
+ <!-- compiler.tests -->
+ <antcall target="stage-compiler.tests"/>
+
+ <!--
+ Source files have Windows line endings. Most UNIX editors can handle
+ either type of line endings but the converse is often not true.
+ The bin directory is handled in stage-bin.
+ -->
+ <fixcrlf srcdir="${basedir}/temp" eol="crlf" fixlast="false">
+ <exclude name="bin/**"/>
+ <exclude name="**/assets/**"/>
+ <exclude name="**/*.fla"/>
+ <exclude name="**/*.flv"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.mp3"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.pbj"/>
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.sh"/>
+ <exclude name="**/*.swf"/>
+ </fixcrlf>
+
+ <!--
+ Unix shell scripts need the correct line endings.
+ The bin directory is handled in stage-bin.
+ -->
+ <fixcrlf srcdir="${basedir}/temp" eol="unix" fixlast="false">
+ <include name="**.sh"/>
+ <exclude name="bin/**"/>
+ </fixcrlf>
+ </target>
+
+ <target name="stage-compiler">
+ <copy todir="${basedir}/temp/compiler" includeEmptyDirs="false">
+ <fileset dir="${basedir}/compiler">
+ <include name="**"/>
+ <exclude name="dist/**"/>
+ <exclude name="generated/**"/>
+ <exclude name="lib/**"/>
+ </fileset>
+ </copy>
+
+ <tstamp>
+ <format property="build.number.date" pattern="yyyyMMdd" />
+ </tstamp>
+ <property name="build.version" value="${release.version}.${build.number.date}" />
+
+ <!-- Update all Version.as files in the kit frameworks directory with build.number -->
+ <!--<antcall target="version-update"/>-->
+ </target>
+
+ <target name="stage-compiler.tests">
+ <copy todir="${basedir}/temp/compiler.tests" includeEmptyDirs="false">
+ <fileset dir="${basedir}/compiler.tests">
+ <include name="**"/>
+ <exclude name="classes/**"/>
+ <exclude name="lib/**"/>
+ <exclude name="results/**"/>
+ <exclude name="temp/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="stage-source-jx"
+ description="Package jx source files with other falcon files required to build in zip file" >
+
+ <copy todir="${basedir}/temp/compiler.jx" includeEmptyDirs="false">
+ <fileset dir="${basedir}/compiler.jx">
+ <include name="**"/>
+ <exclude name="classes/**"/>
+ <exclude name="in/**"/>
+ <exclude name="lib/**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${basedir}/temp/compiler.jx.tests" includeEmptyDirs="false">
+ <fileset dir="${basedir}/compiler.jx.tests">
+ <include name="**"/>
+ <exclude name="classes/**"/>
+ <exclude name="lib/**"/>
+ <exclude name="results/**"/>
+ <exclude name="temp/**"/>
+ </fileset>
+ </copy>
+
+ <!--
+ Source files have Windows line endings. Most UNIX editors can handle
+ either type of line endings but the converse is often not true.
+ The bin directory is handled in stage-bin.
+ -->
+ <fixcrlf srcdir="${basedir}/temp" eol="crlf" fixlast="false">
+ <exclude name="bin/**"/>
+ <exclude name="**/assets/**"/>
+ <exclude name="**/*.fla"/>
+ <exclude name="**/*.flv"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.mp3"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.pbj"/>
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.sh"/>
+ <exclude name="**/*.swf"/>
+ </fixcrlf>
+
+ <!--
+ Unix shell scripts need the correct line endings.
+ The bin directory is handled in stage-bin.
+ -->
+ <fixcrlf srcdir="${basedir}/temp" eol="unix" fixlast="false">
+ <include name="**.sh"/>
+ <exclude name="bin/**"/>
+ </fixcrlf>
+ </target>
+
+ <target name="setup-binary-release" depends="wipe-all"
+ description="Set properties needed to turn on features for release sdk">
+ <!--
+ For a release build, download everything fresh.
+ Build changes to the downloads, might not be caught by the refresh logic.
+ thirdparty-clean should leave this directory empty but just in case...
+ -->
+ <delete dir="${basedir}/in" failonerror="false" includeEmptyDirs="true" />
+
+ </target>
+
+ <target name="binary-package"
+ description="Package binary files in zip and tar-gzip file.">
+
+ <antcall target="stage-source"/>
+
+ <!-- delete any left-over empty directories -->
+ <delete includeemptydirs="true">
+ <fileset dir="${basedir}/temp/frameworks">
+ <and>
+ <size value="0"/>
+ <type type="dir"/>
+ </and>
+ </fileset>
+ </delete>
+
+ <!-- these files are in addition to the remaining source files -->
+
+ <!-- concat the license file with the binary license file for the 3rd party deps -->
+ <!--concat destfile="${basedir}/temp/LICENSE">
+ <filelist dir="${FLEX_SDK_HOME}" files="LICENSE,LICENSE.bin"/>
+ </concat-->
+
+ <!-- generated -->
+ <copy todir="${basedir}/temp/compiler/generated/dist/sdk">
+ <fileset dir="${basedir}/compiler/generated/dist/sdk">
+ <include name="**"/>
+ <exclude name="frameworks/lib/**"/>
+ </fileset>
+ </copy>
+
+ <antcall target="binary-package-zip"/>
+ <antcall target="binary-package-tgz"/>
+
+ <antcall target="stage-source-jx" />
+
+ <!-- generated -->
+ <mxdir dir="${basedir}/temp/js"
+ <copy todir="${basedir}/temp/js">
+ <fileset dir="${basedir}/compiler.jx">
+ <include name="bin/**"/>
+ <include name="lib/**"/>
+ <exclude name="lib/commons-io**"/>
+ <exclude name="lib/google/**" />
+ </fileset>
+ </copy>
+
+ <antcall target="binary-package-jx-zip"/>
+ <antcall target="binary-package-jx-tgz"/>
+ </target>
+
+ <!--
+ Packages the binary distribution with ZIP.
+ -->
+ <target name="binary-package-zip" unless="no.zip">
+ <mkdir dir="${basedir}/out"/>
+ <zip destfile="${basedir}/out/${binary.kit}.zip" basedir="${basedir}/temp"/>
+ </target>
+
+ <!--
+ Packages the binary distribution with TAR-GZIP.
+ -->
+ <target name="binary-package-tgz" unless="no.zip">
+ <tar-gzip name="${binary.kit}" />
+ </target>
+
+ <!--
+ Packages the binary distribution with ZIP.
+ -->
+ <target name="binary-package-jx-zip" unless="no.zip">
+ <mkdir dir="${basedir}/out"/>
+ <zip destfile="${basedir}/out/${binary.jx.kit}.zip" basedir="${basedir}/temp"/>
+ </target>
+
+ <!--
+ Packages the binary distribution with TAR-GZIP.
+ -->
+ <target name="binary-package-jx-tgz" unless="no.zip">
+ <tar-gzip name="${binary.jx.kit}" />
+ </target>
+
+
</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/66bd328e/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 29e5e53..92e701d 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -836,7 +836,13 @@
</target>
<target name="sdk" depends="jar, dist-dev" description="Builds a Falcon SDK"/>
-
+
+ <target name="release-binaries" >
+ <!-- set flag so sdk is not copied -->
+ <property name="flex.config.xml.available" value="true" />
+ <antcall target="sdk" />
+ </target>
+
<target name="main" depends="sdk, javadoc" description="Default target - Builds a Falcon SDK and builds Falcon Javadoc">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa"/>
[13/50] git commit: [flex-falcon] [refs/heads/maven] - FLEX-33925 use
fully qualified names more often
Posted by jo...@apache.org.
FLEX-33925 use fully qualified names more often
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a9269fb6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a9269fb6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a9269fb6
Branch: refs/heads/maven
Commit: a9269fb6e72d1267dbe202d88269c41e0601c43a
Parents: 6c7fb60
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 4 21:21:04 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 4 21:21:04 2013 -0800
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/JSFlexJSEmitter.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9269fb6/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index 84f1e6b..a65335d 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -602,10 +602,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
boolean emitName = true;
if (nodeDef != null
- && (nodeDef.isStatic() || (
- (nodeDef instanceof ClassDefinition ||
- nodeDef instanceof InterfaceDefinition) &&
- nodeDef.getParent() != null)))
+ && nodeDef.isStatic())
{
String sname = nodeDef.getParent().getQualifiedName();
if (sname.length() > 0)
@@ -730,7 +727,10 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
}
else if (emitName)
{
- write(node.getName());
+ if (nodeDef != null)
+ write(nodeDef.getQualifiedName());
+ else
+ write(node.getName());
}
}
[29/50] git commit: [flex-falcon] [refs/heads/maven] - fix build
script again. git merge at the last one
Posted by jo...@apache.org.
fix build script again. git merge at the last one
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/62807853
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/62807853
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/62807853
Branch: refs/heads/maven
Commit: 628078532951ce04a75bbc78971acfcd610c55c7
Parents: 4974199
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 16 09:10:27 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 16 09:10:27 2013 -0800
----------------------------------------------------------------------
build.properties | 20 +++++++
build.xml | 145 ++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 150 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/62807853/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..5c88365
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,20 @@
+################################################################################
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+################################################################################
+
+release.version = 0.0.1
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/62807853/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ee9ff96..c522b45 100644
--- a/build.xml
+++ b/build.xml
@@ -21,6 +21,11 @@
<project name="falcon" 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="source.kit" value="${kit.prefix}-src"/>
@@ -28,6 +33,26 @@
<property name="source.jx.kit" value="${kit.jx.prefix}-src"/>
<property name="binary.jx.kit" value="${kit.jx.prefix}-bin"/>
+ <!--
+ Optional jars but should be in place for a real release build.
+
+ For <grep> put AntelopeTasks_*.jar in this path.
+ See version-update.
+
+ For <rat> apache-rat-0.8.jar and apache-rat-tasks-0.8.jar should be in classpath.
+ See rat-check.
+ -->
+ <path id="anttask.classpath">
+ <fileset dir="${env.ANT_HOME}/lib">
+ <include name="**/AntelopeTasks_*.jar"/>
+ <include name="**/apache-rat*.jar"/>
+ </fileset>
+ <fileset dir="${user.home}">
+ <include name=".ant/lib/**/AntelopeTasks_*.jar"/>
+ <include name=".ant/lib/**/apache-rat*.jar"/>
+ </fileset>
+ </path>
+
<target name="javadoc" description="Builds Falcon's Javadoc at generated/javadoc.">
<ant dir="compiler" target="javadoc"/>
</target>
@@ -48,7 +73,7 @@
<target name="jx" depends="compiler.jx, compiler.jx.tests" description="Builds FalconJX" />
<target name="compiler.binary.release" >
- <ant dir="compiler" target="binary-release" />
+ <ant dir="compiler" target="release-binaries" />
</target>
<target name="tests" description="Runs the tests.">
@@ -121,7 +146,7 @@
description="Packages the source release kit which is the official Apache release."/>
<target name="binary-release"
- depends="setup-binary-release,compiler.binary.release,compiler.jx,javadoc,binary-package"
+ depends="setup-binary-release,compiler.binary.release,compiler.jx,binary-package,javadoc"
description="Builds and packages the binary kit which is provided as a convenience."/>
<!--
@@ -132,7 +157,7 @@
FixMe: clean needs to clean - add code to detect unversioned files
-->
- <target name="source-package" depends="stage-source,source-package-zip,source-package-tgz,stage-source-jx,source-package-jx-zip,source-package-jx.tgz"
+ <target name="source-package" depends="stage-source,source-package-zip,source-package-tgz,stage-source-jx,source-package-jx-zip,source-package-jx-tgz"
description="Package source files required to build in zip and tar-gzip file">
</target>
@@ -223,8 +248,12 @@
<copy todir="${basedir}/temp/compiler" includeEmptyDirs="false">
<fileset dir="${basedir}/compiler">
<include name="**"/>
+ <exclude name=".classpath" />
+ <exclude name=".project" />
+ <exclude name=".settings/**" />
<exclude name="dist/**"/>
<exclude name="generated/**"/>
+ <exclude name="in/**"/>
<exclude name="lib/**"/>
</fileset>
</copy>
@@ -242,6 +271,9 @@
<copy todir="${basedir}/temp/compiler.tests" includeEmptyDirs="false">
<fileset dir="${basedir}/compiler.tests">
<include name="**"/>
+ <exclude name=".classpath" />
+ <exclude name=".project" />
+ <exclude name="unittest.properties" />
<exclude name="classes/**"/>
<exclude name="lib/**"/>
<exclude name="results/**"/>
@@ -317,16 +349,6 @@
<antcall target="stage-source"/>
- <!-- delete any left-over empty directories -->
- <delete includeemptydirs="true">
- <fileset dir="${basedir}/temp/frameworks">
- <and>
- <size value="0"/>
- <type type="dir"/>
- </and>
- </fileset>
- </delete>
-
<!-- these files are in addition to the remaining source files -->
<!-- concat the license file with the binary license file for the 3rd party deps -->
@@ -338,7 +360,7 @@
<copy todir="${basedir}/temp/compiler/generated/dist/sdk">
<fileset dir="${basedir}/compiler/generated/dist/sdk">
<include name="**"/>
- <exclude name="frameworks/lib/**"/>
+ <exclude name="lib/external/**"/>
</fileset>
</copy>
@@ -348,7 +370,7 @@
<antcall target="stage-source-jx" />
<!-- generated -->
- <mxdir dir="${basedir}/temp/js"
+ <mkdir dir="${basedir}/temp/js"/>
<copy todir="${basedir}/temp/js">
<fileset dir="${basedir}/compiler.jx">
<include name="bin/**"/>
@@ -392,5 +414,98 @@
<tar-gzip name="${binary.jx.kit}" />
</target>
+ <!--
+ tar with gzip compression, the temp directory and put it in the out directory.
+ The shell scripts in the bin directory (no extension) and other .sh files have
+ mode set to execute.
+
+ name - the basename name of the kit in out directory, without the .tar.gz extension
+ -->
+ <macrodef name="tar-gzip">
+ <attribute name="name"/>
+ <sequential>
+ <mkdir dir="${basedir}/out"/>
+ <tar destfile="${basedir}/out/@{name}.tar.gz"
+ compression="gzip"
+ longfile="gnu">
+ <tarfileset dir="${basedir}/temp" prefix="@{name}">
+ <include name="**" />
+ <exclude name="bin/**" />
+ <exclude name="**/*.sh" />
+ </tarfileset>
+ <tarfileset dir="${basedir}/temp" prefix="@{name}">
+ <include name="bin/*.bat" />
+ </tarfileset>
+ <tarfileset dir="${basedir}/temp" prefix="@{name}" mode="755">
+ <include name="bin/*" />
+ <include name="**/*.sh" />
+ <exclude name="bin/*.bat" />
+ </tarfileset>
+ </tar>
+ </sequential>
+ </macrodef>
+
+ <!--
+ Run the Apache Rat audit tool against the source in the source kit.
+ The report is written to rat.report.
+
+ To check a subset of files run with -Drat.dir=<dir>.
+
+ You need to place apache-rat-tasks-0.8.jar and apache-rat-0.8.jar in the
+ anttask.classpath in order to do this. If the jar isn't found, the report
+ will not be generated.
+ -->
+ <target name="rat-check" depends="rat-taskdef" if="have.rattasks"
+ description="Report on licenses in source kit.">
+
+ <property name="rat.dir" value="${basedir}/temp"/>
+ <antcall target="rat-unzip" />
+
+ <property name="rat.report" value="${basedir}/rat.report"/>
+ <echo message="Checking files at ${rat.dir}, report is ${rat.report}"/>
+
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
+ <fileset dir="${rat.dir}">
+ <!-- Start of binary files -->
+ <!-- exclude media (png, gif, jpg, mp3, flv) -->
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.mp3"/>
+ <exclude name="**/*.flv"/>
+ </fileset>
+ </rat:report>
+ </target>
+
+ <target name="rat-unzip" unless="no.zip">
+ <antcall target="clean-temp" />
+ <unzip src="${basedir}/out/${source.kit}.zip" dest="${rat.dir}"/>
+ </target>
+
+ <target name="rat-taskdef" description="Rat taskdef">
+ <available property="have.rattasks"
+ resource="org/apache/rat/anttasks/antlib.xml"
+ classpathref="anttask.classpath"/>
+
+ <antcall target="have-rattasks"/>
+ <antcall target="no-rattasks"/>
+ </target>
+
+ <target name="have-rattasks" if="have.rattasks">
+ <typedef resource="org/apache/rat/anttasks/antlib.xml"
+ uri="antlib:org.apache.rat.anttasks"
+ classpathref="anttask.classpath"/>
+ </target>
+
+ <target name="no-rattasks" unless="have.rattasks">
+ <echo message="Rat report not generated."/>
+ <echo message="rat jars (apache-rat-*.jar, apache-rat-tasks-*.jar)"/>
+ <echo message="not found in anttask.classpath"/>
+ </target>
+
+ <target name="clean-temp" unless="noclean.temp">
+ <delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
+ </target>
+
</project>
[49/50] git commit: [flex-falcon] [refs/heads/maven] - added jflex
and antler maven plugin generation
Posted by jo...@apache.org.
added jflex and antler maven plugin generation
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f452292a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f452292a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f452292a
Branch: refs/heads/maven
Commit: f452292a342c225ece7beec73983832e0ce319b8
Parents: b8ba208
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Jul 17 21:59:29 2013 +0200
Committer: Jose Barragan <jo...@apache.org>
Committed: Fri Feb 28 10:47:34 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 125 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 123 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f452292a/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 3aa8061..2180fb4 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -15,23 +15,144 @@
<name>Falcon Compiler</name>
<description>Falcon Flex main compiler</description>
- <packaging>jar</packaging>
+ <properties>
+ <javac.debug>true</javac.debug>
+ <javac.deprecation>false</javac.deprecation>
+ </properties>
+
+ <packaging>pom</packaging>
- <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
<build>
+ <sourceDirectory>src</sourceDirectory>
<plugins>
+ <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
<plugin>
<groupId>de.jflex</groupId>
<artifactId>maven-jflex-plugin</artifactId>
<version>1.4.3</version>
+ <configuration>
+ <outputDirectory>target/generated/src</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>raw.as.tokenizer</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <lexDefinitions>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+ </lexDefinitions>
+ <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
+ </configuration>
+ </execution>
+ <execution>
+ <id>raw.asdoc.tokenizer</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <lexDefinitions>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+ </lexDefinitions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>raw.mxml.tokenizer</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <lexDefinitions>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+ </lexDefinitions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- ANTLR -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+ <outputDirectory>target/generated/src</outputDirectory>
+ </configuration>
<executions>
<execution>
+ <id>as.parser</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <grammars>parsing/as/ASParser.g</grammars>
+ </configuration>
+ </execution>
+ <execution>
+ <id>metadata.parser</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <grammars>parsing/as/MetadataParser.g</grammars>
+ </configuration>
+ </execution>
+ <execution>
+ <id>css.lexer.and.parser</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <grammars>css/CSS.g</grammars>
+ </configuration>
+ </execution>
+ <execution>
+ <id>css.tree</id>
<goals>
<goal>generate</goal>
</goals>
+ <configuration>
+ <grammars>css/CSSTree.g</grammars>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>apt-maven-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <includea>
+ <include>generated/src/org/apache/flex/compiler/internal/parsing/as/ASParser.java</include>
+ </includes>
+ <factory>@SuppressWarnings("unused")</factory>
+
+ </configuration>
</execution>
</executions>
</plugin>
+ <!-- The AnnotateClass tool is used to add @SupressWarnings annotations to Java code produced by ANTLR and JBurg -->
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <debug>${javac.debug}</debug>
+ <showDeprecation>${javac.deprecation}</showDeprecation>
+ <compilerArgument>-Xlint:all,-path,-fallthrough</compilerArgument>
+ <source>tools/AnnotateClass</source>
+ <generatedSourcesDirectory>generated/classes</generatedSourcesDirectory>
+ </configuration>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </plugin>-->
</plugins>
</build>
[50/50] git commit: [flex-falcon] [refs/heads/maven] - unstable
changes (need deep revision)
Posted by jo...@apache.org.
unstable changes (need deep revision)
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/87e5047d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/87e5047d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/87e5047d
Branch: refs/heads/maven
Commit: 87e5047d24affe5b57dadf4780e032dd2286dc1f
Parents: f452292
Author: Carlos Rovira <ca...@apache.org>
Authored: Fri Dec 27 22:57:54 2013 +0100
Committer: Jose Barragan <jo...@apache.org>
Committed: Fri Feb 28 10:47:34 2014 +0100
----------------------------------------------------------------------
compiler/pom.xml | 78 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 66 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87e5047d/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 2180fb4..3ecc4f0 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -25,13 +25,14 @@
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
- <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html-->
+ <!-- JFLEX 1.4.3 http://jflex.sourceforge.net/maven-jflex-plugin/usage.html -->
<plugin>
<groupId>de.jflex</groupId>
<artifactId>maven-jflex-plugin</artifactId>
<version>1.4.3</version>
<configuration>
<outputDirectory>target/generated/src</outputDirectory>
+ <skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.default</skeleton>
</configuration>
<executions>
<execution>
@@ -41,7 +42,8 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
<skeleton>src/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
</configuration>
@@ -53,7 +55,8 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -64,7 +67,8 @@
</goals>
<configuration>
<lexDefinitions>
- <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+ <lexDefinition>src/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex
+ </lexDefinition>
</lexDefinitions>
</configuration>
</execution>
@@ -80,6 +84,7 @@
<outputDirectory>target/generated/src</outputDirectory>
</configuration>
<executions>
+ <!-- Generating ASParser and ASTokenTypes -->
<execution>
<id>as.parser</id>
<goals>
@@ -88,37 +93,86 @@
<configuration>
<grammars>parsing/as/ASParser.g</grammars>
</configuration>
+ <!-- TODO ASParser.java annotate tool @SuppressWarnings("unused") -->
+ <!-- TODO ASTokenTypes.java annotate tool @SuppressWarnings("unused") -->
</execution>
+ <!-- Generating MetadataParser and MetadataTokenTypes -->
<execution>
<id>metadata.parser</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
- <grammars>parsing/as/MetadataParser.g</grammars>
+ <sourceDirectory>src/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
+ <grammars>MetadataParser.g</grammars>
+ <!--<includes>ImportMetadataTokenTypes.txt</includes>-->
</configuration>
+ <!-- TODO MetadataParser.java annotate tool @SuppressWarnings("all") -->
+ <!-- TODO MetadataTokenTypes.java annotate tool @SuppressWarnings("unused") -->
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.apache.flex.compiler.tools.AnnotateClass</mainClass>
+
+ <!--<argument>-classpath</argument>
+ <classpath>
+ <dependency>commons-io:commons-io</dependency>
+ <dependency>commons-lang:commons-lang</dependency>
+ </classpath>
+ <executable>maven</executable>
+ <workingDirectory>/tmp</workingDirectory>-->
+
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--- See more at: http://www.vineetmanohar.com/2009/11/3-ways-to-run-java-main-from-maven/#sthash.iBz2SwMh.dpuf-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr3-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <sourceDirectory>src/org/apache/flex/compiler/internal</sourceDirectory>
+ <outputDirectory>target/generated/src</outputDirectory>
+ </configuration>
+ <executions>
+ <!-- Generating CSSLexer and CSSParser -->
<execution>
<id>css.lexer.and.parser</id>
<goals>
- <goal>generate</goal>
+ <goal>antlr</goal>
</goals>
<configuration>
- <grammars>css/CSS.g</grammars>
+ <sourceDirectory>css/CSS.g</sourceDirectory>
</configuration>
+ <!-- TODO CSSLexer.java annotate tool @SuppressWarnings("unused") -->
+ <!-- TODO CSSParser.java annotate tool @SuppressWarnings("unused") -->
</execution>
+ <!-- Generating CSSTree -->
<execution>
<id>css.tree</id>
<goals>
- <goal>generate</goal>
+ <goal>antlr</goal>
</goals>
<configuration>
- <grammars>css/CSSTree.g</grammars>
+ <sourceDirectory>css/CSSTree.g</sourceDirectory>
</configuration>
+ <!-- TODO CSSTree.java annotate tool @SuppressWarnings({"rawtypes", "unchecked", "unused"} -->
</execution>
</executions>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>apt-maven-plugin</artifactId>
<version>1.0-alpha-5</version>
@@ -128,7 +182,7 @@
<goal>process</goal>
</goals>
<configuration>
- <includea>
+ <includes>
<include>generated/src/org/apache/flex/compiler/internal/parsing/as/ASParser.java</include>
</includes>
<factory>@SuppressWarnings("unused")</factory>
@@ -136,7 +190,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
<!-- The AnnotateClass tool is used to add @SupressWarnings annotations to Java code produced by ANTLR and JBurg -->
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
[14/50] git commit: [flex-falcon] [refs/heads/maven] - If a variable
is of type Class, emit JSDoc for Object instead
Posted by jo...@apache.org.
If a variable is of type Class, emit JSDoc for Object instead
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/30fd603a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/30fd603a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/30fd603a
Branch: refs/heads/maven
Commit: 30fd603a26729d678d5404888d8be0fb4053b93c
Parents: a9269fb
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 4 22:07:17 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 4 22:07:17 2013 -0800
----------------------------------------------------------------------
.../flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/30fd603a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
index 8c8212a..915265a 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
@@ -454,6 +454,8 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
if (name.equals(""))
result = ASEmitterTokens.ANY_TYPE.getToken();
+ else if (name.equals(IASLanguageConstants.Class))
+ result = IASLanguageConstants.Object;
else if (name.equals(IASLanguageConstants.Boolean)
|| name.equals(IASLanguageConstants.String)
|| name.equals(IASLanguageConstants.Number))
[06/50] git commit: [flex-falcon] [refs/heads/maven] - add
-external-sdk-lib option so we can handle externs in jquery and createjs
Posted by jo...@apache.org.
add -external-sdk-lib option so we can handle externs in jquery and createjs
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/45c6be99
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/45c6be99
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/45c6be99
Branch: refs/heads/maven
Commit: 45c6be9988ced20d8ad9678f95580c412405509e
Parents: 635ef7b
Author: Alex Harui <ah...@apache.org>
Authored: Thu Nov 21 12:50:48 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Nov 21 12:50:48 2013 -0800
----------------------------------------------------------------------
.../mxml/flexjs/MXMLFlexJSPublisher.java | 5 +++++
.../driver/js/goog/JSGoogConfiguration.java | 20 ++++++++++++++++++++
2 files changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/45c6be99/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 7807f1e..b101eaf 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -7,6 +7,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
@@ -203,6 +204,10 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
optionList.add("--create_source_map="
+ projectReleaseJSFilePath + ".map");
optionList.add("--source_map_format=" + SourceMap.Format.V3);
+
+ List<String> externs = ((JSGoogConfiguration)configuration).getExternalJSLib();
+ for (String extern : externs)
+ optionList.add("--externs=" + extern);
String[] options = (String[]) optionList.toArray(new String[0]);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/45c6be99/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 621f38e..81ed93d 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -147,6 +147,26 @@ public class JSGoogConfiguration extends JSConfiguration
}
//
+ // 'external-js-lib'
+ //
+
+ private List<String> externalJSLib = new ArrayList<String>();
+
+ public List<String> getExternalJSLib()
+ {
+ return externalJSLib;
+ }
+
+ @Config(allowMultiple = true)
+ @Mapping("external-js-lib")
+ @InfiniteArguments
+ public void setExternalJSLib(ConfigurationValue cv, List<String> value)
+ throws ConfigurationException
+ {
+ externalJSLib.addAll(value);
+ }
+
+ //
// 'strict-publish'
//
[20/50] git commit: [flex-falcon] [refs/heads/maven] - Changed the
tests for the proper emission of parameters of the interface members.
Posted by jo...@apache.org.
Changed the tests for the proper emission of parameters of the interface members.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/aa156294
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/aa156294
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/aa156294
Branch: refs/heads/maven
Commit: aa1562940146cda281198531db7d02ba2c4f691a
Parents: c5e6f21
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 10:55:46 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 10:55:46 2013 +0100
----------------------------------------------------------------------
.../compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java | 4 ++--
.../flexjs/projects/interfaces/interfaces/IE_result.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aa156294/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
index d95eef1..eff48c5 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
@@ -43,7 +43,7 @@ public class TestFlexJSInterface extends TestGoogInterface
+ "function get foo1():Object;"
+ "function set foo1(value:Object):void;}");
asBlockWalker.visitInterface(node);
- assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function() {};");
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function(value) {};");
}
@Override
@@ -67,7 +67,7 @@ public class TestFlexJSInterface extends TestGoogInterface
+ "function baz1():Object;"
+ "function baz2(value:Object):void;}");
asBlockWalker.visitInterface(node);
- assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function() {};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};");
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function(value) {};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};");
}
protected IBackend createBackend()
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aa156294/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
index d3f50b1..d1443d7 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
@@ -23,7 +23,7 @@ interfaces.IE.prototype.myMethod = function() {};
interfaces.IE.prototype.get_myProp = function() {};
-interfaces.IE.prototype.set_myProp = function() {};
+interfaces.IE.prototype.set_myProp = function(value) {};
/**
[47/50] git commit: [flex-falcon] [refs/heads/maven] - Prevent
already fully qualified class names from being qualified again ; -)
Posted by jo...@apache.org.
Prevent already fully qualified class names from being qualified again ;-)
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9fdf5bf3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9fdf5bf3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9fdf5bf3
Branch: refs/heads/maven
Commit: 9fdf5bf3a2bd05d60b16db4b5849291dabbc082c
Parents: d2d5f3f
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Thu Feb 27 17:05:38 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Thu Feb 27 17:05:38 2014 +0100
----------------------------------------------------------------------
.../flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9fdf5bf3/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
index 1ca5781..a63992f 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
@@ -484,7 +484,7 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
}
if (result == "")
- result = (pname != "" && !isBuiltinFunction) ? pname
+ result = (pname != "" && !isBuiltinFunction && name.indexOf(".") < 0) ? pname
+ ASEmitterTokens.MEMBER_ACCESS.getToken() + name : name;
result = result.replace(IASLanguageConstants.String,
[26/50] git commit: [flex-falcon] [refs/heads/maven] - installer
script
Posted by jo...@apache.org.
installer script
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7ed6ee3d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7ed6ee3d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7ed6ee3d
Branch: refs/heads/maven
Commit: 7ed6ee3d3cae713cf9b00131e6ab071d39e3fd3c
Parents: 66bd328
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 15 08:49:15 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Dec 15 23:34:48 2013 -0800
----------------------------------------------------------------------
installer.properties/en_US.properties | 22 ++++
installer.xml | 160 +++++++++++++++++++++++++++++
2 files changed, 182 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7ed6ee3d/installer.properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
new file mode 100644
index 0000000..56b0152
--- /dev/null
+++ b/installer.properties/en_US.properties
@@ -0,0 +1,22 @@
+################################################################################
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+################################################################################
+
+
+downloading.compiler.deps=Downloading Falcon library dependencies...
+downloading.compiler.jx.deps=Downloading FalconJX library dependencies...
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7ed6ee3d/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
new file mode 100644
index 0000000..8a45de8
--- /dev/null
+++ b/installer.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<project name="falcon_sdk_overlay" default="overlay" basedir=".">
+
+ <property name="FALCON_HOME" location="${basedir}"/>
+
+ <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+ <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+ <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+ <condition property="local.d32" value="-d32">
+ <and>
+ <os family="windows"/>
+ <equals arg1="${sun.arch.data.model}" arg2="64"/>
+ <equals arg1="${os.arch}" arg2="x86_64"/>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ </and>
+ </condition>
+
+ <property file="${FALCON_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FALCON_HOME}/local.properties"/>
+ <property file="${FALCON_HOME}/build.properties"/>
+ <property file="${FALCON_HOME}/install.properties/${bundle}.properties"/>
+ <property file="${FALCON_HOME}/install.properties/en_US.properties"/>
+
+ <!-- assumes Falcon expanded into the in/falcon folder in a Flex SDK folder -->
+ <condition property="FLEX_HOME" value="${basedir}/.." >
+ <and>
+ <available file="../../in/falcon" type="dir" />
+ <available file="../../lib/mxmlc.jar" />
+ </and>
+ </condition>
+
+ <fail message="FLEX_HOME not specified. Environment variable not used." >
+ <condition>
+ <not>
+ <isset name="FLEX_HOME" />
+ </not>
+ </condition>
+ </fail>
+
+ <property name="goog.url.path" value="https://closure-compiler.googlecode.com/files" />
+ <property name="goog.url.file" value="compiler-20131014.zip" />
+
+ <condition property="platform" value="mac">
+ <os family="mac" />
+ </condition>
+ <condition property="platform" value="windows">
+ <os family="windows" />
+ </condition>
+ <condition property="platform" value="linux">
+ <os family="unix" />
+ </condition>
+ <condition property="isMac" value="mac">
+ <os family="mac" />
+ </condition>
+ <condition property="isWindows" value="windows">
+ <os family="windows" />
+ </condition>
+ <condition property="isLinux" value="linux">
+ <os family="unix" />
+ </condition>
+
+ <target name="overlay" depends="download,copyfiles,ask-licenses,download.jx,copyfiles.jx" description="Places Falcon and FalconJX files in an SDK folder">
+ <echo>Falcon and FalconJX installed in ${FLEX_HOME}</echo>
+ </target>
+
+ <target name="download" description="download compiler dependencies">
+ <echo>${download.compiler.deps}</echo>
+ <ant file="compiler/downloads.xml"/>
+ </target>
+
+ <target name="download.jx" description="download FalconJX compiler dependencies">
+ <echo>${download.compiler.jx.deps}</echo>
+ <property name="${FALCONJX_HOME}" value="${FLEX_HOME}/js" />
+ <property name="closure.download.filename" value="${goog.url.file}" />
+ <ant file="compiler.jx/downloads.xml"/>
+ </target>
+
+ <target name="copyfiles" description="copy Falcon files into SDK" >
+ <mkdir dir="${FLEX_HOME}/bin-legacy" />
+ <!-- If sdk.branch is set to binary distro flexTasks is in a different place. -->
+ <copy todir="${FLEX_HOME}/ant/lib" failOnError="false" overwrite="false">
+ <fileset dir="${FALCON_HOME}/ant/lib">
+ <include name="flexTasks.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${FLEX_HOME}/bin-legacy" includeEmptyDirs="false">
+ <fileset dir="${FLEX_HOME}/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${FLEX_HOME}/bin" includeEmptyDirs="false">
+ <fileset dir="${FALCON_HOME}/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <!-- Copy compiler external dependencies -->
+ <copy todir="${FLEX_HOME}/lib" includeEmptyDirs="false">
+ <fileset dir="${FALCON_HOME}/lib">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="ask-licenses" depends="ask-goog"
+ description="Ask about the various licenses">
+ </target>
+
+ <target name="ask-goog" unless="goog.donot.ask"
+ description="Prompt the user before downloading Google Closure Library">
+
+ <input
+ message="${goog.prompt.text}"
+ validargs="${yes.no.prompts}"
+ defaultvalue="${no}"
+ addproperty="input.goog.download"/>
+ <condition property="do.goog.install">
+ <equals arg1="${yes}" arg2="${input.goog.download}"/>
+ </condition>
+ <!-- Only ask once per ant run. -->
+ <property name="goog.donot.ask" value="set"/>
+ </target>
+
+
+ <target name="copyfiles.jx" description="copy FalconJX files into SDK" >
+ <mkdir dir="${FLEX_HOME}/js/bin" />
+ <mkdir dir="${FLEX_HOME}/js/lib" />
+ <!-- If sdk.branch is set to binary distro flexTasks is in a different place. -->
+ <copy todir="${FLEX_HOME}/js/lib" failOnError="false" overwrite="false">
+ <fileset dir="${FALCON_HOME}/js/lib">
+ <include name="**/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${FLEX_HOME}/js/bin" failOnError="false" overwrite="false">
+ <fileset dir="${FALCON_HOME}/js/bin">
+ <include name="**/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
[11/50] git commit: [flex-falcon] [refs/heads/maven] - Added some
relative path resolution in order to make the defaults work when the compiler
is not launched from the root of the SDK directory.
Posted by jo...@apache.org.
Added some relative path resolution in order to make the defaults work when the compiler is not launched from the root of the SDK directory.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e3be84e9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e3be84e9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e3be84e9
Branch: refs/heads/maven
Commit: e3be84e96ba116fde0b761dda98d12424054b9ac
Parents: 79391ef
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Nov 29 14:40:37 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Nov 29 14:40:37 2013 +0100
----------------------------------------------------------------------
.../driver/js/goog/JSGoogConfiguration.java | 37 ++++++++++++++++++--
1 file changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e3be84e9/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 897e409..5606226 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -19,6 +19,9 @@
package org.apache.flex.compiler.internal.driver.js.goog;
+import java.io.File;
+import java.io.IOException;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
@@ -56,8 +59,15 @@ public class JSGoogConfiguration extends JSConfiguration
public String getClosureLib()
{
- if (closureLib.equals(""))
- closureLib = "./js/lib/google/closure-library";
+ try
+ {
+ if (closureLib.equals(""))
+ {
+ closureLib = getAbsolutePathFromPathRelativeToMXMLC(
+ "../../js/lib/google/closure-library");
+ }
+ }
+ catch (Exception e) { /* better to try and fail... */ }
return closureLib;
}
@@ -139,7 +149,16 @@ public class JSGoogConfiguration extends JSConfiguration
public List<String> getSDKJSLib()
{
if (sdkJSLib.size() == 0)
- sdkJSLib.add("./frameworks/js/FlexJS/src");
+ {
+ try
+ {
+ String path = getAbsolutePathFromPathRelativeToMXMLC(
+ "../../frameworks/js/FlexJS/src");
+
+ sdkJSLib.add(path);
+ }
+ catch (Exception e) { /* better to try and fail... */ }
+ }
return sdkJSLib;
}
@@ -192,4 +211,16 @@ public class JSGoogConfiguration extends JSConfiguration
strictPublish = value;
}
+ private String getAbsolutePathFromPathRelativeToMXMLC(String relativePath)
+ throws IOException
+ {
+ String mxmlcURL = MXMLJSC.class.getProtectionDomain().getCodeSource()
+ .getLocation().getPath();
+
+ File mxmlc = new File(URLDecoder.decode(mxmlcURL, "utf-8"));
+
+ return new File(mxmlc.getParent() + File.separator + relativePath)
+ .getCanonicalPath();
+ }
+
}
[31/50] git commit: [flex-falcon] [refs/heads/maven] - installer
appears to work now
Posted by jo...@apache.org.
installer appears to work now
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/aab2352e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/aab2352e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/aab2352e
Branch: refs/heads/maven
Commit: aab2352e1876667880f447ba8a0931cd2cc897c9
Parents: 41c7be4
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 16 12:13:30 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 16 12:13:30 2013 -0800
----------------------------------------------------------------------
installer.properties/en_US.properties | 4 +--
installer.xml | 43 ++++++++++--------------------
2 files changed, 16 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aab2352e/installer.properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
index 56b0152..e65c449 100644
--- a/installer.properties/en_US.properties
+++ b/installer.properties/en_US.properties
@@ -18,5 +18,5 @@
################################################################################
-downloading.compiler.deps=Downloading Falcon library dependencies...
-downloading.compiler.jx.deps=Downloading FalconJX library dependencies...
\ No newline at end of file
+download.compiler.deps=Downloading Falcon library dependencies...
+download.compiler.jx.deps=Downloading FalconJX library dependencies...
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aab2352e/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 8a45de8..c440ea8 100644
--- a/installer.xml
+++ b/installer.xml
@@ -42,7 +42,7 @@
<property file="${FALCON_HOME}/install.properties/en_US.properties"/>
<!-- assumes Falcon expanded into the in/falcon folder in a Flex SDK folder -->
- <condition property="FLEX_HOME" value="${basedir}/.." >
+ <condition property="FLEX_HOME" value="${basedir}/../.." >
<and>
<available file="../../in/falcon" type="dir" />
<available file="../../lib/mxmlc.jar" />
@@ -52,7 +52,7 @@
<fail message="FLEX_HOME not specified. Environment variable not used." >
<condition>
<not>
- <isset name="FLEX_HOME" />
+ <isset property="FLEX_HOME" />
</not>
</condition>
</fail>
@@ -79,27 +79,27 @@
<os family="unix" />
</condition>
- <target name="overlay" depends="download,copyfiles,ask-licenses,download.jx,copyfiles.jx" description="Places Falcon and FalconJX files in an SDK folder">
+ <target name="overlay" depends="download,copyfiles,download.jx,copyfiles.jx" description="Places Falcon and FalconJX files in an SDK folder">
<echo>Falcon and FalconJX installed in ${FLEX_HOME}</echo>
</target>
<target name="download" description="download compiler dependencies">
<echo>${download.compiler.deps}</echo>
- <ant file="compiler/downloads.xml"/>
+ <ant dir="${basedir}/compiler" antfile="downloads.xml"/>
</target>
<target name="download.jx" description="download FalconJX compiler dependencies">
<echo>${download.compiler.jx.deps}</echo>
- <property name="${FALCONJX_HOME}" value="${FLEX_HOME}/js" />
+ <property name="FALCONJX_HOME" value="${FLEX_HOME}/js" />
<property name="closure.download.filename" value="${goog.url.file}" />
- <ant file="compiler.jx/downloads.xml"/>
+ <ant dir="${basedir}/compiler.jx" antfile="downloads.xml"/>
</target>
<target name="copyfiles" description="copy Falcon files into SDK" >
<mkdir dir="${FLEX_HOME}/bin-legacy" />
<!-- If sdk.branch is set to binary distro flexTasks is in a different place. -->
<copy todir="${FLEX_HOME}/ant/lib" failOnError="false" overwrite="false">
- <fileset dir="${FALCON_HOME}/ant/lib">
+ <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/ant/lib">
<include name="flexTasks.jar"/>
</fileset>
</copy>
@@ -109,38 +109,23 @@
</fileset>
</copy>
<copy todir="${FLEX_HOME}/bin" includeEmptyDirs="false">
- <fileset dir="${FALCON_HOME}/bin">
+ <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/bin">
<include name="**/*"/>
</fileset>
</copy>
- <!-- Copy compiler external dependencies -->
<copy todir="${FLEX_HOME}/lib" includeEmptyDirs="false">
+ <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/lib">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ <!-- Copy compiler external dependencies -->
+ <copy todir="${FLEX_HOME}/lib/external" includeEmptyDirs="false">
<fileset dir="${FALCON_HOME}/lib">
<include name="**"/>
</fileset>
</copy>
</target>
- <target name="ask-licenses" depends="ask-goog"
- description="Ask about the various licenses">
- </target>
-
- <target name="ask-goog" unless="goog.donot.ask"
- description="Prompt the user before downloading Google Closure Library">
-
- <input
- message="${goog.prompt.text}"
- validargs="${yes.no.prompts}"
- defaultvalue="${no}"
- addproperty="input.goog.download"/>
- <condition property="do.goog.install">
- <equals arg1="${yes}" arg2="${input.goog.download}"/>
- </condition>
- <!-- Only ask once per ant run. -->
- <property name="goog.donot.ask" value="set"/>
- </target>
-
-
<target name="copyfiles.jx" description="copy FalconJX files into SDK" >
<mkdir dir="${FLEX_HOME}/js/bin" />
<mkdir dir="${FLEX_HOME}/js/lib" />
[41/50] git commit: [flex-falcon] [refs/heads/maven] - get falcon to
work with new installer
Posted by jo...@apache.org.
get falcon to work with new installer
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/765968e8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/765968e8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/765968e8
Branch: refs/heads/maven
Commit: 765968e81b0b0a83d9b327441b453c961878c798
Parents: c9ead98
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jan 16 12:49:14 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jan 16 12:49:14 2014 -0800
----------------------------------------------------------------------
apache-flex-falcon-installer-config.xml | 94 +++++++++++++++++++++++
apache-flex-falconjx-installer-config.xml | 101 +++++++++++++++++++++++++
build.xml | 9 +++
installer.xml | 19 +++--
4 files changed, 216 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/apache-flex-falcon-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-falcon-installer-config.xml b/apache-flex-falcon-installer-config.xml
new file mode 100644
index 0000000..0f88fa6
--- /dev/null
+++ b/apache-flex-falcon-installer-config.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<config>
+ <!--<progressLabels>
+ <en_US>
+ <Copy>Copying %1 of %2</Copy>
+ <Get>Downloading bytes %1 of %2</Get>
+ <Checksum>Computing checksum: bytes %1 of %2</Checksum>
+ </en_US>
+ </progressLabels>
+ -->
+ <strings description="override default installer strings here">
+ <string id="INFO_DOWNLOADING_FLEX_SDK">
+ <el_GR>ĪĪÆĪ½ĪµĻĪ±Ī¹ Ī»Ī®ĻĪ· ĻĪæĻ
Apache Flex Falcon Compiler Ī±ĻĻ:</el_GR>
+ <en_US>Downloading Apache Flex Falcon Compiler from: </en_US>
+ </string>
+ <string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
+ <el_GR>Ī Ī±ĻĪ±ĪŗĪ±Ī»Ļ ĪµĪ¹ĻĪ¬Ī³ĪµĻĪµ Ī¼Ī¹Ī± ĪĪ³ĪŗĻ
ĻĪ· Ī“Ī¹Ī±Ī“ĻĪæĪ¼Ī® ĪŗĪ±ĻĪ±Ī»ĻĪ³ĪæĻ
Ī³Ī¹Ī± ĻĪæ Flex SDK</el_GR>
+ <en_US>Please enter valid directory path for a Flex or FlexJS SDK</en_US>
+ </string>
+ <string id="INFO_SELECT_DIRECTORY">
+ <el_GR>ĪĻĪ¹Ī»ĪĪ¾ĻĪµ ĻĪæĪ½ ĪŗĪ±ĻĪ¬Ī»ĪæĪ³Īæ ĻĻĪæĪ½ ĪæĻĪæĪÆĪæ ĪøĪĪ»ĪµĻĪµ Ī½Ī± ĪµĪ³ĪŗĪ±ĻĪ±ĻĻĪ®ĻĪµĻĪµ ĻĪæ Flex Falcon</el_GR>
+ <en_US>Select the directory where you want to install the Flex Falcon Compiler</en_US>
+ </string>
+ <string id="INFO_VERIFY_FLEX_SDK_DONE">
+ <el_GR>Ī ĪµĻĪ±Ī»Ī®ĪøĪµĻ
ĻĪ· ĻĻĪ½ Ī»Ī·ĻĪøĪĪ½ĻĻĪ½ Ī±ĻĻĪµĪÆĻĪ½ ĪµĪÆĪ½Ī±Ī¹ ĪµĻĪ¹ĻĻ
ĻĪ®Ļ.</el_GR>
+ <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files matches the reference. The file is valid.</en_US>
+ </string>
+ <string id="SELECT_PATH_PROMPT">
+ <el_GR>Ī Ī»Ī·ĪŗĻĻĪæĪ»ĪæĪ³Ī®ĻĻĪµ Ī· ĪµĻĪ¹Ī»ĪĪ¾ĻĪµ Ī¼Ī¹Ī± ĪĪ³ĪŗĻ
ĻĪ· Ī“Ī¹Ī±Ī“ĻĪæĪ¼Ī® Ī³Ī¹Ī± ĻĪæ Flex Falcon Compiler</el_GR>
+ <en_US>Where do you want to install the Apache Flex Falcon Compiler?</en_US>
+ </string>
+ <string id="ERROR_VERIFY_FLEX_SDK">
+ <el_GR>Ī ĪµĻĪ±Ī»Ī®ĪøĪµĻ
ĻĪ· ĻĻĪ½ Ī»Ī·ĻĪøĪĪ½ĻĻĪ½ Ī±ĻĻĪµĪÆĻĪ½ Ī±ĻĪĻĻ
ĻĪµ. Ī ĪµĪ³ĪŗĪ±ĻĪ¬ĻĻĪ±ĻĪ· ĻĻĪ±Ī¼Ī¬ĻĪ·ĻĪµ.</el_GR>
+ <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files does not match the reference value. The file is invalid, installation is aborted.</en_US>
+ </string>
+ <string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
+ <el_GR>ĪĪĪĪĪĪĪ Ī¦ĪĪĪĪĪĪ„ APACHE FLEX FALCON</el_GR>
+ <en_US>OPEN APACHE FLEX FALCON FOLDER</en_US>
+ </string>
+ <string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
+ <el_GR>ĪĪ®ĻĪ· Apache Flex Falcon Compiler</el_GR>
+ <en_US>Apache Flex Falcon Compiler (Required)</en_US>
+ </string>
+ <string id="STEP_VERIFY_FLEX_SDK">
+ <el_GR>ĪĪÆĪ½ĪµĻĪ±Ī¹ ĪµĻĪ±Ī»Ī®ĪøĪµĻ
ĻĪ· ĻĪæĻ
Apache Flex Falcon MD5 Signature</el_GR>
+ <en_US>Verifying Apache Flex Falcon MD5 Signature</en_US>
+ </string>
+ <string id="STEP_UNZIP_FLEX_SDK">
+ <el_GR>ĪĻĪæĻĻ
Ī¼ĻĪÆĪµĻĪ· ĻĪæĻ
Apache Flex Falcon Compiler</el_GR>
+ <en_US>Uncompress Apache Flex Falcon Compiler</en_US>
+ </string>
+ </strings>
+ <steps description="targets that should have a 'step' in the GUI progress indicator, in order of appearance.">
+ <step id="download">
+ <el_GR></el_GR>
+ <en_US>Download Falcon dependencies</en_US>
+ </step>
+ <step id="copyfiles">
+ <el_GR></el_GR>
+ <en_US>Copy Falcon Compiler files</en_US>
+ </step>
+ </steps>
+ <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexfalcon.install">
+ <el_GR>
+ <label>Apache Flex Falcon (ĪĻĪ±Ī¹ĻĪæĻĪ¼ĪµĪ½Īæ)</label>
+ <message>ĪĪ¹Ī± ĻĪæ Apache Flex Falcon Ī¹ĻĻĻĪµĪ¹ Ī· ĻĻ
Ī¼ĻĻĪ½ĪÆĪ± ĻĻĪ®ĻĪ·Ļ ĻĪæĻ
Apache License V2. ĪĪĪ»ĪµĻĪµ Ī½Ī± ĪµĪ³ĪŗĪ±ĻĪ±ĻĻĪ®ĻĪµĻĪµ ĻĪæ Apache Flex Falcon;</message>
+ </el_GR>
+ <en_US>
+ <label>Apache Flex Falcon (Required)</label>
+ <message>The Apache License V2 applies to the Apache Flex Falcon Compiler. Do you want to install the Apache Flex Falcon Compiler?</message>
+ <license>Apache V2 License</license>
+ <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
+ </en_US>
+ </component>
+</config>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/apache-flex-falconjx-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-falconjx-installer-config.xml b/apache-flex-falconjx-installer-config.xml
new file mode 100644
index 0000000..68baa27
--- /dev/null
+++ b/apache-flex-falconjx-installer-config.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<config>
+ <!--<progressLabels>
+ <en_US>
+ <Copy>Copying %1 of %2</Copy>
+ <Get>Downloading bytes %1 of %2</Get>
+ <Checksum>Computing checksum: bytes %1 of %2</Checksum>
+ </en_US>
+ </progressLabels>
+ -->
+ <strings description="override default installer strings here">
+ <string id="INFO_DOWNLOADING_FLEX_SDK">
+ <el_GR>ĪĪÆĪ½ĪµĻĪ±Ī¹ Ī»Ī®ĻĪ· ĻĪæĻ
Apache Flex FalconJX Ī±ĻĻ:</el_GR>
+ <en_US>Downloading Apache Flex FalconJX Compiler from: </en_US>
+ </string>
+ <string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
+ <el_GR>Ī Ī±ĻĪ±ĪŗĪ±Ī»Ļ ĪµĪ¹ĻĪ¬Ī³ĪµĻĪµ Ī¼Ī¹Ī± ĪĪ³ĪŗĻ
ĻĪ· Ī“Ī¹Ī±Ī“ĻĪæĪ¼Ī® ĪŗĪ±ĻĪ±Ī»ĻĪ³ĪæĻ
Ī³Ī¹Ī± ĻĪæ Flex SDK</el_GR>
+ <en_US>Please enter valid directory path for a Flex or FlexJS SDK</en_US>
+ </string>
+ <string id="INFO_SELECT_DIRECTORY">
+ <el_GR>ĪĻĪ¹Ī»ĪĪ¾ĻĪµ ĻĪæĪ½ ĪŗĪ±ĻĪ¬Ī»ĪæĪ³Īæ ĻĻĪæĪ½ ĪæĻĪæĪÆĪæ ĪøĪĪ»ĪµĻĪµ Ī½Ī± ĪµĪ³ĪŗĪ±ĻĪ±ĻĻĪ®ĻĪµĻĪµ ĻĪæ Flex Falcon</el_GR>
+ <en_US>Select the directory where you want to install the Flex FalconJX Compiler</en_US>
+ </string>
+ <string id="INFO_VERIFY_FLEX_SDK_DONE">
+ <el_GR>Ī ĪµĻĪ±Ī»Ī®ĪøĪµĻ
ĻĪ· ĻĻĪ½ Ī»Ī·ĻĪøĪĪ½ĻĻĪ½ Ī±ĻĻĪµĪÆĻĪ½ ĪµĪÆĪ½Ī±Ī¹ ĪµĻĪ¹ĻĻ
ĻĪ®Ļ.</el_GR>
+ <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files matches the reference. The file is valid.</en_US>
+ </string>
+ <string id="SELECT_PATH_PROMPT">
+ <el_GR>Ī Ī»Ī·ĪŗĻĻĪæĪ»ĪæĪ³Ī®ĻĻĪµ Ī· ĪµĻĪ¹Ī»ĪĪ¾ĻĪµ Ī¼Ī¹Ī± ĪĪ³ĪŗĻ
ĻĪ· Ī“Ī¹Ī±Ī“ĻĪæĪ¼Ī® Ī³Ī¹Ī± ĻĪæ Flex Falcon Compiler</el_GR>
+ <en_US>Where do you want to install the Apache Flex Falcon Compiler?</en_US>
+ </string>
+ <string id="ERROR_VERIFY_FLEX_SDK">
+ <el_GR>Ī ĪµĻĪ±Ī»Ī®ĪøĪµĻ
ĻĪ· ĻĻĪ½ Ī»Ī·ĻĪøĪĪ½ĻĻĪ½ Ī±ĻĻĪµĪÆĻĪ½ Ī±ĻĪĻĻ
ĻĪµ. Ī ĪµĪ³ĪŗĪ±ĻĪ¬ĻĻĪ±ĻĪ· ĻĻĪ±Ī¼Ī¬ĻĪ·ĻĪµ.</el_GR>
+ <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files does not match the reference value. The file is invalid, installation is aborted.</en_US>
+ </string>
+ <string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
+ <el_GR>ĪĪĪĪĪĪĪ Ī¦ĪĪĪĪĪĪ„ APACHE FLEX FALCONJX</el_GR>
+ <en_US>OPEN APACHE FLEX FALCONJX FOLDER</en_US>
+ </string>
+ <string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
+ <el_GR>ĪĪ®ĻĪ· Apache Flex Falcon Compiler</el_GR>
+ <en_US>Apache Flex Falcon Compiler (Required)</en_US>
+ </string>
+ <string id="STEP_VERIFY_FLEX_SDK">
+ <el_GR>ĪĪÆĪ½ĪµĻĪ±Ī¹ ĪµĻĪ±Ī»Ī®ĪøĪµĻ
ĻĪ· ĻĪæĻ
Apache Flex Falcon MD5 Signature</el_GR>
+ <en_US>Verifying Apache Flex Falcon MD5 Signature</en_US>
+ </string>
+ <string id="STEP_UNZIP_FLEX_SDK">
+ <el_GR>ĪĻĪæĻĻ
Ī¼ĻĪÆĪµĻĪ· ĻĪæĻ
Apache Flex Falcon Compiler</el_GR>
+ <en_US>Uncompress Apache Flex Falcon Compiler</en_US>
+ </string>
+ </strings>
+ <steps description="targets that should have a 'step' in the GUI progress indicator, in order of appearance.">
+ <step id="download">
+ <el_GR></el_GR>
+ <en_US>Download Falcon dependencies</en_US>
+ </step>
+ <step id="copyfiles">
+ <el_GR></el_GR>
+ <en_US>Copy Falcon SDK files</en_US>
+ </step>
+ <step id="download.jx">
+ <en_US>Download FalconJX Dependencies</en_US>
+ </step>
+ <step id="copyfiles.jx">
+ <el_GR></el_GR>
+ <en_US>Copy FalconJX SDK files</en_US>
+ </step>
+ </steps>
+ <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexjs.install">
+ <el_GR>
+ <label>Apache Flex Falcon (ĪĻĪ±Ī¹ĻĪæĻĪ¼ĪµĪ½Īæ)</label>
+ <message>ĪĪ¹Ī± ĻĪæ Apache Flex FalconJX Ī¹ĻĻĻĪµĪ¹ Ī· ĻĻ
Ī¼ĻĻĪ½ĪÆĪ± ĻĻĪ®ĻĪ·Ļ ĻĪæĻ
Apache License V2. ĪĪĪ»ĪµĻĪµ Ī½Ī± ĪµĪ³ĪŗĪ±ĻĪ±ĻĻĪ®ĻĪµĻĪµ ĻĪæ Apache Flex FalconJX;</message>
+ </el_GR>
+ <en_US>
+ <label>Apache Flex FalconJX (Required)</label>
+ <message>The Apache License V2 applies to the Apache Flex FalconJX Compiler. Do you want to install the Apache Flex FalconJX Compiler?</message>
+ <license>Apache V2 License</license>
+ <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
+ </en_US>
+ </component>
+</config>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 241a0c3..f76ea85 100644
--- a/build.xml
+++ b/build.xml
@@ -110,6 +110,8 @@
<ant dir="compiler.tests" target="wipe"/>
<ant dir="compiler.jx" target="super-clean"/>
<ant dir="compiler.jx.tests" target="wipe"/>
+ <delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
+ <delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
</target>
<target name="check-flex-home" unless="mxmlc.jar.exists"
@@ -386,6 +388,13 @@
<antcall target="binary-package-jx-zip"/>
<antcall target="binary-package-jx-tgz"/>
+
+ <copy todir="${basedir}/out">
+ <fileset dir="${basedir}">
+ <include name="apache-flex-falcon-installer-config.xml"/>
+ <include name="apache-flex-falconjx-installer-config.xml"/>
+ </fileset>
+ </copy>
</target>
<!--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765968e8/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 9bba160..7eaae6b 100644
--- a/installer.xml
+++ b/installer.xml
@@ -41,12 +41,17 @@
<property file="${FALCON_HOME}/installer.properties/${bundle}.properties"/>
<property file="${FALCON_HOME}/installer.properties/en_US.properties"/>
- <!-- assumes Falcon expanded into the in/falcon folder in a Flex SDK folder -->
+ <!-- assumes Falcon expanded two levels deep in a Flex SDK folder -->
<condition property="FLEX_HOME" value="${basedir}/../.." >
- <and>
- <available file="${basedir}/../../in/falcon" type="dir" />
- <available file="${basedir}/../../lib/mxmlc.jar" />
- </and>
+ <available file="${basedir}/../../lib/mxmlc.jar" />
+ </condition>
+ <!-- assumes Falcon expanded into the temp folder in a Flex SDK folder -->
+ <condition property="FLEX_HOME" value="${basedir}/.." >
+ <available file="${basedir}/../lib/mxmlc.jar" />
+ </condition>
+ <!-- assumes Falcon expanded into the temp folder in a Flex SDK folder -->
+ <condition property="install.jx" value="true" >
+ <available file="${basedir}/compiler.jx" type="dir" />
</condition>
<fail message="FLEX_HOME not specified. Environment variable not used." >
@@ -88,7 +93,7 @@
<ant dir="${basedir}/compiler" antfile="downloads.xml"/>
</target>
- <target name="download.jx" description="download FalconJX compiler dependencies">
+ <target name="download.jx" if="install.jx" description="download FalconJX compiler dependencies">
<echo>${download.compiler.jx.deps}</echo>
<property name="FALCONJX_HOME" value="${FLEX_HOME}/js" />
<property name="closure.download.filename" value="${goog.url.file}" />
@@ -126,7 +131,7 @@
</copy>
</target>
- <target name="copyfiles.jx" description="copy FalconJX files into SDK" >
+ <target name="copyfiles.jx" if="install.jx" description="copy FalconJX files into SDK" >
<mkdir dir="${FLEX_HOME}/js/bin" />
<mkdir dir="${FLEX_HOME}/js/lib" />
<!-- If sdk.branch is set to binary distro flexTasks is in a different place. -->
[24/50] git commit: [flex-falcon] [refs/heads/maven] - Fixes issue
where the namespace of the package instead of the namespace of the type is
prefixed in the JSDoc annotation of an interface member.
Posted by jo...@apache.org.
Fixes issue where the namespace of the package instead of the namespace of the type is prefixed in the JSDoc annotation of an interface member.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f95e2d23
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f95e2d23
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f95e2d23
Branch: refs/heads/maven
Commit: f95e2d231ae60359dc386a001b91daa86090ce6d
Parents: 5835285
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 11:33:17 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 11:33:17 2013 +0100
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/JSFlexJSDocEmitter.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f95e2d23/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
index ab75379..235deb1 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
@@ -169,13 +169,7 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter
ITypeDefinition tdef = ((IFunctionDefinition)node.getDefinition())
.resolveReturnType(project);
- String packageName = "";
- if (tdef instanceof InterfaceDefinition)
- packageName = tdef.getPackageName();
- else
- packageName = node.getPackageName();
-
- emitReturn((IFunctionNode) node, packageName);
+ emitReturn((IFunctionNode) node, tdef.getPackageName());
}
IParameterNode[] parameters = ((IFunctionNode) node).getParameterNodes();
[19/50] git commit: [flex-falcon] [refs/heads/maven] - Raise property
visibility to allow for method override.
Posted by jo...@apache.org.
Raise property visibility to allow for method override.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c5e6f211
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c5e6f211
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c5e6f211
Branch: refs/heads/maven
Commit: c5e6f211d51514a946c90126268a1214bf707c4f
Parents: 53eb561
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 10:14:09 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 10:14:09 2013 +0100
----------------------------------------------------------------------
.../flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c5e6f211/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
index 3bebc64..65c591c 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
@@ -85,7 +85,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
protected static final String CONSTRUCTOR_FULL = "fullConstructor";
protected static final String SUPER_FUNCTION_CALL = "replaceSuperFunction";
- private List<String> propertyNames = new ArrayList<String>();
+ protected List<String> propertyNames = new ArrayList<String>();
protected ICompilerProject project;
[21/50] git commit: [flex-falcon] [refs/heads/maven] - Proper
emission of parameters of interface members.
Posted by jo...@apache.org.
Proper emission of parameters of interface members.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dfa58928
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dfa58928
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dfa58928
Branch: refs/heads/maven
Commit: dfa58928feafa07090dc51a6ec059f0824d195b7
Parents: aa15629
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 10:56:46 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 10:56:46 2013 +0100
----------------------------------------------------------------------
.../codegen/js/flexjs/JSFlexJSEmitter.java | 60 +++++++-------------
1 file changed, 19 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dfa58928/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index 712e8c5..947a268 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -226,52 +226,30 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
boolean isAccessor = mnode.getNodeID() == ASTNodeID.GetterID
|| mnode.getNodeID() == ASTNodeID.SetterID;
- if (!isAccessor || !propertyNames.contains(qname))
- {
- if (isAccessor && !propertyNames.contains(qname))
- {
- propertyNames.add(qname);
- }
+ writeNewline();
+ writeNewline();
+ writeNewline();
- if (isAccessor)
- {
- emitInterfaceMember(qname, mnode, true, true);
- emitInterfaceMember(qname, mnode, true, false);
- }
- else
- {
- emitInterfaceMember(qname, mnode, false, false);
- }
+ write(qname);
+ write(ASEmitterTokens.MEMBER_ACCESS);
+ write(JSEmitterTokens.PROTOTYPE);
+ write(ASEmitterTokens.MEMBER_ACCESS);
+ if (isAccessor)
+ {
+ writeGetSetPrefix(mnode.getNodeID() == ASTNodeID.GetterID);
}
+ write(mnode.getQualifiedName());
+ write(ASEmitterTokens.SPACE);
+ writeToken(ASEmitterTokens.EQUAL);
+ write(ASEmitterTokens.FUNCTION);
+ emitParameters(((IFunctionNode) mnode).getParameterNodes());
+ write(ASEmitterTokens.SPACE);
+ write(ASEmitterTokens.BLOCK_OPEN);
+ write(ASEmitterTokens.BLOCK_CLOSE);
+ write(ASEmitterTokens.SEMICOLON);
}
}
- private void emitInterfaceMember(String qname, IDefinitionNode dnode,
- boolean isAccessor, boolean isGetter)
- {
- writeNewline();
- writeNewline();
- writeNewline();
-
- write(qname);
- write(ASEmitterTokens.MEMBER_ACCESS);
- write(JSEmitterTokens.PROTOTYPE);
- write(ASEmitterTokens.MEMBER_ACCESS);
- if (isAccessor)
- {
- writeGetSetPrefix(isGetter);
- }
- write(dnode.getQualifiedName());
- write(ASEmitterTokens.SPACE);
- writeToken(ASEmitterTokens.EQUAL);
- write(ASEmitterTokens.FUNCTION);
- emitParameters(((IFunctionNode) dnode).getParameterNodes());
- write(ASEmitterTokens.SPACE);
- write(ASEmitterTokens.BLOCK_OPEN);
- write(ASEmitterTokens.BLOCK_CLOSE);
- write(ASEmitterTokens.SEMICOLON);
- }
-
@Override
public void emitField(IVariableNode node)
{
[12/50] git commit: [flex-falcon] [refs/heads/maven] - Make sure
publish errors end up in the error list. Also return different exit code if
there are only warnings.
Posted by jo...@apache.org.
Make sure publish errors end up in the error list. Also return different exit code if there are only warnings.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6c7fb602
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6c7fb602
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6c7fb602
Branch: refs/heads/maven
Commit: 6c7fb60283c2b1b650d494650f384c9c3d14388c
Parents: e3be84e
Author: Alex Harui <ah...@apache.org>
Authored: Tue Dec 3 14:31:45 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Dec 3 14:31:45 2013 -0800
----------------------------------------------------------------------
.../org/apache/flex/compiler/clients/MXMLJSC.java | 18 ++++++++++++------
.../flex/compiler/codegen/js/IJSPublisher.java | 4 +++-
.../compiler/internal/codegen/js/JSPublisher.java | 4 +++-
.../internal/codegen/js/goog/JSGoogPublisher.java | 6 +++++-
.../codegen/mxml/flexjs/MXMLFlexJSPublisher.java | 16 ++++++++++++----
.../compiler/internal/graph/GoogDepsWriter.java | 13 +++++++++++--
6 files changed, 46 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c7fb602/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
index 841b815..37b3f9b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -124,8 +124,9 @@ public class MXMLJSC
SUCCESS(0),
PRINT_HELP(1),
FAILED_WITH_PROBLEMS(2),
- FAILED_WITH_EXCEPTIONS(3),
- FAILED_WITH_CONFIG_PROBLEMS(4);
+ FAILED_WITH_ERRORS(3),
+ FAILED_WITH_EXCEPTIONS(4),
+ FAILED_WITH_CONFIG_PROBLEMS(5);
ExitCode(int code)
{
@@ -260,7 +261,12 @@ public class MXMLJSC
{
compile();
if (problems.hasFilteredProblems())
- exitCode = ExitCode.FAILED_WITH_PROBLEMS;
+ {
+ if (problems.hasErrors())
+ exitCode = ExitCode.FAILED_WITH_ERRORS;
+ else
+ exitCode = ExitCode.FAILED_WITH_PROBLEMS;
+ }
}
else if (problems.hasFilteredProblems())
{
@@ -418,9 +424,9 @@ public class MXMLJSC
}
if (jsPublisher != null)
- jsPublisher.publish();
-
- compilationSuccess = true;
+ compilationSuccess = jsPublisher.publish(problems);
+ else
+ compilationSuccess = true;
}
}
catch (Exception e)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c7fb602/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSPublisher.java b/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSPublisher.java
index e02f3be..3b2ea98 100644
--- a/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSPublisher.java
@@ -22,6 +22,8 @@ package org.apache.flex.compiler.codegen.js;
import java.io.File;
import java.io.IOException;
+import org.apache.flex.compiler.clients.problems.ProblemQuery;
+
/**
* The {@link IJSPublisher} interface allows the abstraction of project output
* generation.
@@ -33,6 +35,6 @@ public interface IJSPublisher
File getOutputFolder();
- void publish() throws IOException;
+ boolean publish(ProblemQuery problems) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c7fb602/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
index 468485d..cc49504 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FilenameUtils;
+import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.codegen.js.IJSPublisher;
import org.apache.flex.compiler.config.Configuration;
@@ -74,10 +75,11 @@ public class JSPublisher implements IJSPublisher
return configuration.getOutput();
}
- public void publish() throws IOException
+ public boolean publish(ProblemQuery problems) throws IOException
{
System.out
.println("The project has been successfully compiled and optimized.");
+ return true;
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c7fb602/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
index c44c8bb..d43c932 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
@@ -10,6 +10,7 @@ import java.util.List;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.codegen.js.IJSPublisher;
import org.apache.flex.compiler.config.Configuration;
import org.apache.flex.compiler.internal.codegen.js.JSPublisher;
@@ -48,7 +49,8 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher
return outputFolder;
}
- public void publish() throws IOException
+ @Override
+ public boolean publish(ProblemQuery problems) throws IOException
{
final String intermediateDirPath = getOutputFolder().getPath();
@@ -153,6 +155,8 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher
System.out.println("The project '"
+ projectName
+ "' has been successfully compiled and optimized.");
+
+ return true;
}
private void appendExportSymbol(String path, String projectName)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c7fb602/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index b101eaf..61f175e 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -16,6 +16,7 @@ import org.apache.commons.io.filefilter.FileFileFilter;
import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.codegen.js.IJSPublisher;
import org.apache.flex.compiler.config.Configuration;
import org.apache.flex.compiler.internal.codegen.js.JSSharedData;
@@ -84,8 +85,10 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
}
@Override
- public void publish() throws IOException
+ public boolean publish(ProblemQuery problems) throws IOException
{
+ boolean ok = true;
+
final String intermediateDirPath = outputFolder.getPath();
final File intermediateDir = new File(intermediateDirPath);
File srcDir = new File(configuration.getTargetFile());
@@ -132,12 +135,14 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
GoogDepsWriter gdw = new GoogDepsWriter(intermediateDir, projectName, (JSGoogConfiguration) configuration);
try
{
- String depsFileData = gdw.generateDeps();
- writeFile(depsTgtFilePath, depsFileData, false);
+ StringBuilder depsFileData = new StringBuilder();
+ ok = gdw.generateDeps(problems, depsFileData);
+ writeFile(depsTgtFilePath, depsFileData.toString(), false);
}
catch (InterruptedException e)
{
e.printStackTrace();
+ return false;
}
IOFileFilter pngSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
@@ -226,9 +231,12 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
org.apache.commons.io.FileUtils.deleteQuietly(new File(depsTgtFilePath));
}
- System.out.println("The project '"
+ if (ok)
+ System.out.println("The project '"
+ projectName
+ "' has been successfully compiled and optimized.");
+
+ return true;
}
private void appendExportSymbol(String path, String projectName)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c7fb602/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index fac47a3..566fb0e 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -13,7 +13,9 @@ import java.util.List;
import java.util.Scanner;
import org.apache.commons.io.FileUtils;
+import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
+import org.apache.flex.compiler.problems.FileNotFoundProblem;
import com.google.common.io.Files;
@@ -26,9 +28,11 @@ public class GoogDepsWriter {
otherPaths = config.getSDKJSLib();
}
+ private ProblemQuery problems;
private String outputFolderPath;
private String mainName;
private List<String> otherPaths;
+ private boolean problemsFound = false;
private HashMap<String,GoogDep> depMap = new HashMap<String,GoogDep>();
@@ -44,8 +48,10 @@ public class GoogDepsWriter {
return files;
}
- public String generateDeps() throws InterruptedException, FileNotFoundException
+ public boolean generateDeps(ProblemQuery problems, StringBuilder depsFileData) throws InterruptedException, FileNotFoundException
{
+ problemsFound = false;
+ this.problems = problems;
buildDB();
ArrayList<GoogDep> dps = sort(mainName);
String outString = "// generated by FalconJS" + "\n";
@@ -65,7 +71,8 @@ public class GoogDepsWriter {
outString += s;
}
}
- return outString;
+ depsFileData.append(outString);
+ return !problemsFound;
}
private boolean isGoogClass(String className)
@@ -240,6 +247,8 @@ public class GoogDepsWriter {
}
System.out.println("Could not find file for class: " + className);
+ problems.add(new FileNotFoundProblem(className));
+ problemsFound = true;
return "";
}
[10/50] git commit: [flex-falcon] [refs/heads/maven] - Added default
values for 'sdk-js-lib' and 'closure-lib' config settings,
such that when the compiler is part of the FlexJS SDK,
there is no need to explicitly set these paths.
Posted by jo...@apache.org.
Added default values for 'sdk-js-lib' and 'closure-lib' config settings, such that when the compiler is part of the FlexJS SDK, there is no need to explicitly set these paths.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/79391efc
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/79391efc
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/79391efc
Branch: refs/heads/maven
Commit: 79391efcd20f158ae20e90486fca327862540800
Parents: c3557a5
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Nov 29 13:47:11 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Nov 29 13:47:11 2013 +0100
----------------------------------------------------------------------
.../internal/driver/js/goog/JSGoogConfiguration.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79391efc/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 81ed93d..897e409 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -52,10 +52,13 @@ public class JSGoogConfiguration extends JSConfiguration
// 'closure-lib'
//
- private String closureLib;
+ private String closureLib = "";
public String getClosureLib()
{
+ if (closureLib.equals(""))
+ closureLib = "./js/lib/google/closure-library";
+
return closureLib;
}
@@ -64,7 +67,8 @@ public class JSGoogConfiguration extends JSConfiguration
public void setClosureLib(ConfigurationValue cv, String value)
throws ConfigurationException
{
- closureLib = value;
+ if (value != null)
+ closureLib = value;
}
//
@@ -134,6 +138,9 @@ public class JSGoogConfiguration extends JSConfiguration
public List<String> getSDKJSLib()
{
+ if (sdkJSLib.size() == 0)
+ sdkJSLib.add("./frameworks/js/FlexJS/src");
+
return sdkJSLib;
}
[37/50] git commit: [flex-falcon] [refs/heads/maven] - make target
name unique (there was another one in falcon script)
Posted by jo...@apache.org.
make target name unique (there was another one in falcon script)
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/358194f0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/358194f0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/358194f0
Branch: refs/heads/maven
Commit: 358194f08d2a6031985f0483acb6d1b814f89a68
Parents: cffc25d
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jan 14 15:09:29 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jan 14 15:09:29 2014 -0800
----------------------------------------------------------------------
compiler.jx/downloads.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/358194f0/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index a366f2e..58e4265 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -44,7 +44,7 @@
they are each downloaded only if they don't already exist.
-->
- <target name="main" depends="prepare, commons-io-jar, closure-jar"
+ <target name="main" depends="prepare, commons-io-jar-jx, closure-jar"
description="Downloads all the required thirdparty JARs"/>
<target name="prepare" >
[35/50] git commit: [flex-falcon] [refs/heads/maven] - handle inline
itemrenderers with fx:Component
Posted by jo...@apache.org.
handle inline itemrenderers with fx:Component
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c0c0164c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c0c0164c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c0c0164c
Branch: refs/heads/maven
Commit: c0c0164cec6d297126acdb27511759493543e339
Parents: f23f182
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jan 9 07:37:11 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jan 9 07:37:11 2014 -0800
----------------------------------------------------------------------
.../compiler/codegen/mxml/IMXMLEmitter.java | 3 +
.../internal/codegen/mxml/MXMLBlockWalker.java | 13 +-
.../internal/codegen/mxml/MXMLEmitter.java | 14 +++
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 123 ++++++++++++++++++-
.../internal/visitor/mxml/MXMLNodeSwitch.java | 5 +-
.../visitor/mxml/IMXMLBlockVisitor.java | 3 +
6 files changed, 153 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c0c0164c/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java b/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
index 566df04..28c23b8 100644
--- a/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
@@ -25,6 +25,7 @@ import org.apache.flex.compiler.codegen.IEmitter;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
@@ -101,4 +102,6 @@ public interface IMXMLEmitter extends IEmitter
void emitFactory(IMXMLFactoryNode node);
+ void emitComponent(IMXMLComponentNode node);
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c0c0164c/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
index 8aa2765..487579c 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
@@ -33,6 +33,7 @@ import org.apache.flex.compiler.tree.as.IFileNode;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
@@ -346,13 +347,23 @@ public class MXMLBlockWalker implements IMXMLBlockVisitor, IMXMLBlockWalker
@Override
public void visitFactory(IMXMLFactoryNode node)
{
- debug("visitLiteral()");
+ debug("visitFactory()");
mxmlEmitter.emitFactory(node);
}
//--------------------------------------------------------------------------
+ @Override
+ public void visitComponent(IMXMLComponentNode node)
+ {
+ debug("visitComponent()");
+
+ mxmlEmitter.emitComponent(node);
+ }
+
+ //--------------------------------------------------------------------------
+
protected void debug(String message)
{
//System.out.println(message);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c0c0164c/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
index 229c27f..bb1e016 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
@@ -31,6 +31,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
@@ -344,4 +345,17 @@ public class MXMLEmitter extends Emitter implements IMXMLEmitter
write("\"");
}
+ public void emitComponent(IMXMLComponentNode node)
+ {
+ IASNode cnode = node.getChild(0);
+
+ write("<fx:Component>");
+
+ if (cnode instanceof IMXMLClassNode)
+ {
+ getMXMLWalker().walk((IASNode) cnode); // Literal
+ }
+
+ write("</fx:Component>");
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c0c0164c/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index e682534..f868b33 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -62,6 +62,7 @@ import org.apache.flex.compiler.tree.as.IImportNode;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
@@ -100,6 +101,9 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
private boolean inMXMLContent;
private boolean inStatesOverride;
+
+ private StringBuilder subDocuments = new StringBuilder();
+ private ArrayList<String> subDocumentNames = new ArrayList<String>();
public MXMLFlexJSEmitter(FilterWriter out)
{
@@ -151,11 +155,88 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
emitHeader(node);
- emitClassDeclStart(cname, node, false);
+ write(subDocuments.toString());
+ writeNewline();
+
+ emitClassDeclStart(cname, node.getBaseClassName(), false);
+
+ emitPropertyDecls();
+
+ emitClassDeclEnd(cname, node.getBaseClassName());
+
+ emitMetaData(cdef);
+
+ emitScripts();
+
+ emitEvents(cname);
+
+ emitPropertyGetterSetters(cname);
+
+ emitMXMLDescriptorFuncs(cname);
+
+ emitBindingData(cname, cdef);
+
+ emitEncodedCSS(cname);
+
+ }
+
+ public void emitSubDocument(IMXMLComponentNode node)
+ {
+ ArrayList<MXMLDescriptorSpecifier> oldDescriptorTree;
+ MXMLDescriptorSpecifier oldPropertiesTree;
+ ArrayList<MXMLEventSpecifier> oldEvents;
+ ArrayList<MXMLScriptSpecifier> oldScripts;
+ ArrayList<MXMLDescriptorSpecifier> oldCurrentInstances;
+ ArrayList<MXMLDescriptorSpecifier> oldCurrentPropertySpecifiers;
+ int oldEventCounter;
+ int oldIdCounter;
+
+ oldDescriptorTree = descriptorTree;
+ descriptorTree = new ArrayList<MXMLDescriptorSpecifier>();
+ oldPropertiesTree = propertiesTree;
+ propertiesTree = new MXMLDescriptorSpecifier();
+
+ oldEvents = events;
+ events = new ArrayList<MXMLEventSpecifier>();
+ // we don't save these. We want all requires to be generated at the top of the file
+ instances = new ArrayList<MXMLDescriptorSpecifier>();
+ oldScripts = scripts;
+ scripts = new ArrayList<MXMLScriptSpecifier>();
+ //styles = new ArrayList<MXMLStyleSpecifier>();
+
+ oldCurrentInstances = currentInstances;
+ currentInstances = new ArrayList<MXMLDescriptorSpecifier>();
+ oldCurrentPropertySpecifiers = currentPropertySpecifiers;
+ currentPropertySpecifiers = new ArrayList<MXMLDescriptorSpecifier>();
+
+ oldEventCounter = eventCounter;
+ eventCounter = 0;
+ oldIdCounter = idCounter;
+ idCounter = 0;
+
+ // visit MXML
+ IClassDefinition cdef = node.getContainedClassDefinition();
+ IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker())
+ .getASEmitter();
+ ((JSFlexJSEmitter) asEmitter).thisClass = cdef;
+
+ IASNode classNode = node.getContainedClassDefinitionNode();
+ // visit tags
+ final int len = classNode.getChildCount();
+ for (int i = 0; i < len; i++)
+ {
+ getMXMLWalker().walk(classNode.getChild(i));
+ }
+
+ String cname = cdef.getQualifiedName();
+ subDocumentNames.add(cname);
+ String baseClassName = cdef.getBaseClassAsDisplayString();
+
+ emitClassDeclStart(cname, baseClassName, false);
emitPropertyDecls();
- emitClassDeclEnd(cname, node);
+ emitClassDeclEnd(cname, baseClassName);
emitMetaData(cdef);
@@ -170,17 +251,27 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
emitBindingData(cname, cdef);
emitEncodedCSS(cname);
+
+ descriptorTree = oldDescriptorTree;
+ propertiesTree = oldPropertiesTree;
+ events = oldEvents;
+ scripts = oldScripts;
+ currentInstances = oldCurrentInstances;
+ currentPropertySpecifiers = oldCurrentPropertySpecifiers;
+ eventCounter = oldEventCounter;
+ idCounter = oldIdCounter;
+
}
//--------------------------------------------------------------------------
- protected void emitClassDeclStart(String cname, IMXMLDocumentNode node,
+ protected void emitClassDeclStart(String cname, String baseClassName,
boolean indent)
{
writeNewline();
writeNewline("/**");
writeNewline(" * @constructor");
- writeNewline(" * @extends {" + node.getBaseClassName() + "}");
+ writeNewline(" * @extends {" + baseClassName + "}");
writeNewline(" */");
writeToken(cname);
writeToken(ASEmitterTokens.EQUAL);
@@ -199,7 +290,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
//--------------------------------------------------------------------------
- protected void emitClassDeclEnd(String cname, IMXMLDocumentNode node)
+ protected void emitClassDeclEnd(String cname, String baseClassName)
{
writeNewline();
writeNewline("/**");
@@ -224,7 +315,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
write(ASEmitterTokens.PAREN_OPEN);
write(cname);
writeToken(ASEmitterTokens.COMMA);
- write(node.getBaseClassName());
+ write(baseClassName);
write(ASEmitterTokens.PAREN_CLOSE);
writeNewline(ASEmitterTokens.SEMICOLON);
writeNewline();
@@ -1361,6 +1452,24 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
}
//--------------------------------------------------------------------------
+
+ @Override
+ public void emitComponent(IMXMLComponentNode node)
+ {
+ MXMLDescriptorSpecifier ps = getCurrentDescriptor("ps");
+ ps.value = "new mx.core.ClassFactory(";
+
+ ps.value += node.getName();
+ ps.value += ")";
+
+ setBufferWrite(true);
+ emitSubDocument(node);
+ subDocuments.append(getBuilder().toString());
+ getBuilder().setLength(0);
+ setBufferWrite(false);
+ }
+
+ //--------------------------------------------------------------------------
// JS output
//--------------------------------------------------------------------------
@@ -1408,6 +1517,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
writeNewline();
emitHeaderLine(cname, true); // provide
+ for (String subDocumentName : subDocumentNames)
+ emitHeaderLine(subDocumentName, true);
writeNewline();
emitHeaderLine(bcname);
ArrayList<String> writtenInstances = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c0c0164c/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
index 459518c..a84f4da 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
@@ -22,6 +22,7 @@ package org.apache.flex.compiler.internal.visitor.mxml;
import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
@@ -117,6 +118,9 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLFactoryID:
visitor.visitFactory((IMXMLFactoryNode) node);
break;
+ case MXMLComponentID:
+ visitor.visitComponent((IMXMLComponentNode) node);
+ break;
case MXMLApplicationID:
case MXMLBindingID:
@@ -124,7 +128,6 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLClassID:
case MXMLClassDefinitionID:
case MXMLClearID:
- case MXMLComponentID:
case MXMLConcatenatedDataBindingID:
case MXMLDataBindingID:
case MXMLDateID:
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c0c0164c/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java b/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
index a31124a..6b10cd7 100644
--- a/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
+++ b/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
@@ -22,6 +22,7 @@ package org.apache.flex.compiler.visitor.mxml;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
@@ -97,5 +98,7 @@ public interface IMXMLBlockVisitor extends IBlockVisitor
void visitLiteral(IMXMLLiteralNode node);
void visitFactory(IMXMLFactoryNode node);
+
+ void visitComponent(IMXMLComponentNode node);
}
[16/50] git commit: [flex-falcon] [refs/heads/maven] - Fixing test to
match the new !Class but Object type annotation.
Posted by jo...@apache.org.
Fixing test to match the new !Class but Object type annotation.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/15035e6e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/15035e6e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/15035e6e
Branch: refs/heads/maven
Commit: 15035e6e2390cde788d8046268ea1175eeb29463
Parents: 70683e5
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 08:28:15 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 08:28:15 2013 +0100
----------------------------------------------------------------------
.../compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/15035e6e/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
index 412283d..1bbdf55 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
@@ -73,7 +73,7 @@ public class TestGoogGlobalClasses extends TestGlobalClasses
{
IVariableNode node = getVariable("var a:Class = new Class();");
asBlockWalker.visitVariable(node);
- assertOut("var /** @type {Class} */ a = new Class()");
+ assertOut("var /** @type {Object} */ a = new Class()");
}
@Override
[43/50] git commit: [flex-falcon] [refs/heads/maven] - add create-md5
target for nightly builds
Posted by jo...@apache.org.
add create-md5 target for nightly builds
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8966eda9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8966eda9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8966eda9
Branch: refs/heads/maven
Commit: 8966eda94ca616ae0a2f110cfa20f4a2f0f76cfe
Parents: 3b96c69
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jan 16 15:34:00 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jan 16 15:34:00 2014 -0800
----------------------------------------------------------------------
build.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8966eda9/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f76ea85..4c8cc25 100644
--- a/build.xml
+++ b/build.xml
@@ -520,5 +520,16 @@
<delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
</target>
+ <target name="create-md5" >
+ <echo message="Generating MD5 hashes for release artifacts"/>
+ <checksum algorithm="md5" file="${basedir}/out/${binary.kit}.tar.gz" forceOverwrite="yes"/>
+ <checksum algorithm="md5" file="${basedir}/out/${binary.kit}.zip" forceOverwrite="yes"/>
+ <checksum algorithm="md5" file="${basedir}/out/${source.kit}.tar.gz" forceOverwrite="yes"/>
+ <checksum algorithm="md5" file="${basedir}/out/${source.kit}.zip" forceOverwrite="yes"/>
+ <checksum algorithm="md5" file="${basedir}/out/${binary.jx.kit}.tar.gz" forceOverwrite="yes"/>
+ <checksum algorithm="md5" file="${basedir}/out/${binary.jx.kit}.zip" forceOverwrite="yes"/>
+ <checksum algorithm="md5" file="${basedir}/out/${source.jx.kit}.tar.gz" forceOverwrite="yes"/>
+ <checksum algorithm="md5" file="${basedir}/out/${source.jx.kit}.zip" forceOverwrite="yes"/>
+ </target>
</project>
[34/50] git commit: [flex-falcon] [refs/heads/maven] - FLEX-34031 -
handle itemRenderer='somepackage.someclass'
Posted by jo...@apache.org.
FLEX-34031 - handle itemRenderer='somepackage.someclass'
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f23f182a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f23f182a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f23f182a
Branch: refs/heads/maven
Commit: f23f182a9e8fafaa59fd56343a733f030bb5557d
Parents: cd48b0a
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jan 8 14:46:19 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 8 14:46:19 2014 -0800
----------------------------------------------------------------------
.../flex/compiler/codegen/mxml/IMXMLEmitter.java | 3 +++
.../internal/codegen/mxml/MXMLBlockWalker.java | 11 +++++++++++
.../internal/codegen/mxml/MXMLEmitter.java | 16 ++++++++++++++++
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 18 ++++++++++++++++++
.../internal/visitor/mxml/MXMLNodeSwitch.java | 5 ++++-
.../compiler/visitor/mxml/IMXMLBlockVisitor.java | 3 +++
6 files changed, 55 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f23f182a/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java b/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
index 8f78e88..566df04 100644
--- a/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
@@ -26,6 +26,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
@@ -98,4 +99,6 @@ public interface IMXMLEmitter extends IEmitter
void emitPropertySpecifiers(IMXMLPropertySpecifierNode[] nodes,
boolean emitAttributes);
+ void emitFactory(IMXMLFactoryNode node);
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f23f182a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
index d7dfabd..8aa2765 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
@@ -37,6 +37,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
@@ -342,6 +343,16 @@ public class MXMLBlockWalker implements IMXMLBlockVisitor, IMXMLBlockWalker
//--------------------------------------------------------------------------
+ @Override
+ public void visitFactory(IMXMLFactoryNode node)
+ {
+ debug("visitLiteral()");
+
+ mxmlEmitter.emitFactory(node);
+ }
+
+ //--------------------------------------------------------------------------
+
protected void debug(String message)
{
//System.out.println(message);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f23f182a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
index 988763f..229c27f 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
@@ -30,9 +30,11 @@ import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLClassNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
@@ -328,4 +330,18 @@ public class MXMLEmitter extends Emitter implements IMXMLEmitter
|| node.getName().equals("mxmlContent");
}
+ public void emitFactory(IMXMLFactoryNode node)
+ {
+ IASNode cnode = node.getChild(0);
+
+ write("\"");
+
+ if (cnode instanceof IMXMLClassNode)
+ {
+ write(((IMXMLClassNode)cnode).getValue(getMXMLWalker().getProject()).getQualifiedName());
+ }
+
+ write("\"");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f23f182a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index fc7392b..e682534 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -61,9 +61,11 @@ import org.apache.flex.compiler.tree.as.IExpressionNode;
import org.apache.flex.compiler.tree.as.IImportNode;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLClassNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLLiteralNode;
import org.apache.flex.compiler.tree.mxml.IMXMLNode;
@@ -1343,6 +1345,22 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
}
//--------------------------------------------------------------------------
+
+ @Override
+ public void emitFactory(IMXMLFactoryNode node)
+ {
+ MXMLDescriptorSpecifier ps = getCurrentDescriptor("ps");
+ ps.value = "new mx.core.ClassFactory(";
+
+ IASNode cnode = node.getChild(0);
+ if (cnode instanceof IMXMLClassNode)
+ {
+ ps.value += ((IMXMLClassNode)cnode).getValue(getMXMLWalker().getProject()).getQualifiedName();
+ }
+ ps.value += ")";
+ }
+
+ //--------------------------------------------------------------------------
// JS output
//--------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f23f182a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
index a69df1f..459518c 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
@@ -26,6 +26,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
@@ -113,6 +114,9 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLStateID:
visitor.visitInstance((IMXMLInstanceNode) node);
break;
+ case MXMLFactoryID:
+ visitor.visitFactory((IMXMLFactoryNode) node);
+ break;
case MXMLApplicationID:
case MXMLBindingID:
@@ -128,7 +132,6 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLDesignLayerID:
case MXMLEmbedID:
case MXMLEffectSpecifierID:
- case MXMLFactoryID:
case MXMLFunctionID:
case MXMLHTTPServiceID:
case MXMLHTTPServiceRequestID:
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f23f182a/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java b/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
index 4e347f0..a31124a 100644
--- a/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
+++ b/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
@@ -26,6 +26,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
@@ -94,5 +95,7 @@ public interface IMXMLBlockVisitor extends IBlockVisitor
//--------------------------------------------------------------------------
void visitLiteral(IMXMLLiteralNode node);
+
+ void visitFactory(IMXMLFactoryNode node);
}
[36/50] git commit: [flex-falcon] [refs/heads/maven] - set maxmemory
so javadoc doesn't run out of memory on windows
Posted by jo...@apache.org.
set maxmemory so javadoc doesn't run out of memory on windows
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cffc25dc
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cffc25dc
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cffc25dc
Branch: refs/heads/maven
Commit: cffc25dcfc7e4ce27175aa48692d5cb693a4d28a
Parents: c0c0164
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jan 10 01:12:25 2014 +0000
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 10 01:12:25 2014 +0000
----------------------------------------------------------------------
compiler/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cffc25dc/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 92e701d..ea33477 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -514,7 +514,7 @@
<target name="javadoc" depends="eclipse, set.javadoc.zip.uptodate" unless="javadoc.zip.uptodate"
description="Builds Javadoc">
- <javadoc destdir="${compiler}/generated/javadoc" useexternalfile="yes" overview="${compiler}/src/overview.html" failonerror="true">
+ <javadoc destdir="${compiler}/generated/javadoc" useexternalfile="yes" overview="${compiler}/src/overview.html" failonerror="true" maxmemory="512m">
<sourcefiles>
<fileset dir="${compiler}/src" includes="**/*.java"/>
<fileset dir="${compiler}/generated/src" includes="**/*.java"/>
[42/50] git commit: [flex-falcon] [refs/heads/maven] - fix failing
junit tests
Posted by jo...@apache.org.
fix failing junit tests
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3b96c69b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3b96c69b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3b96c69b
Branch: refs/heads/maven
Commit: 3b96c69b2ec657cf6b4738c49ebaa0bab7636506
Parents: 765968e
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jan 16 14:15:26 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jan 16 14:15:26 2014 -0800
----------------------------------------------------------------------
.../test-files/flexjs/files/FlexJSTest_again_result.js | 1 +
compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js | 1 +
compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js | 1 +
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3b96c69b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
index d4b6744..e966348 100644
--- a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
@@ -21,6 +21,7 @@ goog.require('org.apache.flex.events.Event');
+
/**
* @constructor
* @extends {org.apache.flex.core.Application}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3b96c69b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
index d18b792..55cf7f3 100644
--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
@@ -26,6 +26,7 @@ goog.require('org.apache.flex.utils.Timer');
+
/**
* @constructor
* @extends {org.apache.flex.core.ViewBase}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3b96c69b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
index ad7fa87..1ecde33 100644
--- a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
@@ -13,6 +13,7 @@ goog.require('org.apache.flex.html.staticControls.Button');
+
/**
* @constructor
* @extends {org.apache.flex.core.Application}
[05/50] git commit: [flex-falcon] [refs/heads/maven] - add ability to
use older version of closure compiler
Posted by jo...@apache.org.
add ability to use older version of closure compiler
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/635ef7bf
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/635ef7bf
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/635ef7bf
Branch: refs/heads/maven
Commit: 635ef7bf2ab4061eb8040216f762793de6e367b0
Parents: 3d87ef9
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 20 20:34:11 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 20 20:34:11 2013 -0800
----------------------------------------------------------------------
compiler.jx/downloads.xml | 4 +++-
compiler.jx/local-template.properties | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/635ef7bf/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index 913f895..a366f2e 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -23,6 +23,8 @@
<property name="FALCONJX_HOME" location="."/>
<property name="lib.dir" value="${FALCONJX_HOME}/lib"/>
<property name="download.dir" value="${FALCONJX_HOME}/in"/>
+ <property file="${basedir}/local.properties"/>
+ <property name="closure.download.filename" value="compiler-latest.zip" />
<!--
Notes:
@@ -187,7 +189,7 @@
Was: param name="zipFile" value="compiler-latest.zip"
-->
- <param name="zipFile" value="compiler-latest.zip"/>
+ <param name="zipFile" value="${closure.download.filename}"/>
</antcall>
<get src="http://www.apache.org/licenses/LICENSE-2.0" dest="${lib.dir}/google/closure-compiler/closure-LICENSE.txt"/>
<copy todir="${lib.dir}/google/closure-compiler">
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/635ef7bf/compiler.jx/local-template.properties
----------------------------------------------------------------------
diff --git a/compiler.jx/local-template.properties b/compiler.jx/local-template.properties
new file mode 100644
index 0000000..c34f221
--- /dev/null
+++ b/compiler.jx/local-template.properties
@@ -0,0 +1,21 @@
+################################################################################
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+################################################################################
+
+# Closure Compiler file name. Used to get older versions
+closure.download.filename=compiler-20130823.zip
[46/50] git commit: [flex-falcon] [refs/heads/maven] - Copy assets
for SDK classes, but only for classes in the org.apache.flex namespace.
Posted by jo...@apache.org.
Copy assets for SDK classes, but only for classes in the org.apache.flex namespace.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d2d5f3fe
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d2d5f3fe
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d2d5f3fe
Branch: refs/heads/maven
Commit: d2d5f3fe99bf88a5206f3894ea25e6f9dcc01068
Parents: c252ce9
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Thu Feb 27 16:40:57 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Thu Feb 27 16:40:57 2014 +0100
----------------------------------------------------------------------
.../compiler/internal/graph/GoogDepsWriter.java | 38 ++++++++++++++++++++
1 file changed, 38 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d2d5f3fe/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index 566fb0e..8a3209d 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -239,6 +239,44 @@ public class GoogDepsWriter {
// copy source to output
try {
FileUtils.copyFile(f, destFile);
+
+ // (erikdebruin) copy class assets files
+ if (className.indexOf("org.apache.flex") > -1)
+ {
+ File assetsDir = new File(f.getParentFile(), "assets");
+ if (assetsDir.exists())
+ {
+ String nameOfClass = className.substring(className.lastIndexOf('.') + 1);
+
+ File[] assetsList = assetsDir.listFiles();
+ for (int i = 0; i < assetsList.length; i++)
+ {
+ File assetFile = assetsList[i];
+ String assetFileName = assetFile.getName();
+
+ if (assetFile.isFile() && assetFileName.indexOf(nameOfClass) == 0)
+ {
+ String pathOfClass = "";
+ pathOfClass = className.substring(0, className.lastIndexOf('.'));
+ pathOfClass = pathOfClass.replace(".", File.separator);
+
+ destFile = new File(outputFolderPath +
+ File.separator + pathOfClass +
+ File.separator + "assets" +
+ File.separator + assetFileName);
+ FileUtils.copyFile(assetFile, destFile);
+
+ destFile = new File(outputFolderPath.replace("js-debug", "js-release") +
+ File.separator + pathOfClass +
+ File.separator + "assets" +
+ File.separator + assetFileName);
+ FileUtils.copyFile(assetFile, destFile);
+
+ System.out.println("Copied assets of the '" + nameOfClass + "' class");
+ }
+ }
+ }
+ }
} catch (IOException e) {
System.out.println("Error copying file for class: " + className);
}
[23/50] git commit: [flex-falcon] [refs/heads/maven] - Changed the
tests for the proper emission of JSDoc annotations for the interface members.
Posted by jo...@apache.org.
Changed the tests for the proper emission of JSDoc annotations for the interface members.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/58352859
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/58352859
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/58352859
Branch: refs/heads/maven
Commit: 583528598d3079c5d7e1242b119db6c9d8f43f7d
Parents: 17ccd49
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 11:19:37 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 11:19:37 2013 +0100
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/TestFlexJSInterface.java | 6 +++---
.../compiler/internal/codegen/js/goog/TestGoogProject.java | 2 ++
.../flexjs/projects/interfaces/interfaces/IE_result.js | 6 ++++++
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/58352859/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
index eff48c5..1bc10f4 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
@@ -43,7 +43,7 @@ public class TestFlexJSInterface extends TestGoogInterface
+ "function get foo1():Object;"
+ "function set foo1(value:Object):void;}");
asBlockWalker.visitInterface(node);
- assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function(value) {};");
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.get_foo1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.set_foo1 = function(value) {};");
}
@Override
@@ -54,7 +54,7 @@ public class TestFlexJSInterface extends TestGoogInterface
+ "function baz1():Object;"
+ "function baz2(value:Object):void;}");
asBlockWalker.visitInterface(node);
- assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};");
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.baz1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.baz2 = function(value) {};");
}
@Override
@@ -67,7 +67,7 @@ public class TestFlexJSInterface extends TestGoogInterface
+ "function baz1():Object;"
+ "function baz2(value:Object):void;}");
asBlockWalker.visitInterface(node);
- assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function(value) {};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};");
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.get_foo1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.set_foo1 = function(value) {};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.baz1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.baz2 = function(value) {};");
}
protected IBackend createBackend()
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/58352859/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java
index df4e612..c41f820 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java
@@ -80,6 +80,8 @@ public class TestGoogProject extends ASTestBase
+ backend.getOutputExtension();
String compiledResult = readCodeFile(new File(compiledFilePath));
+ System.out.println(compiledResult);
+
String expectedFilePath = new File("test-files").getAbsolutePath()
+ File.separator + testDirPath + File.separator
+ compiledFileName + "_result" + "."
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/58352859/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
index d1443d7..4ca2e21 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
@@ -20,9 +20,15 @@ interfaces.IE = function() {
interfaces.IE.prototype.myMethod = function() {};
+/**
+ * @return {string}
+ */
interfaces.IE.prototype.get_myProp = function() {};
+/**
+ * @param {string} value
+ */
interfaces.IE.prototype.set_myProp = function(value) {};
[17/50] git commit: [flex-falcon] [refs/heads/maven] - Changed the
tests for the new interface member emission.
Posted by jo...@apache.org.
Changed the tests for the new interface member emission.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e3eff8e9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e3eff8e9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e3eff8e9
Branch: refs/heads/maven
Commit: e3eff8e9191802a7c7b83cefaa06f79ad13dc286
Parents: 15035e6
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 10:11:41 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 10:11:41 2013 +0100
----------------------------------------------------------------------
.../codegen/js/flexjs/TestFlexJSInterface.java | 37 ++++++++++++++++++++
.../flexjs/projects/interfaces/interfaces/IE.as | 6 +++-
.../projects/interfaces/interfaces/IE_result.js | 9 +++++
3 files changed, 51 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e3eff8e9/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
index e2de1df..d95eef1 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
@@ -22,6 +22,8 @@ package org.apache.flex.compiler.internal.codegen.js.flexjs;
import org.apache.flex.compiler.driver.IBackend;
import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogInterface;
import org.apache.flex.compiler.internal.driver.js.flexjs.FlexJSBackend;
+import org.apache.flex.compiler.tree.as.IInterfaceNode;
+import org.junit.Test;
/**
* This class tests the production of valid 'goog' JS code for Interface
@@ -33,6 +35,41 @@ import org.apache.flex.compiler.internal.driver.js.flexjs.FlexJSBackend;
public class TestFlexJSInterface extends TestGoogInterface
{
+ @Override
+ @Test
+ public void testAccessors()
+ {
+ IInterfaceNode node = getInterfaceNode("public interface IA {"
+ + "function get foo1():Object;"
+ + "function set foo1(value:Object):void;}");
+ asBlockWalker.visitInterface(node);
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function() {};");
+ }
+
+ @Override
+ @Test
+ public void testMethods()
+ {
+ IInterfaceNode node = getInterfaceNode("public interface IA {"
+ + "function baz1():Object;"
+ + "function baz2(value:Object):void;}");
+ asBlockWalker.visitInterface(node);
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};");
+ }
+
+ @Override
+ @Test
+ public void testAccessorsMethods()
+ {
+ IInterfaceNode node = getInterfaceNode("public interface IA {"
+ + "function get foo1():Object;"
+ + "function set foo1(value:Object):void;"
+ + "function baz1():Object;"
+ + "function baz2(value:Object):void;}");
+ asBlockWalker.visitInterface(node);
+ assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function() {};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};");
+ }
+
protected IBackend createBackend()
{
return new FlexJSBackend();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e3eff8e9/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE.as
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE.as b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE.as
index b40e49e..4fe6ad4 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE.as
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE.as
@@ -1,4 +1,8 @@
package interfaces
{
- public interface IE {}
+ public interface IE {
+ function myMethod():void;
+ function get myProp():String;
+ function set myProp(value:String):void;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e3eff8e9/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
index 1455342..d3f50b1 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
@@ -17,6 +17,15 @@ interfaces.IE = function() {
};
+interfaces.IE.prototype.myMethod = function() {};
+
+
+interfaces.IE.prototype.get_myProp = function() {};
+
+
+interfaces.IE.prototype.set_myProp = function() {};
+
+
/**
* Metadata
*
[27/50] git commit: [flex-falcon] [refs/heads/maven] - add
local.properties to gitignore
Posted by jo...@apache.org.
add local.properties to gitignore
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e0c964de
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e0c964de
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e0c964de
Branch: refs/heads/maven
Commit: e0c964de5e64dd4e083d6b6b74b789f042522c34
Parents: 7ed6ee3
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 15 23:33:25 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Dec 15 23:34:48 2013 -0800
----------------------------------------------------------------------
.gitignore | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e0c964de/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f73935b..62d7cfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@
#OS junk files
[Tt]humbs.db
*.DS_Store
-/jenkins/
\ No newline at end of file
+/jenkins/
+
+local.properties
\ No newline at end of file
[18/50] git commit: [flex-falcon] [refs/heads/maven] - New interface
member emission.
Posted by jo...@apache.org.
New interface member emission.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/53eb5618
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/53eb5618
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/53eb5618
Branch: refs/heads/maven
Commit: 53eb5618a240c4724b7879d2b07c87d278b9a9a7
Parents: e3eff8e
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 6 10:12:54 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 6 10:12:54 2013 +0100
----------------------------------------------------------------------
.../codegen/js/flexjs/JSFlexJSEmitter.java | 55 ++++++++++++--------
1 file changed, 33 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/53eb5618/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index cd67c00..712e8c5 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -220,7 +220,6 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
}
- /* (aharui): is there any reason to emit members at all?
final IDefinitionNode[] members = node.getAllMemberDefinitionNodes();
for (IDefinitionNode mnode : members)
{
@@ -229,38 +228,50 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
if (!isAccessor || !propertyNames.contains(qname))
{
- writeNewline();
-
- write(qname);
- write(ASEmitterTokens.MEMBER_ACCESS);
- write(JSEmitterTokens.PROTOTYPE);
- write(ASEmitterTokens.MEMBER_ACCESS);
- write(mnode.getQualifiedName());
-
if (isAccessor && !propertyNames.contains(qname))
{
propertyNames.add(qname);
}
+
+ if (isAccessor)
+ {
+ emitInterfaceMember(qname, mnode, true, true);
+ emitInterfaceMember(qname, mnode, true, false);
+ }
else
{
- write(ASEmitterTokens.SPACE);
- writeToken(ASEmitterTokens.EQUAL);
- write(ASEmitterTokens.FUNCTION);
-
- emitParameters(((IFunctionNode) mnode).getParameterNodes());
-
- write(ASEmitterTokens.SPACE);
- write(ASEmitterTokens.BLOCK_OPEN);
- writeNewline();
- write(ASEmitterTokens.BLOCK_CLOSE);
+ emitInterfaceMember(qname, mnode, false, false);
}
-
- write(ASEmitterTokens.SEMICOLON);
}
}
- */
}
+ private void emitInterfaceMember(String qname, IDefinitionNode dnode,
+ boolean isAccessor, boolean isGetter)
+ {
+ writeNewline();
+ writeNewline();
+ writeNewline();
+
+ write(qname);
+ write(ASEmitterTokens.MEMBER_ACCESS);
+ write(JSEmitterTokens.PROTOTYPE);
+ write(ASEmitterTokens.MEMBER_ACCESS);
+ if (isAccessor)
+ {
+ writeGetSetPrefix(isGetter);
+ }
+ write(dnode.getQualifiedName());
+ write(ASEmitterTokens.SPACE);
+ writeToken(ASEmitterTokens.EQUAL);
+ write(ASEmitterTokens.FUNCTION);
+ emitParameters(((IFunctionNode) dnode).getParameterNodes());
+ write(ASEmitterTokens.SPACE);
+ write(ASEmitterTokens.BLOCK_OPEN);
+ write(ASEmitterTokens.BLOCK_CLOSE);
+ write(ASEmitterTokens.SEMICOLON);
+ }
+
@Override
public void emitField(IVariableNode node)
{
[28/50] git commit: [flex-falcon] [refs/heads/maven] - ignore build
result folders
Posted by jo...@apache.org.
ignore build result folders
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/49741995
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/49741995
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/49741995
Branch: refs/heads/maven
Commit: 4974199529f3bf23c754e27a24bb6df27b831c77
Parents: e0c964d
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 16 09:10:11 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 16 09:10:11 2013 -0800
----------------------------------------------------------------------
.gitignore | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/49741995/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 62d7cfb..0eecb39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,8 @@
*.DS_Store
/jenkins/
-local.properties
\ No newline at end of file
+local.properties
+
+out/
+temp/
+rat.report
[04/50] git commit: [flex-falcon] [refs/heads/maven] - fix SWC
building. Was not handling include-classes correctly
Posted by jo...@apache.org.
fix SWC building. Was not handling include-classes correctly
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/685f5f13
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/685f5f13
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/685f5f13
Branch: refs/heads/maven
Commit: 685f5f130043f80f44e3cf3aeadb3ba6f741cc93
Parents: 03568ef
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 20 12:20:13 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 20 12:21:43 2013 -0800
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/targets/SWCTarget.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/685f5f13/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java b/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
index 17cf971..2c231ba 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
@@ -772,11 +772,11 @@ public class SWCTarget extends Target implements ISWCTarget
for (String className : classNames)
{
Collection<XMLName> tagNames = flexProject.getTagNamesForClass(className);
- boolean okToAdd = false;
+ boolean okToAdd = true;
for (XMLName tagName : tagNames)
{
- if (!flexProject.isManifestComponentLookupOnly(tagName))
- okToAdd = true;
+ if (flexProject.isManifestComponentLookupOnly(tagName))
+ okToAdd = false;
}
if (okToAdd)
compilableClassNames.add(className);
[33/50] git commit: [flex-falcon] [refs/heads/maven] - fixes so
install and download scripts run in the FlexJS install
Posted by jo...@apache.org.
fixes so install and download scripts run in the FlexJS install
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cd48b0ad
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cd48b0ad
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cd48b0ad
Branch: refs/heads/maven
Commit: cd48b0adb5b4addfaca61efd6065e262bd8c4041
Parents: 544a36a
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 29 21:29:39 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Dec 29 21:29:39 2013 -0800
----------------------------------------------------------------------
compiler/downloads.xml | 40 +++++++++++++---------------------------
installer.xml | 16 ++++++++--------
2 files changed, 21 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cd48b0ad/compiler/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler/downloads.xml b/compiler/downloads.xml
index 799020c..db2eca7 100644
--- a/compiler/downloads.xml
+++ b/compiler/downloads.xml
@@ -48,6 +48,9 @@
<property name="guava.name" value="guava-15.0"/>
<property name="jburg.name" value="jburg-1.10.1"/>
<property name="lzma.name" value="lzma-sdk-9.2"/>
+
+ <property name="antlr.src.url" value="http://antlr3.org/download"/>
+ <property name="antlr.src.file" value="antlr-3.3-complete.jar"/>
<!--
Because the downloads requires a network connection and the JARs don't change very often,
@@ -203,7 +206,7 @@
<target name="antlr-jar-check" description="Checks if antlr jar exists.">
<condition property="antlr.jar.exists">
<and>
- <available file="${basedir}/lib/antlr.jar"/>
+ <available file="${lib.dir}/antlr.jar"/>
</and>
</condition>
</target>
@@ -219,8 +222,8 @@
description="Downloads the antlr jars.">
<antcall target="download-jar">
- <param name="srcUrl" value="http://antlr3.org/download"/>
- <param name="srcJarFile" value="antlr-3.3-complete.jar"/>
+ <param name="srcUrl" value="${antlr.src.url}"/>
+ <param name="srcJarFile" value="${antlr.src.file}"/>
<param name="destJarFile" value="${lib.dir}/antlr.jar"/>
<param name="md5" value="238becce7da69f7be5c5b8a65558cf63"/>
</antcall>
@@ -306,7 +309,6 @@
<param name="destJarFile" value="${lib.dir}/guava.jar"/>
</antcall>
<get src="http://www.apache.org/licenses/LICENSE-2.0" dest="${lib.dir}/guava-LICENSE.txt"/>
- <delete dir="${download.dir}/temp/${guava.name}"/>
</target>
<!--
@@ -349,33 +351,17 @@
<target name="lzma-jar" depends="lzma-jar-check" unless="lzma.jar.exists"
description="Copies the lzma build jars.">
<echo message="Obtaining lib/lzma.jar"/>
- <antcall target="download-bz2">
- <param name="srcUrl" value="http://downloads.sourceforge.net/project/sevenzip/LZMA%20SDK"/>
- <param name="zipFile" value="lzma920.tar.bz2"/>
- <param name="md5" value="b73fe1bb5f443993adcf8b274f6a48b2"/>
+ <antcall target="download-zip">
+ <param name="srcUrl" value="http://www.java2s.com/Code/JarDownload/lzma"/>
+ <param name="zipFile" value="lzma-9.20.jar.zip"/>
+ <param name="md5" value="d5f7343bbd03bf1c4a4806b372cc5354"/>
+ <param name="srcJarPath" value="lzma-9.20.jar"/>
+ <param name="destJarFile" value="${lib.dir}/lzma-sdk.jar"/>
</antcall>
- <antcall target="lzma-build" />
- <echo file="${lib.dir}/lzma-sdk-LICENSE.TXT">http://www.7-zip.org/sdk.html</echo>
+ <echo file="${lib.dir}/lzma-sdk-LICENSE.TXT">http://www.7-zip.org/sdk.html</echo>
<delete includeemptydirs="true">
<fileset dir="${download.dir}/temp" includes="**/*"/>
</delete>
</target>
- <target name="lzma-build" >
- <echo message="Building lib/lzma.jar"/>
- <mkdir dir="${download.dir}/temp/Java/classes" />
- <javac destdir="${download.dir}/temp/Java/classes" srcdir="${download.dir}/temp/Java/SevenZip"
- includes="**/*.java" includeAntRuntime="true"/>
- <copy todir="${download.dir}/temp/Java/classes/SevenZip">
- <fileset dir="${download.dir}/temp">
- <include name="7zC.txt"/>
- </fileset>
- </copy>
- <jar file="${lib.dir}/lzma-sdk.jar" basedir="${download.dir}/temp/Java/classes" >
- <manifest>
- <attribute name="Manifest-Version" value="1.0"/>
- </manifest>
- </jar>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cd48b0ad/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index c440ea8..2d43817 100644
--- a/installer.xml
+++ b/installer.xml
@@ -44,8 +44,8 @@
<!-- assumes Falcon expanded into the in/falcon folder in a Flex SDK folder -->
<condition property="FLEX_HOME" value="${basedir}/../.." >
<and>
- <available file="../../in/falcon" type="dir" />
- <available file="../../lib/mxmlc.jar" />
+ <available file="${basedir}/../../in/falcon" type="dir" />
+ <available file="${basedir}/../../lib/mxmlc.jar" />
</and>
</condition>
@@ -103,23 +103,23 @@
<include name="flexTasks.jar"/>
</fileset>
</copy>
- <copy todir="${FLEX_HOME}/bin-legacy" includeEmptyDirs="false">
+ <copy todir="${FLEX_HOME}/bin-legacy" overwrite="true" includeEmptyDirs="false">
<fileset dir="${FLEX_HOME}/bin">
<include name="**/*"/>
</fileset>
</copy>
- <copy todir="${FLEX_HOME}/bin" includeEmptyDirs="false">
+ <copy todir="${FLEX_HOME}/bin" overwrite="true" includeEmptyDirs="false">
<fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/bin">
<include name="**/*"/>
</fileset>
</copy>
- <copy todir="${FLEX_HOME}/lib" includeEmptyDirs="false">
+ <copy todir="${FLEX_HOME}/lib" overwrite="true" includeEmptyDirs="false">
<fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/lib">
<include name="**"/>
</fileset>
</copy>
<!-- Copy compiler external dependencies -->
- <copy todir="${FLEX_HOME}/lib/external" includeEmptyDirs="false">
+ <copy todir="${FLEX_HOME}/lib/external" overwrite="true" includeEmptyDirs="false">
<fileset dir="${FALCON_HOME}/lib">
<include name="**"/>
</fileset>
@@ -130,12 +130,12 @@
<mkdir dir="${FLEX_HOME}/js/bin" />
<mkdir dir="${FLEX_HOME}/js/lib" />
<!-- If sdk.branch is set to binary distro flexTasks is in a different place. -->
- <copy todir="${FLEX_HOME}/js/lib" failOnError="false" overwrite="false">
+ <copy todir="${FLEX_HOME}/js/lib" failOnError="false" overwrite="true">
<fileset dir="${FALCON_HOME}/js/lib">
<include name="**/**"/>
</fileset>
</copy>
- <copy todir="${FLEX_HOME}/js/bin" failOnError="false" overwrite="false">
+ <copy todir="${FLEX_HOME}/js/bin" failOnError="false" overwrite="true">
<fileset dir="${FALCON_HOME}/js/bin">
<include name="**/**"/>
</fileset>
[15/50] git commit: [flex-falcon] [refs/heads/maven] - Don't bother
emitting interface members. The way they were being emitted were causing
warnings from the closure compiler
Posted by jo...@apache.org.
Don't bother emitting interface members. The way they were being emitted were causing warnings from the closure compiler
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/70683e5d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/70683e5d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/70683e5d
Branch: refs/heads/maven
Commit: 70683e5d223538713c02eb02029f4e67686c0c7a
Parents: 30fd603
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 4 22:11:39 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 4 22:11:39 2013 -0800
----------------------------------------------------------------------
.../codegen/js/flexjs/JSFlexJSEmitter.java | 65 ++++++++++++++++++++
1 file changed, 65 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/70683e5d/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index a65335d..cd67c00 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -197,6 +197,71 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
}
@Override
+ public void emitInterface(IInterfaceNode node)
+ {
+ ICompilerProject project = getWalker().getProject();
+
+ getDoc().emitInterfaceDoc(node, project);
+
+ String qname = node.getQualifiedName();
+ if (qname != null && !qname.equals(""))
+ {
+ write(qname);
+ write(ASEmitterTokens.SPACE);
+ writeToken(ASEmitterTokens.EQUAL);
+ write(ASEmitterTokens.FUNCTION);
+ write(ASEmitterTokens.PAREN_OPEN);
+ write(ASEmitterTokens.PAREN_CLOSE);
+ write(ASEmitterTokens.SPACE);
+ write(ASEmitterTokens.BLOCK_OPEN);
+ writeNewline();
+ write(ASEmitterTokens.BLOCK_CLOSE);
+ write(ASEmitterTokens.SEMICOLON);
+ }
+
+
+ /* (aharui): is there any reason to emit members at all?
+ final IDefinitionNode[] members = node.getAllMemberDefinitionNodes();
+ for (IDefinitionNode mnode : members)
+ {
+ boolean isAccessor = mnode.getNodeID() == ASTNodeID.GetterID
+ || mnode.getNodeID() == ASTNodeID.SetterID;
+
+ if (!isAccessor || !propertyNames.contains(qname))
+ {
+ writeNewline();
+
+ write(qname);
+ write(ASEmitterTokens.MEMBER_ACCESS);
+ write(JSEmitterTokens.PROTOTYPE);
+ write(ASEmitterTokens.MEMBER_ACCESS);
+ write(mnode.getQualifiedName());
+
+ if (isAccessor && !propertyNames.contains(qname))
+ {
+ propertyNames.add(qname);
+ }
+ else
+ {
+ write(ASEmitterTokens.SPACE);
+ writeToken(ASEmitterTokens.EQUAL);
+ write(ASEmitterTokens.FUNCTION);
+
+ emitParameters(((IFunctionNode) mnode).getParameterNodes());
+
+ write(ASEmitterTokens.SPACE);
+ write(ASEmitterTokens.BLOCK_OPEN);
+ writeNewline();
+ write(ASEmitterTokens.BLOCK_CLOSE);
+ }
+
+ write(ASEmitterTokens.SEMICOLON);
+ }
+ }
+ */
+ }
+
+ @Override
public void emitField(IVariableNode node)
{
IDefinition definition = getClassDefinition(node);
[39/50] git commit: [flex-falcon] [refs/heads/maven] - fix installer
properties file lookup
Posted by jo...@apache.org.
fix installer properties file lookup
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cc6debfb
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cc6debfb
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cc6debfb
Branch: refs/heads/maven
Commit: cc6debfb6d9b3d3f07cd789a86e057375efc3408
Parents: 1df3151
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jan 15 15:21:31 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 15 15:21:31 2014 -0800
----------------------------------------------------------------------
installer.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cc6debfb/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 2d43817..9bba160 100644
--- a/installer.xml
+++ b/installer.xml
@@ -38,8 +38,8 @@
<property environment="env"/>
<property file="${FALCON_HOME}/local.properties"/>
<property file="${FALCON_HOME}/build.properties"/>
- <property file="${FALCON_HOME}/install.properties/${bundle}.properties"/>
- <property file="${FALCON_HOME}/install.properties/en_US.properties"/>
+ <property file="${FALCON_HOME}/installer.properties/${bundle}.properties"/>
+ <property file="${FALCON_HOME}/installer.properties/en_US.properties"/>
<!-- assumes Falcon expanded into the in/falcon folder in a Flex SDK folder -->
<condition property="FLEX_HOME" value="${basedir}/../.." >
[02/50] git commit: [flex-falcon] [refs/heads/maven] - Updated
download URL for GCC
Posted by jo...@apache.org.
Updated download URL for GCC
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/03568ef9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/03568ef9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/03568ef9
Branch: refs/heads/maven
Commit: 03568ef9a619acdb65d339dc7dc29eacc70235b7
Parents: 16551fb
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 20 09:15:36 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 20 09:15:36 2013 +0100
----------------------------------------------------------------------
compiler.jx/downloads.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/03568ef9/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index 243c20b..913f895 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -179,7 +179,7 @@
description="Copies the closure build jars.">
<mkdir dir="${lib.dir}/google/closure-compiler" />
<antcall target="download-zip">
- <param name="srcUrl" value="http://closure-compiler.googlecode.com/files"/>
+ <param name="srcUrl" value="http://dl.google.com/closure-compiler"/>
<!--
erikdebruin: because of a dependency Falcon has on an old version of Guava,
any versions of the Closure compiler after sept. 17, 2012 cause exceptions
[09/50] git commit: [flex-falcon] [refs/heads/maven] - A weird
character was between 'ArgumentError' and the equals sign, causing the test
to fail... And no, I don't consider a space a weird character ; -)
Posted by jo...@apache.org.
A weird character was between 'ArgumentError' and the equals sign, causing the test to fail... And no, I don't consider a space a weird character ;-)
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c3557a5f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c3557a5f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c3557a5f
Branch: refs/heads/maven
Commit: c3557a5fc94826e25cbb203666317ef744898c84
Parents: 7dbe7e7
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Nov 29 09:19:26 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Nov 29 09:19:26 2013 +0100
----------------------------------------------------------------------
compiler.jx.tests/test-files/goog/files/input.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3557a5f/compiler.jx.tests/test-files/goog/files/input.as
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/goog/files/input.as b/compiler.jx.tests/test-files/goog/files/input.as
index 1e3aa01..7dce8fc 100644
--- a/compiler.jx.tests/test-files/goog/files/input.as
+++ b/compiler.jx.tests/test-files/goog/files/input.as
@@ -14,7 +14,7 @@ public dynamic class A extends spark.components.Button implements IEventDispatch
trace(typeof "a");
}
- private var _a:ArgumentErrorĀ = new ArgumentError();
+ private var _a:ArgumentError = new ArgumentError();
public const MY_INSTANCE_CONST:String = "myInstanceConst";
}