You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/06/26 15:44:41 UTC
[01/50] git commit: [flex-falcon] [refs/heads/master] - Added RegExp
to native JS types
Repository: flex-falcon
Updated Branches:
refs/heads/master 22d17c8d4 -> 9ca949d05
Added RegExp to native JS types
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e11cf7ee
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e11cf7ee
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e11cf7ee
Branch: refs/heads/master
Commit: e11cf7eee2258e1c21bd1193c7692427eb5b2b86
Parents: 153b51e
Author: Harbs <ha...@in-tools.com>
Authored: Thu Apr 20 23:43:53 2017 -0400
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Apr 20 23:43:53 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/flex/compiler/utils/NativeUtils.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e11cf7ee/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NativeUtils.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NativeUtils.java b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NativeUtils.java
index 4969a3d..6a493b2 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NativeUtils.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NativeUtils.java
@@ -91,6 +91,7 @@ public class NativeUtils
NaN("NaN"),
Event("Event"),
Array("Array"),
+ RegExp("RegExp"),
Float32Array("Float32Array"),
Float64Array("Float64Array"),
Int8Array("Int8Array"),
[23/50] git commit: [flex-falcon] [refs/heads/master] - allow pruning
of Class Selectors
Posted by ah...@apache.org.
allow pruning of Class Selectors
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/55ca0b2d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/55ca0b2d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/55ca0b2d
Branch: refs/heads/master
Commit: 55ca0b2d5c6b4892afba73fcbcba2ef3bac7ce42
Parents: ad8fb20
Author: Alex Harui <ah...@apache.org>
Authored: Mon May 15 15:12:21 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon May 15 15:12:21 2017 -0700
----------------------------------------------------------------------
.../css/semantics/CSSSemanticAnalyzer.java | 36 +++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/55ca0b2d/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java b/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
index e2f244c..d34cdee 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
@@ -36,6 +36,7 @@ import org.apache.flex.compiler.css.ICSSProperty;
import org.apache.flex.compiler.css.ICSSPropertyValue;
import org.apache.flex.compiler.css.ICSSRule;
import org.apache.flex.compiler.css.ICSSSelector;
+import org.apache.flex.compiler.css.ICSSSelectorCondition;
import org.apache.flex.compiler.definitions.IClassDefinition;
import org.apache.flex.compiler.definitions.IDefinition;
import org.apache.flex.compiler.definitions.metadata.IMetaTag;
@@ -385,7 +386,11 @@ public class CSSSemanticAnalyzer
for (final ICSSSelector selector : rule.getSelectorGroup())
{
if (isWildcardSelector(selector))
- return true;
+ {
+ String selName = getOptionalSelectorName(selector);
+ if (selName == null) return true;
+ return qnames.contains(selName);
+ }
final String qname = resolvedSelectors.get(selector);
if (qnames.contains(qname))
return true;
@@ -514,6 +519,35 @@ public class CSSSemanticAnalyzer
}
/**
+ * Check if the selector is a optional class selector.
+ * An optional class selector is a class selector
+ * with the name opt_qname_otherstuff.
+ *
+ * The output will not contain the selector if the
+ * class identified by qname is not in the output.
+ *
+ * @param selector CSS selector
+ * @return True if the selector is a "optional" selector.
+ */
+ public static String getOptionalSelectorName(ICSSSelector selector)
+ {
+ ImmutableList<ICSSSelectorCondition> conditions = selector.getConditions();
+ if (conditions.size() == 0)
+ return null;
+ final String elementName = conditions.get(0).getValue();
+ if (elementName == null) return null;
+ if (elementName.startsWith("opt_"))
+ {
+ int c = elementName.indexOf("_", 4);
+ if (c >= 0)
+ {
+ return elementName.substring(4, c).replace("-", ".");
+
+ }
+ }
+ return null;
+ }
+ /**
* Build a map from QNames to class definitions.
*
* @param classDefinitions Class definitions.
[12/50] git commit: [flex-falcon] [refs/heads/master] - compiler-jx:
fix failed build
Posted by ah...@apache.org.
compiler-jx: fix failed build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/1a5ea9f3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1a5ea9f3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1a5ea9f3
Branch: refs/heads/master
Commit: 1a5ea9f3ac279eb9b23858ef9664bf15648f2a4f
Parents: 3afd5d4
Author: Josh Tynjala <jo...@apache.org>
Authored: Mon May 8 16:31:12 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Mon May 8 16:31:12 2017 -0700
----------------------------------------------------------------------
.../flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java | 1 -
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1a5ea9f3/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
index 3c899c4..b023864 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
@@ -35,5 +35,4 @@ import org.apache.flex.compiler.visitor.IASNodeStrategy;
public interface IMXMLFlexJSEmitter extends IMXMLEmitter
{
void emitDocument(IMXMLDocumentNode node);
- void emitSourceMapDirective(ITypeNode node);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1a5ea9f3/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index e41daf8..51737bd 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -687,7 +687,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
metadataNodes.add(node);
}
- @Override
public void emitSourceMapDirective(ITypeNode node)
{
IMXMLBlockWalker walker = (IMXMLBlockWalker) getMXMLWalker();
[16/50] git commit: [flex-falcon] [refs/heads/master] - remove
dependency on org.json
Posted by ah...@apache.org.
remove dependency on org.json
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7c48aceb
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7c48aceb
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7c48aceb
Branch: refs/heads/master
Commit: 7c48aceba231127219f80c0248e2c7a8e2ffb252
Parents: f9c92e4
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 10 23:22:51 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 10 23:22:51 2017 -0700
----------------------------------------------------------------------
README_JX | 1 -
compiler-jx/src/main/resources/downloads.xml | 15 ---------------
2 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7c48aceb/README_JX
----------------------------------------------------------------------
diff --git a/README_JX b/README_JX
index cd1cc1e..7cd70a6 100644
--- a/README_JX
+++ b/README_JX
@@ -73,7 +73,6 @@ Software Dependencies
args4j = http://search.maven.org/remotecontent?filepath=args4j/args4j/2.0.28/args4j-2.0.28.jar
Google Closure Compiler - http://github.com/google/closure-compiler/archive/v 20151015.zip
commons-io - https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.tar.gz
- org.json = http://search.maven.org/remotecontent?filepath=org/codeartisans/org.json/20131017/org.json-20131017.jar
Using the Binary Distribution
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7c48aceb/compiler-jx/src/main/resources/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/resources/downloads.xml b/compiler-jx/src/main/resources/downloads.xml
index 97491f7..9885ede 100644
--- a/compiler-jx/src/main/resources/downloads.xml
+++ b/compiler-jx/src/main/resources/downloads.xml
@@ -119,21 +119,6 @@
<param name="dest.filename" value="${guava.name}.jar"/>
</antcall>
- <!-- org.json -->
- <property name="org.json.name" value="org.json"/>
- <property name="org.json.version" value="20131017"/>
- <!-- property name="org.json.version" value="20130213"/ -->
- <antcall target="download-dependency">
- <param name="name" value="${org.json.name}"/>
- <param name="src.server" value="${maven.search.url}"/>
- <param name="src.folder" value="org/codeartisans/org.json/${org.json.version}"/>
- <param name="src.filename" value="org.json-${org.json.version}.jar"/>
- <param name="src.checksum" value="f1aa9ffeda57b9117e79407acc860e74"/>
- <!-- param name="src.checksum" value="e0593b60af743a63f9678399d275272a"/ --><!-- version 20130213 -->
- <param name="dest.folder" value=""/>
- <param name="dest.filename" value="${org.json.name}.jar"/>
- </antcall>
-
<!-- flex-tool-api -->
<property name="flexToolApi.name" value="flex-tool-api"/>
<property name="flexToolApi.version" value="1.0.0"/>
[08/50] git commit: [flex-falcon] [refs/heads/master] - fix test
Posted by ah...@apache.org.
fix test
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fae10ea1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fae10ea1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fae10ea1
Branch: refs/heads/master
Commit: fae10ea142dc8b98db0cd9eea66d99ca65db3a4d
Parents: 37128e8
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 2 21:10:39 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 2 21:10:39 2017 -0700
----------------------------------------------------------------------
.../mxml/flexjs/TestFlexJSMXMLApplication.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fae10ea1/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
index ae28748..4f10311 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
@@ -825,18 +825,20 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase
public void testFlexJSMainFileDual()
{
MXMLJSC mxmlc = new MXMLJSC();
- String[] args = new String[8];
+ String[] args = new String[10];
args[0] = "-compiler.targets=SWF,JSFlex";
args[1] = "-compiler.allow-subclass-overrides";
args[2] = "-remove-circulars";
args[3] = "-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs")).getPath();
- args[4] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
- args[5] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/FlexJSTest_again.swf").getPath();
+ args[4] = "-js-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/js/FlexJS/libs")).getPath();
+ args[5] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
+ args[6] = "-js-external-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/js/libs/js.swc")).getPath();
+ args[7] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/FlexJSTest_again.swf").getPath();
if (env.GOOG != null)
- args[6] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
+ args[8] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
else
- args[6] = "-define=COMPILE::temp,false";
- args[7] = new File(testAdapter.getUnitTestBaseDir(), "flexjs/files/FlexJSTest_again.mxml").getPath();
+ args[8] = "-define=COMPILE::temp,false";
+ args[9] = new File(testAdapter.getUnitTestBaseDir(), "flexjs/files/FlexJSTest_again.mxml").getPath();
ArrayList<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
int result = mxmlc.mainNoExit(args, problems, true);
[18/50] git commit: [flex-falcon] [refs/heads/master] - add 0.8.0
Posted by ah...@apache.org.
add 0.8.0
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e485eee4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e485eee4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e485eee4
Branch: refs/heads/master
Commit: e485eee41f2b4b74cec36ae928c0124036e31abb
Parents: b6b713a
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 11 11:11:11 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 11 11:11:11 2017 -0700
----------------------------------------------------------------------
RELEASE_NOTES | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e485eee4/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 422ca64..6d24f5f 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,16 @@
+Apache Flex 'Falcon' Compiler 0.8.0
+=================
+Apache Flex 'Falcon' Compiler 0.8.0 is the sixth release of a next-generation
+compiler intended to someday replace the MXMLC in Apache Flex SDKs, and is the
+compiler for Apache FlexJS SDKs.
+
+The compiler is now biased towards building Apache FlexJS projects. The Ant
+tasks now point to the cross-compiler, which can now build both SWFs and
+cross-compiler (transpile) MXML and AS to JS.
+
+Lots of bug fixes and other small improvements are included in this release.
+See the RELEASE_NOTES_JX file for a list of resolved issues.
+
Apache Flex 'Falcon' Compiler 0.7.0
=================
Apache Flex 'Falcon' Compiler 0.7.0 is the fifth release of a next-generation
[47/50] git commit: [flex-falcon] [refs/heads/master] - prepare Maven
build for next RC by changing 0.8.0-SNAPSHOT to 0.8.0
Posted by ah...@apache.org.
prepare Maven build for next RC by changing 0.8.0-SNAPSHOT to 0.8.0
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cf07c624
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cf07c624
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cf07c624
Branch: refs/heads/master
Commit: cf07c624b722494976de2fe66ccaebe44d301b2f
Parents: e90ea20
Author: piotrz <pi...@apache.org>
Authored: Fri Jun 16 08:02:52 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Fri Jun 16 08:02:52 2017 +0200
----------------------------------------------------------------------
compiler-jx/pom.xml | 8 ++++----
compiler-test-utils/pom.xml | 4 ++--
compiler/pom.xml | 6 +++---
debugger/pom.xml | 6 +++---
flex-compiler-oem/pom.xml | 8 ++++----
flexjs-ant-tasks/pom.xml | 4 ++--
flexjs-maven-extension/pom.xml | 2 +-
flexjs-maven-plugin/pom.xml | 4 ++--
pom.xml | 2 +-
9 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/compiler-jx/pom.xml
----------------------------------------------------------------------
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index 8c451e5..d7b9bac 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</parent>
<artifactId>compiler-jx</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<name>Apache Flex - FlexJS: Compiler: Compiler-JX</name>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/compiler-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index 1d75ac5..a36fe53 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</parent>
<artifactId>compiler-test-utils</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<name>Apache Flex - FlexJS: Compiler: Test Utils</name>
<description>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 985622e..2183257 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</parent>
<artifactId>compiler</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<name>Apache Flex - FlexJS: Compiler: Compiler</name>
<description>The Apache Flex Falcon Compiler</description>
@@ -414,7 +414,7 @@
<dependency>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/debugger/pom.xml
----------------------------------------------------------------------
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 27a9a31..b65a158 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</parent>
<artifactId>debugger</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<name>Apache Flex - FlexJS: Compiler: Debugger</name>
@@ -82,7 +82,7 @@ Do all the JBurg code generation.
<dependency>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.flex.compiler</groupId>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/flex-compiler-oem/pom.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index e36f59d..7999d30 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</parent>
<artifactId>flex-compiler-oem</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<name>Apache Flex - FlexJS: Compiler: OEM Layer</name>
@@ -35,12 +35,12 @@
<dependency>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler-jx</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.flex.compiler</groupId>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/flexjs-ant-tasks/pom.xml
----------------------------------------------------------------------
diff --git a/flexjs-ant-tasks/pom.xml b/flexjs-ant-tasks/pom.xml
index f85ef03..023ae22 100644
--- a/flexjs-ant-tasks/pom.xml
+++ b/flexjs-ant-tasks/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</parent>
<artifactId>flexjs-ant-tasks</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<name>Apache Flex - FlexJS: FlexJS Ant Tasks</name>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/flexjs-maven-extension/pom.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-extension/pom.xml b/flexjs-maven-extension/pom.xml
index 3a719fc..de35ce1 100644
--- a/flexjs-maven-extension/pom.xml
+++ b/flexjs-maven-extension/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-maven-extension</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<packaging>jar</packaging>
<name>Apache Flex - FlexJS: FlexJS Maven Extension</name>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/flexjs-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/pom.xml b/flexjs-maven-plugin/pom.xml
index a4bcdc6..e6f3de5 100644
--- a/flexjs-maven-plugin/pom.xml
+++ b/flexjs-maven-plugin/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</parent>
<artifactId>flexjs-maven-plugin</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<packaging>maven-plugin</packaging>
<name>Apache Flex - FlexJS: FlexJS Maven Plugin</name>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cf07c624/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index de4d206..9ef3c7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-compiler-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<packaging>pom</packaging>
<name>Apache Flex - FlexJS: Compiler: Parent</name>
[44/50] git commit: [flex-falcon] [refs/heads/master] - try adding
delay on windows, otherwise you get random dir creation errors
Posted by ah...@apache.org.
try adding delay on windows, otherwise you get random dir creation errors
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fb3ef5d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fb3ef5d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fb3ef5d7
Branch: refs/heads/master
Commit: fb3ef5d791ecbb7ba01fa876aa6cc004014be3be
Parents: 85c4376
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 8 23:29:33 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 8 23:29:33 2017 -0700
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fb3ef5d7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 3a4b664..231f152 100644
--- a/build.xml
+++ b/build.xml
@@ -283,6 +283,7 @@
<target name="stage-source"
description="Package source files required to build in zip file" >
<antcall target="clean-temp"/>
+ <sleep seconds="3" />
<mkdir dir="${basedir}/temp"/>
<copy todir="${basedir}/temp" includeEmptyDirs="false">
[32/50] git commit: [flex-falcon] [refs/heads/master] - compiler-jx:
moved conversion of node module names with dashes to camel case from
ExternCConfiguration into a utility class so that it may be used elsewhere
Posted by ah...@apache.org.
compiler-jx: moved conversion of node module names with dashes to camel case from ExternCConfiguration into a utility class so that it may be used elsewhere
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/693af591
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/693af591
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/693af591
Branch: refs/heads/master
Commit: 693af591303e6b514d4eee042fb76abed6487fda
Parents: 80990a8
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri May 26 14:58:56 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri May 26 14:58:56 2017 -0700
----------------------------------------------------------------------
.../compiler/clients/ExternCConfiguration.java | 11 +-----
.../apache/flex/compiler/utils/NodeJSUtils.java | 41 ++++++++++++++++++++
2 files changed, 43 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/693af591/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ExternCConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ExternCConfiguration.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ExternCConfiguration.java
index d3118e9..67bc814 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ExternCConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ExternCConfiguration.java
@@ -38,6 +38,7 @@ import org.apache.flex.compiler.internal.config.annotations.Arguments;
import org.apache.flex.compiler.internal.config.annotations.Config;
import org.apache.flex.compiler.internal.config.annotations.InfiniteArguments;
import org.apache.flex.compiler.internal.config.annotations.Mapping;
+import org.apache.flex.compiler.utils.NodeJSUtils;
import org.apache.flex.utils.FilenameNormalization;
public class ExternCConfiguration extends Configuration
@@ -324,15 +325,7 @@ public class ExternCConfiguration extends Configuration
for (String module : namedModules)
{
//convert to camel case
- String camelCaseModule = module;
- int moduleIndex = camelCaseModule.indexOf("-");
- while (moduleIndex != -1 && moduleIndex < camelCaseModule.length() - 1)
- {
- camelCaseModule = camelCaseModule.substring(0, moduleIndex)
- + camelCaseModule.substring(moduleIndex + 1, moduleIndex + 2).toUpperCase()
- + camelCaseModule.substring(moduleIndex + 2);
- moduleIndex = camelCaseModule.indexOf("-");
- }
+ String camelCaseModule = NodeJSUtils.convertFromDashesToCamelCase(module);
if(basePackageName.length() == 0)
{
if (classReference.getBaseName().equals(camelCaseModule))
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/693af591/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NodeJSUtils.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NodeJSUtils.java b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NodeJSUtils.java
new file mode 100644
index 0000000..608b3ac
--- /dev/null
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/NodeJSUtils.java
@@ -0,0 +1,41 @@
+/*
+ *
+ * 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.utils;
+
+public class NodeJSUtils
+{
+ /**
+ * Converts the name of a node module with dashes into a version in camel
+ * case so that it can be a valid identifier.
+ */
+ public static String convertFromDashesToCamelCase(String moduleNameWithDashes)
+ {
+ String camelCaseModule = moduleNameWithDashes;
+ int moduleIndex = camelCaseModule.indexOf("-");
+ while (moduleIndex != -1 && moduleIndex < camelCaseModule.length() - 1)
+ {
+ camelCaseModule = camelCaseModule.substring(0, moduleIndex)
+ + camelCaseModule.substring(moduleIndex + 1, moduleIndex + 2).toUpperCase()
+ + camelCaseModule.substring(moduleIndex + 2);
+ moduleIndex = camelCaseModule.indexOf("-");
+ }
+ return camelCaseModule;
+ }
+}
[46/50] git commit: [flex-falcon] [refs/heads/master] - Added a rat
exclusion for the flex-typedefs directory which causes problems in ANT built
release packages.
Posted by ah...@apache.org.
Added a rat exclusion for the flex-typedefs directory which causes problems in ANT built release 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/e90ea207
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e90ea207
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e90ea207
Branch: refs/heads/master
Commit: e90ea207b05a2cd31fbfba8f54c8e386f603fefa
Parents: e8e91e6
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Jun 13 08:58:25 2017 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Jun 13 08:58:25 2017 +0200
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e90ea207/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0f34fc2..de4d206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,12 @@
<exclude>**/target/**</exclude>
<!-- Stuff an Ant build might have left behind. -->
<exclude>lib/**</exclude>
+ <!--
+ In case of an ANT based release the typedefs are included as a
+ subdirectory. We need to exclude this directory from the compiler checks
+ as the typedefs build will handle all content in that directory
+ -->
+ <exclude>flex-typedefs/**</exclude>
</excludes>
</configuration>
<dependencies>
[28/50] git commit: [flex-falcon] [refs/heads/master] - add js config
options
Posted by ah...@apache.org.
add js config options
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/18d96504
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/18d96504
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/18d96504
Branch: refs/heads/master
Commit: 18d96504c4564589c669de6f5c7a0dc20f3729df
Parents: f5a9cc4
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 18 11:11:16 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 18 11:11:16 2017 -0700
----------------------------------------------------------------------
.../flex2/compiler/common/Configuration.java | 297 +++++++++++++++++++
1 file changed, 297 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/18d96504/flex-compiler-oem/src/main/java/flex2/compiler/common/Configuration.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/compiler/common/Configuration.java b/flex-compiler-oem/src/main/java/flex2/compiler/common/Configuration.java
index bfb396a..d005472 100644
--- a/flex-compiler-oem/src/main/java/flex2/compiler/common/Configuration.java
+++ b/flex-compiler-oem/src/main/java/flex2/compiler/common/Configuration.java
@@ -2018,7 +2018,304 @@ public class Configuration implements LinkerConfiguration, Cloneable
return compilerConfiguration.getAdvancedTelemetry();
}
+ //
+ // 'closure-lib' option
+ //
+
+ private String closureLibDirName = null;
+
+ public String getClosureLibDirName()
+ {
+ return closureLibDirName;
+ }
+
+ public void cfgClosureLib( ConfigurationValue cv, String filename )
+ {
+ this.closureLibDirName = getOutputPath(cv, filename);
+ }
+ //
+ // 'sdk-js-lib' option
+ //
+
+ private List<String> sdkJsLibraries = new LinkedList<String>();
+
+ public List<String> getSDKJSLib()
+ {
+ return sdkJsLibraries;
+ }
+
+ public void cfgSDKJSLib( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ VirtualFile f = ConfigurationPathResolver.getVirtualFile( urls[i], configResolver, cfgval );
+ if (f != null)
+ sdkJsLibraries.add( urls[i] );
+ }
+ }
+
+ //
+ // 'external-js-lib' option
+ //
+
+ private List<String> externalJsLibraries = new LinkedList<String>();
+
+ public List<String> getExternalJSLib()
+ {
+ return externalJsLibraries;
+ }
+
+ public void cfgExternalJSLib( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ VirtualFile f = ConfigurationPathResolver.getVirtualFile( urls[i], configResolver, cfgval );
+ if (f != null)
+ externalJsLibraries.add( urls[i] );
+ }
+ }
+
+ //
+ // 'remove-circulars' option
+ //
+
+ private boolean removeCirculars = false;
+
+ public boolean getRemoveCirculars()
+ {
+ return removeCirculars;
+ }
+
+ public void setRemoveCirculars(boolean value)
+ {
+ removeCirculars = value;
+ }
+
+ public void cfgRemoveCirculars(ConfigurationValue cv, boolean value)
+ {
+ setRemoveCirculars(value);
+ }
+
+ //
+ // 'skip-transpile' option
+ //
+
+ private boolean skipTranspile = false;
+
+ public boolean getSkipTranspile()
+ {
+ return skipTranspile;
+ }
+
+ public void setSkipTranspile(boolean value)
+ {
+ skipTranspile = value;
+ }
+
+ public void cfgSkipTranspile(ConfigurationValue cv, boolean value)
+ {
+ setSkipTranspile(value);
+ }
+
+ //
+ // 'js-compiler-option' option
+ //
+
+ private List<String> jsCompilerOption = new LinkedList<String>();
+
+ public List<String> getJsCompilerOption()
+ {
+ return jsCompilerOption;
+ }
+
+ public void cfgJsCompilerOption( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ jsCompilerOption.add( urls[i] );
+ }
+ }
+
+ //
+ // 'js-output-optimization' option
+ //
+
+ private List<String> jsOutputOptimization = new LinkedList<String>();
+
+ public List<String> getJsOutputOptimization()
+ {
+ return jsOutputOptimization;
+ }
+
+ public void cfgJsOutputOptimization( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ jsOutputOptimization.add( urls[i] );
+ }
+ }
+
+ //
+ // 'html-template' option
+ //
+
+ private String htmlTemplateFileName = null;
+
+ public String getHtmlTemplateFileName()
+ {
+ return htmlTemplateFileName;
+ }
+
+ public void cfgHtmlTemplate( ConfigurationValue cv, String filename )
+ {
+ this.htmlTemplateFileName = getOutputPath(cv, filename);
+ }
+
+
+ //
+ // 'html-output-filename' option
+ //
+
+ private String htmlOutputFileName = null;
+
+ public String getHtmlOutputFilename()
+ {
+ return htmlOutputFileName;
+ }
+
+ public void cfgHtmlOutputFilename( ConfigurationValue cv, String filename )
+ {
+ this.htmlOutputFileName = getOutputPath(cv, filename);
+ }
+
+ //
+ // 'compiler-targets' option
+ //
+
+ private List<String> compilerTargets = new LinkedList<String>();
+
+ public List<String> getCompilerTargets()
+ {
+ return compilerTargets;
+ }
+
+ public void cfgCompilerTargets( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ compilerTargets.add( urls[i] );
+ }
+ }
+
+ //
+ // 'source-map' option
+ //
+
+ private boolean sourceMap = false;
+
+ public boolean getSourceMap()
+ {
+ return sourceMap;
+ }
+
+ public void setSourceMap(boolean value)
+ {
+ sourceMap = value;
+ }
+
+ public void cfgSourceMap(ConfigurationValue cv, boolean value)
+ {
+ setSkipTranspile(value);
+ }
+
+ //
+ // 'compiler.js-external-library-path' option
+ //
+
+ private List<String> jsExternalLibrariesPath = new LinkedList<String>();
+
+ public List<String> getJsExternalLibraryPath()
+ {
+ return jsExternalLibrariesPath;
+ }
+
+ public void cfgJsExternalLibraryPath( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ VirtualFile f = ConfigurationPathResolver.getVirtualFile( urls[i], configResolver, cfgval );
+ if (f != null)
+ jsExternalLibrariesPath.add( urls[i] );
+ }
+ }
+
+
+ //
+ // 'compiler.swf-external-library-path' option
+ //
+
+ private List<String> swfExternalLibrariesPath = new LinkedList<String>();
+
+ public List<String> getSwfExternalLibraryPath()
+ {
+ return swfExternalLibrariesPath;
+ }
+
+ public void cfgSwfExternalLibraryPath( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ VirtualFile f = ConfigurationPathResolver.getVirtualFile( urls[i], configResolver, cfgval );
+ if (f != null)
+ swfExternalLibrariesPath.add( urls[i] );
+ }
+ }
+
+ //
+ // 'compiler.js-library-path' option
+ //
+
+ private List<String> jsLibrariesPath = new LinkedList<String>();
+
+ public List<String> getJsLibraryPath()
+ {
+ return jsLibrariesPath;
+ }
+
+ public void cfgJsLibraryPath( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ VirtualFile f = ConfigurationPathResolver.getVirtualFile( urls[i], configResolver, cfgval );
+ if (f != null)
+ jsLibrariesPath.add( urls[i] );
+ }
+ }
+
+
+ //
+ // 'compiler.swf-library-path' option
+ //
+
+ private List<String> swfLibrariesPath = new LinkedList<String>();
+
+ public List<String> getSwfLibraryPath()
+ {
+ return swfLibrariesPath;
+ }
+
+ public void cfgSwfLibraryPath( ConfigurationValue cfgval, String[] urls ) throws ConfigurationException
+ {
+ for (int i = 0; i < urls.length; ++i)
+ {
+ VirtualFile f = ConfigurationPathResolver.getVirtualFile( urls[i], configResolver, cfgval );
+ if (f != null)
+ swfLibrariesPath.add( urls[i] );
+ }
+ }
+
+
@Override
public Configuration clone()
throws CloneNotSupportedException
[38/50] git commit: [flex-falcon] [refs/heads/master] - added two
missing bug fixes to release notes
Posted by ah...@apache.org.
added two missing bug fixes to release notes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/74d14874
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/74d14874
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/74d14874
Branch: refs/heads/master
Commit: 74d148746be4e7c386399c6752180437a378a11d
Parents: ff17848
Author: Josh Tynjala <jo...@apache.org>
Authored: Tue May 30 13:25:30 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Tue May 30 13:25:30 2017 -0700
----------------------------------------------------------------------
RELEASE_NOTES_JX | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/74d14874/RELEASE_NOTES_JX
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES_JX b/RELEASE_NOTES_JX
index 4b1fe5d..968c8ca 100644
--- a/RELEASE_NOTES_JX
+++ b/RELEASE_NOTES_JX
@@ -15,6 +15,8 @@ New Features
Bug Fixes
---------
+-FLEX-35317 Generated require() call for Node.js modules does not produce valid code if module name includes dashes
+-FLEX-35316 -version compiler option does not show version
-FLEX-35300 Could not find file for class: Error
-FLEX-35239 Runtime error when setting a property to a constant value
-FLEX-35236 Binding is not working when [Bindable] is set for the class
[37/50] git commit: [flex-falcon] [refs/heads/master] - fix
SWFOverride handling
Posted by ah...@apache.org.
fix SWFOverride handling
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ff178488
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ff178488
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ff178488
Branch: refs/heads/master
Commit: ff178488cdce68ca46fa3b7aa91d180b5bbd0e61
Parents: 2f5a375
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 30 12:49:42 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 30 12:49:49 2017 -0700
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/targets/SWFTarget.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ff178488/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java b/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java
index 06f932a..144ba5f 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java
@@ -443,6 +443,9 @@ public abstract class SWFTarget extends Target implements ISWFTarget
{
String methodName = method.getMethodName();
if (methodName == null) continue;
+ // match getter with getter methodInfo
+ if (trait.isGetter() && method.getReturnType().getBaseName().equals(IASLanguageConstants.void_)) continue;
+ if (trait.isSetter() && (!method.getReturnType().getBaseName().equals(IASLanguageConstants.void_))) continue;
if (methodName.equals(trait.getName().getBaseName()))
{
String[] keys = meta.getKeys();
@@ -479,7 +482,6 @@ public abstract class SWFTarget extends Target implements ISWFTarget
method.setReturnType(name);
foundName = true;
changedABC = true;
- break metas;
}
}
if (!foundName)
@@ -494,7 +496,6 @@ public abstract class SWFTarget extends Target implements ISWFTarget
namePool.add(name);
method.setReturnType(name);
changedABC = true;
- break metas;
}
}
else if (keys[i].equals(IMetaAttributeConstants.NAME_SWFOVERRIDE_PARAMS))
@@ -556,9 +557,9 @@ public abstract class SWFTarget extends Target implements ISWFTarget
}
}
method.setParamTypes(newList);
- break metas;
}
}
+ break metas;
}
}
}
[27/50] git commit: [flex-falcon] [refs/heads/master] - handle early
exits where source files and mainCU are not available
Posted by ah...@apache.org.
handle early exits where source files and mainCU are not available
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f5a9cc40
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f5a9cc40
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f5a9cc40
Branch: refs/heads/master
Commit: f5a9cc40a78aa20937aa8c72fa0ffd9712447d85
Parents: b36ee03
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 17 23:34:10 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 17 23:34:10 2017 -0700
----------------------------------------------------------------------
.../org/apache/flex/compiler/clients/MXMLC.java | 1 +
.../src/main/java/flex2/tools/oem/Library.java | 50 ++++++++++----------
2 files changed, 27 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f5a9cc40/compiler/src/main/java/org/apache/flex/compiler/clients/MXMLC.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/clients/MXMLC.java b/compiler/src/main/java/org/apache/flex/compiler/clients/MXMLC.java
index d77db73..473f48d 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/clients/MXMLC.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/clients/MXMLC.java
@@ -1141,6 +1141,7 @@ public class MXMLC implements FlexTool
public String getMainSource()
{
+ if (mainCU == null) return "";
return mainCU.getAbsoluteFilename();
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f5a9cc40/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
index 182c325..e6f4eb8 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
@@ -928,32 +928,34 @@ public class Library implements Builder, Cloneable
List<String> sourceFiles = compc.getSourceList();
String mainFile = compc.getMainSource();
VirtualFile mainVirtualFile = null;
- for (String sourceFile : sourceFiles)
+ if (sourceFiles != null)
{
- for (VirtualFile sourcePath : sourcePaths)
- {
- String pathName = sourcePath.getName();
- if (sourceFile.indexOf(pathName) == 0)
- {
- String relPath = sourceFile.substring(pathName.length());
- int lastSep = relPath.lastIndexOf(File.separator);
- String shortName = relPath.substring(lastSep + 1);
- relPath = relPath.substring(0, lastSep);
- boolean isRoot = sourceFile.equals(mainFile);
- Source source = new Source(sourcePath, relPath, shortName, null, false, isRoot);
- compiledSources.add(source);
- if (mainFile != null && pathName.equals(mainFile))
- mainVirtualFile = sourcePath;
- }
- }
+ for (String sourceFile : sourceFiles)
+ {
+ for (VirtualFile sourcePath : sourcePaths)
+ {
+ String pathName = sourcePath.getName();
+ if (sourceFile.indexOf(pathName) == 0)
+ {
+ String relPath = sourceFile.substring(pathName.length());
+ int lastSep = relPath.lastIndexOf(File.separator);
+ String shortName = relPath.substring(lastSep + 1);
+ relPath = relPath.substring(0, lastSep);
+ boolean isRoot = sourceFile.equals(mainFile);
+ Source source = new Source(sourcePath, relPath, shortName, null, false, isRoot);
+ compiledSources.add(source);
+ if (mainFile != null && pathName.equals(mainFile))
+ mainVirtualFile = sourcePath;
+ }
+ }
+ }
+ try {
+ sourceList = new SourceList(new ArrayList<VirtualFile>(), sourcePaths, mainVirtualFile, new String[0]);
+ } catch (CompilerException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ }
}
- try {
- sourceList = new SourceList(new ArrayList<VirtualFile>(), sourcePaths, mainVirtualFile, new String[0]);
- } catch (CompilerException e2) {
- // TODO Auto-generated catch block
- e2.printStackTrace();
- }
-
convertMessages(compc.getProblemQuery());
clean(returnValue != OK, false, false);
[41/50] git commit: [flex-falcon] [refs/heads/master] - fix where we
find Git
Posted by ah...@apache.org.
fix where we find Git
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/78e85147
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/78e85147
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/78e85147
Branch: refs/heads/master
Commit: 78e85147dd36fb266c9e0f714433871ca9692d65
Parents: 833705e
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 8 19:41:52 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 8 19:41:52 2017 -0700
----------------------------------------------------------------------
releasecandidate.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/78e85147/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 7c2c43a..8f3fe3c 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -153,7 +153,7 @@
property="git" value="${env.ProgramFiles}/Git/bin/git.exe" />
<available file="${env.ProgramFiles(x86)}/Git/bin/git.exe"
type="file"
- property="git" value="${env.ProgramFiles}/Git/bin/git.exe" />
+ property="git" value="${env.ProgramFiles(x86)}/Git/bin/git.exe" />
<available file="/usr/local/git/bin/git"
type="file"
property="git" value="/usr/local/git/bin/git" />
[31/50] git commit: [flex-falcon] [refs/heads/master] - COMPJSC:
added missing support for JSTargetType.JS_NODE
Posted by ah...@apache.org.
COMPJSC: added missing support for JSTargetType.JS_NODE
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/80990a86
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/80990a86
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/80990a86
Branch: refs/heads/master
Commit: 80990a86b6b23745f55ec467e9baf8a2b85d0651
Parents: 9f6266b
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri May 26 14:31:34 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri May 26 14:31:34 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/flex/compiler/clients/COMPJSC.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/80990a86/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
index 8b82cb8..f9fcd9c 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
@@ -222,6 +222,7 @@ public class COMPJSC extends MXMLJSC
}
break;
case JS_NATIVE:
+ case JS_NODE:
COMPJSCNative jsc = new COMPJSCNative();
lastCompiler = jsc;
result = jsc.mainNoExit(removeASArgs(args), problems.getProblems(), false);
[30/50] git commit: [flex-falcon] [refs/heads/master] - fix an NPE
Posted by ah...@apache.org.
fix an NPE
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9f6266b6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9f6266b6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9f6266b6
Branch: refs/heads/master
Commit: 9f6266b6fcc5603e2a132c781e0931307b324644
Parents: 9614783
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 24 09:54:38 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 24 09:54:48 2017 -0700
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/projects/FlexProject.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f6266b6/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
index 6a8ffd9..94d1f30 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
@@ -2301,6 +2301,7 @@ public class FlexProject extends ASProject implements IFlexProject
}
}
}
+ if (func == null) return false;
IMetaTag[] metas = func.getAllMetaTags();
for (IMetaTag meta : metas)
{
[14/50] git commit: [flex-falcon] [refs/heads/master] - update
LICENSE now that we don't bundle createjs source and manually created the
externs
Posted by ah...@apache.org.
update LICENSE now that we don't bundle createjs source and manually created the externs
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/31fd9d66
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/31fd9d66
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/31fd9d66
Branch: refs/heads/master
Commit: 31fd9d66dd8f389a6e2f99590f2ee652c790b731
Parents: 8fb2721
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 10 15:32:13 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 10 15:32:13 2017 -0700
----------------------------------------------------------------------
LICENSE.jx | 4 ++++
LICENSE.jx.bin | 23 -----------------------
2 files changed, 4 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/31fd9d66/LICENSE.jx
----------------------------------------------------------------------
diff --git a/LICENSE.jx b/LICENSE.jx
index eef2679..d94ce68 100644
--- a/LICENSE.jx
+++ b/LICENSE.jx
@@ -216,3 +216,7 @@ under Apache License 2.0. For details see the flex-typedefs folder.
The .as files in flex-typedefs/GCL/src are derived from the .js files in the
Google Closure Library which are available under Apache License 2.0.
+The createjs.js file in flex-typedefs/createjs/src/main/javascript is
+a non-copyrightable subset of EaselJS and TweenJS from
+https://github.com/CreateJS
+
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/31fd9d66/LICENSE.jx.bin
----------------------------------------------------------------------
diff --git a/LICENSE.jx.bin b/LICENSE.jx.bin
index f6a69f7..b3b5af1 100644
--- a/LICENSE.jx.bin
+++ b/LICENSE.jx.bin
@@ -1,28 +1,5 @@
Below are the licenses for components included in the binary distribution.
-------------------------------------------------------------------------------------------
-
-flex-typedefs/createjs
-
-This product bundles CreateJS's EaselJS and TweenJS available under the
-MIT Software License.
-
-The TweenJS code is based on Robert Penner's easing equations available
-under the BSD license.
-
----- From http://robertpenner.com/easing_terms_of_use.html on 8/11/2016 ----
-Copyright © 2001 Robert Penner
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----- end of http://robertpenner.com/easing_terms_of_use.html on 8/11/2016 ----
-
flex-typedefs/js/target/downloads/svg.js
This product bundles svg.js from closureidl.googlecode.com available
[02/50] git commit: [flex-falcon] [refs/heads/master] - turn debug
flag on by default for COMPC
Posted by ah...@apache.org.
turn debug flag on by default for COMPC
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0f02a820
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0f02a820
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0f02a820
Branch: refs/heads/master
Commit: 0f02a8202c4233694bb2cb93e784b6b1cdd29843
Parents: f39e0fb
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 21 09:32:54 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 21 09:32:54 2017 -0700
----------------------------------------------------------------------
.../apache/flex/compiler/clients/COMPJSC.java | 5 +-
.../apache/flex/compiler/clients/MXMLJSC.java | 5 +-
.../js/goog/JSGoogCompcConfiguration.java | 407 +++++++++++++++++++
3 files changed, 413 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0f02a820/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
index 614352b..f13ee22 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
@@ -52,7 +52,7 @@ import org.apache.flex.compiler.internal.codegen.js.JSWriter;
import org.apache.flex.compiler.internal.driver.as.ASBackend;
import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend;
import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
+import org.apache.flex.compiler.internal.driver.js.goog.JSGoogCompcConfiguration;
import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSSWCBackend;
import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend;
import org.apache.flex.compiler.internal.projects.CompilerProject;
@@ -128,6 +128,7 @@ public class COMPJSC extends MXMLJSC
long startTime = System.nanoTime();
final COMPJSC mxmlc = new COMPJSC();
+ mxmlc.configurationClass = JSGoogCompcConfiguration.class;
final List<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
final int exitCode = mxmlc.mainNoExit(args, problems, true);
@@ -201,7 +202,7 @@ public class COMPJSC extends MXMLJSC
case SWF:
System.out.println("COMPC");
COMPC compc = new COMPC();
- compc.configurationClass = JSGoogConfiguration.class;
+ compc.configurationClass = JSGoogCompcConfiguration.class;
result = compc.mainNoExit(removeJSArgs(args));
if (result != 0)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0f02a820/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
index b087fa5..795466e 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -264,6 +264,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
private JSCompilerEntryPoint lastCompiler;
public boolean noLink;
public OutputStream err;
+ public Class<? extends Configuration> configurationClass = JSGoogConfiguration.class;
public MXMLJSC()
{
@@ -329,7 +330,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
{
case SWF:
mxmlc = new MXMLC();
- mxmlc.configurationClass = JSGoogConfiguration.class;
+ mxmlc.configurationClass = configurationClass;
if (noLink)
result = mxmlc.mainCompileOnly(removeJSArgs(args), err);
else
@@ -805,7 +806,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
*/
public boolean configure(final String[] args)
{
- projectConfigurator = new Configurator(JSGoogConfiguration.class);
+ projectConfigurator = new Configurator(configurationClass);
try
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0f02a820/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
new file mode 100644
index 0000000..ab690e4
--- /dev/null
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
@@ -0,0 +1,407 @@
+/*
+ *
+ * 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.driver.js.goog;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.flex.compiler.clients.JSConfiguration;
+import org.apache.flex.compiler.clients.MXMLJSC;
+import org.apache.flex.compiler.config.ConfigurationValue;
+import org.apache.flex.compiler.exceptions.ConfigurationException;
+import org.apache.flex.compiler.internal.config.annotations.Arguments;
+import org.apache.flex.compiler.internal.config.annotations.Config;
+import org.apache.flex.compiler.internal.config.annotations.FlexOnly;
+import org.apache.flex.compiler.internal.config.annotations.InfiniteArguments;
+import org.apache.flex.compiler.internal.config.annotations.Mapping;
+
+/**
+ * The {@link JSGoogCompcConfiguration} class holds all compiler arguments needed for
+ * compiling ActionScript to JavaScript the 'goog' way.
+ * <p>
+ * Specific flags are implemented here for the configuration to be loaded by the
+ * configure() method of {@link MXMLJSC}.
+ * <p>
+ * This class inherits all compiler arguments from the MXMLC compiler.
+ *
+ * @author Erik de Bruin
+ */
+public class JSGoogCompcConfiguration extends JSConfiguration
+{
+ public JSGoogCompcConfiguration()
+ {
+ setDebug(true);
+ }
+
+ //
+ // 'closure-lib'
+ //
+
+ protected String closureLib = "";
+
+ public boolean isClosureLibSet() {
+ return !closureLib.isEmpty();
+ }
+
+ public String getClosureLib()
+ {
+ try
+ {
+ if (closureLib.equals(""))
+ {
+ return getAbsolutePathFromPathRelativeToMXMLC(
+ "../../js/lib/google/closure-library");
+ }
+ }
+ catch (Exception e) { /* better to try and fail... */ }
+
+ return closureLib;
+ }
+
+ @Config
+ @Mapping("closure-lib")
+ public void setClosureLib(ConfigurationValue cv, String value)
+ throws ConfigurationException
+ {
+ if (value != null)
+ closureLib = value;
+ }
+
+ //
+ // Override 'compiler.binding-value-change-event-type'
+ //
+
+ private String bindingValueChangeEventType = "valueChange";
+
+ @Override
+ public String getBindingValueChangeEventType()
+ {
+ return bindingValueChangeEventType;
+ }
+
+ @Override
+ @Config(advanced = true)
+ public void setCompilerBindingValueChangeEventType(ConfigurationValue cv, String b)
+ {
+ bindingValueChangeEventType = b;
+ }
+
+ //
+ // Override 'compiler.mxml.children-as-data'
+ //
+
+ private Boolean childrenAsData = true;
+
+ @Override
+ public Boolean getCompilerMxmlChildrenAsData()
+ {
+ return childrenAsData;
+ }
+
+ @Override
+ @Config
+ @Mapping({"compiler", "mxml", "children-as-data"})
+ @FlexOnly
+ public void setCompilerMxmlChildrenAsData(ConfigurationValue cv, Boolean asData) throws ConfigurationException
+ {
+ childrenAsData = asData;
+ }
+
+ //
+ // 'marmotinni'
+ //
+
+ private String marmotinni;
+
+ public String getMarmotinni()
+ {
+ return marmotinni;
+ }
+
+ @Config
+ @Mapping("marmotinni")
+ public void setMarmotinni(ConfigurationValue cv, String value)
+ throws ConfigurationException
+ {
+ marmotinni = value;
+ }
+
+ //
+ // 'sdk-js-lib'
+ //
+
+ protected List<String> sdkJSLib = new ArrayList<String>();
+
+ public List<String> getSDKJSLib()
+ {
+ if (sdkJSLib.size() == 0)
+ {
+ try
+ {
+ String path = getAbsolutePathFromPathRelativeToMXMLC(
+ "../../frameworks/js/FlexJS/src");
+
+ sdkJSLib.add(path);
+ }
+ catch (Exception e) { /* better to try and fail... */ }
+ }
+
+ return sdkJSLib;
+ }
+
+ @Config(allowMultiple = true)
+ @Mapping("sdk-js-lib")
+ @Arguments(Arguments.PATH_ELEMENT)
+ @InfiniteArguments
+ public void setSDKJSLib(ConfigurationValue cv, List<String> value)
+ throws ConfigurationException
+ {
+ sdkJSLib.addAll(value);
+ }
+
+ //
+ // 'external-js-lib'
+ //
+
+ private List<String> externalJSLib = new ArrayList<String>();
+
+ public List<String> getExternalJSLib()
+ {
+ return externalJSLib;
+ }
+
+ @Config(allowMultiple = true)
+ @Mapping("external-js-lib")
+ @Arguments(Arguments.PATH_ELEMENT)
+ @InfiniteArguments
+ public void setExternalJSLib(ConfigurationValue cv, List<String> value)
+ throws ConfigurationException
+ {
+ externalJSLib.addAll(value);
+ }
+
+ //
+ // 'strict-publish'
+ //
+
+ private boolean strictPublish = true;
+
+ public boolean getStrictPublish()
+ {
+ return strictPublish;
+ }
+
+ @Config
+ @Mapping("strict-publish")
+ public void setStrictPublish(ConfigurationValue cv, boolean value)
+ throws ConfigurationException
+ {
+ strictPublish = value;
+ }
+
+ //
+ // 'keep-asdoc'
+ //
+
+ private boolean keepASDoc = true;
+
+ public boolean getKeepASDoc()
+ {
+ return keepASDoc;
+ }
+
+ @Config
+ @Mapping("keep-asdoc")
+ public void setKeepASDoc(ConfigurationValue cv, boolean value)
+ throws ConfigurationException
+ {
+ keepASDoc = value;
+ }
+
+
+
+ //
+ // 'remove-circulars'
+ //
+
+ private boolean removeCirculars = false;
+
+ public boolean getRemoveCirculars()
+ {
+ return removeCirculars;
+ }
+
+ @Config
+ @Mapping("remove-circulars")
+ public void setRemoveCirculars(ConfigurationValue cv, boolean value)
+ throws ConfigurationException
+ {
+ removeCirculars = value;
+ }
+
+
+ //
+ // 'skip-transpile'
+ //
+
+ private boolean skipTranspile = false;
+
+ public boolean getSkipTranspile()
+ {
+ return skipTranspile;
+ }
+
+ @Config
+ @Mapping("skip-transpile")
+ public void setSkipTranspile(ConfigurationValue cv, boolean value)
+ throws ConfigurationException
+ {
+ skipTranspile = value;
+ }
+
+
+
+ protected 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();
+ }
+
+ //
+ // 'js-compiler-option'
+ //
+
+ protected List<String> jsCompilerOptions = new ArrayList<String>();
+
+ public List<String> getJSCompilerOptions()
+ {
+ return jsCompilerOptions;
+ }
+
+ @Config(allowMultiple = true)
+ @Mapping("js-compiler-option")
+ @Arguments("option")
+ @InfiniteArguments
+ public void setJSCompilerOptions(ConfigurationValue cv, List<String> value)
+ throws ConfigurationException
+ {
+ jsCompilerOptions.addAll(value);
+ }
+
+ //
+ // 'js-output-optimization'
+ //
+
+ protected List<String> jsOutputOptimizations = new ArrayList<String>();
+
+ public List<String> getJSOutputOptimizations()
+ {
+ return jsOutputOptimizations;
+ }
+
+ @Config(allowMultiple = true)
+ @Mapping("js-output-optimization")
+ @Arguments("optimization")
+ @InfiniteArguments
+ public void setJSOutputOptimizations(ConfigurationValue cv, List<String> value)
+ throws ConfigurationException
+ {
+ jsOutputOptimizations.addAll(value);
+ }
+
+ // 'html-template' option
+ //
+
+ private String htmlTemplateFileName = null;
+
+ public File getHtmlTemplate()
+ {
+ return htmlTemplateFileName != null ? new File(htmlTemplateFileName) : null;
+ }
+
+ /**
+ * Specify an HTML template with tokens to replace with application-specific values.
+ * If not specified a standard template is generated.
+ */
+ @Config(advanced = true)
+ @Mapping("html-template")
+ @Arguments("filename")
+ public void setHtmlTemplate(ConfigurationValue cv, String filename)
+ {
+ this.htmlTemplateFileName = getOutputPath(cv, filename);
+ }
+
+ // 'html-output-filename' option
+ //
+
+ private String htmlOutputFileName = "index.html";
+
+ public String getHtmlOutputFileName()
+ {
+ return htmlOutputFileName;
+ }
+
+ /**
+ * Specify the name of the HTML file that goes in the output folder. Default is index.html.
+ */
+ @Config(advanced = true)
+ @Mapping("html-output-filename")
+ @Arguments("filename")
+ public void setHtmlOutputFileName(ConfigurationValue cv, String filename)
+ {
+ this.htmlOutputFileName = filename;
+ }
+
+ //
+ // 'compiler.keep-code-with-metadata' option
+ //
+
+ private Set<String> keepCodeWithMetadata = null;
+
+ public Set<String> getCompilerKeepCodeWithMetadata()
+ {
+ return keepCodeWithMetadata == null ? Collections.<String> emptySet() : keepCodeWithMetadata;
+ }
+
+ @Config(advanced = true, allowMultiple = true)
+ @Mapping({ "compiler", "keep-code-with-metadata" })
+ @Arguments("name")
+ @InfiniteArguments
+ public void setCompilerKeepCodeWithMetadata(ConfigurationValue cv, List<String> values)
+ {
+ if (keepCodeWithMetadata == null)
+ keepCodeWithMetadata = new HashSet<String>();
+ keepCodeWithMetadata.addAll(values);
+ }
+
+
+}
[29/50] git commit: [flex-falcon] [refs/heads/master] - FLEX-35086 -
Update RELEASE_NOTES_JS
Posted by ah...@apache.org.
FLEX-35086 - Update RELEASE_NOTES_JS
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/96147830
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/96147830
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/96147830
Branch: refs/heads/master
Commit: 96147830f7c9fae8cc2df65f36ae855bfabb44d2
Parents: 18d9650
Author: piotrz <pi...@apache.org>
Authored: Mon May 22 08:25:02 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Mon May 22 08:25:02 2017 +0200
----------------------------------------------------------------------
RELEASE_NOTES_JX | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/96147830/RELEASE_NOTES_JX
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES_JX b/RELEASE_NOTES_JX
index 851646f..4b1fe5d 100644
--- a/RELEASE_NOTES_JX
+++ b/RELEASE_NOTES_JX
@@ -9,8 +9,13 @@ This release includes Maven artifacts.
In addition, lots of bug fixes and small improvements are included in this release.
+New Features
+=================
+-FLEX-35186 Generate source maps for MXML files
+
Bug Fixes
---------
+-FLEX-35300 Could not find file for class: Error
-FLEX-35239 Runtime error when setting a property to a constant value
-FLEX-35236 Binding is not working when [Bindable] is set for the class
-FLEX-35231 [FalconJX] Context Lost on Event Listeners
[05/50] git commit: [flex-falcon] [refs/heads/master] - fix up
appmojo after merge
Posted by ah...@apache.org.
fix up appmojo after merge
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/55d9fcf9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/55d9fcf9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/55d9fcf9
Branch: refs/heads/master
Commit: 55d9fcf989b7594a4f8e31205762ba0eedf68cae
Parents: 0f02a82
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 24 08:09:39 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 24 08:09:39 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/55d9fcf9/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
index 46f6b33..61ab8bf 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@ -82,12 +82,6 @@ public class CompileAppMojo
@Override
protected File getOutput() throws MojoExecutionException {
-<<<<<<< HEAD
-=======
- if(outputJavaScript) {
- return new File(outputDirectory, javascriptOutputDirectoryName);
- }
->>>>>>> develop
return new File(outputDirectory, flashOutputFileName);
}
[48/50] git commit: [flex-falcon] [refs/heads/master] - improve
format and wording of email
Posted by ah...@apache.org.
improve format and wording of email
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a7bcf128
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a7bcf128
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a7bcf128
Branch: refs/heads/master
Commit: a7bcf128c3701825401e9a819fd39b01a5fb075c
Parents: cf07c62
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 22 09:54:42 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 22 09:54:42 2017 -0700
----------------------------------------------------------------------
releasecandidate.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a7bcf128/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index d342419..d6c581f 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -406,7 +406,7 @@ a FlexJS SDK via Ant or the Installer.\n\
\n\
Please vote to approve this release:\n\
+1 Approve the release\n\
--1 Veto the release (please provide specific comments to why)\n\
+-1 Disapprove the release (please provide specific comments to why)\n\
\n\
This vote will be open for 72 hours or until a result can be called.\n\
\n\
@@ -435,7 +435,8 @@ package and signature files, unzipping, etc, you can instead:\n\
1) create an empty folder,\n\
2) download into that folder this file:\n\
https://dist.apache.org/repos/dist/dev/flex/falcon/${release.version}/rc${rc}/ApproveFalcon.xml\n\
-3) run the script: ant -e -f ApproveFalcon.xml -Drelease.version=${release.version} -Drc=${rc}\n\
+3) run the script:\n\
+ ant -e -f ApproveFalcon.xml -Drelease.version=${release.version} -Drc=${rc}\n\
\n\
You are not required to use this script, and more testing of the packages\n\
and build results are always encouraged.\n\
[45/50] git commit: [flex-falcon] [refs/heads/master] - fix path to
browser
Posted by ah...@apache.org.
fix path to browser
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e8e91e67
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e8e91e67
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e8e91e67
Branch: refs/heads/master
Commit: e8e91e671ffa33ec4da3c62ec1c0269354818026
Parents: fb3ef5d
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 9 14:31:08 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 9 14:31:08 2017 -0700
----------------------------------------------------------------------
releasecandidate.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e8e91e67/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 8f3fe3c..d342419 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -119,7 +119,7 @@
property="browser" value="${env.ProgramFiles}/Mozilla Firefox/firefox.exe" />
<available file="${env.ProgramFiles(x86)}/Mozilla Firefox/firefox.exe"
type="file"
- property="browser" value="${env.ProgramFiles}/Mozilla Firefox/firefox.exe" />
+ property="browser" value="${env.ProgramFiles(x86)}/Mozilla Firefox/firefox.exe" />
<available file="/Applications/Firefox.app/Contents/MacOS/firefox"
type="file"
property="browser" value="/Applications/Firefox.app/Contents/MacOS/firefox" />
[15/50] git commit: [flex-falcon] [refs/heads/master] - output
Language on a per-file basis
Posted by ah...@apache.org.
output Language on a per-file basis
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f9c92e49
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f9c92e49
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f9c92e49
Branch: refs/heads/master
Commit: f9c92e4958387ba497debf66f2b092f9a2b2eb13
Parents: 31fd9d6
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 10 22:33:33 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 10 22:33:33 2017 -0700
----------------------------------------------------------------------
.../apache/flex/compiler/internal/codegen/js/JSSessionModel.java | 2 ++
.../compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java | 3 ++-
.../apache/flex/compiler/internal/codegen/js/jx/AsIsEmitter.java | 2 +-
.../compiler/internal/codegen/js/jx/FunctionCallEmitter.java | 4 ++++
4 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f9c92e49/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java
index ca47881..3ace9e5 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java
@@ -77,6 +77,8 @@ public class JSSessionModel
}
private Stack<Context> stack = new Stack<Context>();
+ public boolean needLanguage = false;
+
public boolean isExterns = false;
public boolean inE4xFilter = false;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f9c92e49/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index 2d7b257..d07cf4f 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -215,7 +215,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
if (project instanceof FlexJSProject)
{
FlexJSProject flexJSProject = (FlexJSProject) project;
- boolean needLanguage = flexJSProject.needLanguage;
+ boolean needLanguage = getModel().needLanguage;
if (needLanguage && !foundLanguage)
{
StringBuilder appendString = new StringBuilder();
@@ -941,6 +941,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
ICompilerProject project = getWalker().getProject();;
if (project instanceof FlexJSProject)
((FlexJSProject)project).needLanguage = true;
+ getModel().needLanguage = true;
write(JSFlexJSEmitterTokens.CLOSURE_FUNCTION_NAME);
write(ASEmitterTokens.PAREN_OPEN);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f9c92e49/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AsIsEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AsIsEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AsIsEmitter.java
index c99d4d9..3260ef9 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AsIsEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AsIsEmitter.java
@@ -131,7 +131,7 @@ public class AsIsEmitter extends JSSubEmitter
ICompilerProject project = this.getProject();
if (project instanceof FlexJSProject)
((FlexJSProject)project).needLanguage = true;
-
+ getEmitter().getModel().needLanguage = true;
if (node instanceof IBinaryOperatorNode)
{
IBinaryOperatorNode binaryOperatorNode = (IBinaryOperatorNode) node;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f9c92e49/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
index d125eeb..5a8a64e 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
@@ -128,6 +128,7 @@ public class FunctionCallEmitter extends JSSubEmitter implements ISubEmitter<IFu
ICompilerProject project = this.getProject();
if (project instanceof FlexJSProject)
((FlexJSProject) project).needLanguage = true;
+ getEmitter().getModel().needLanguage = true;
write(JSFlexJSEmitterTokens.LANGUAGE_QNAME);
write(ASEmitterTokens.MEMBER_ACCESS);
if (isInt)
@@ -190,6 +191,7 @@ public class FunctionCallEmitter extends JSSubEmitter implements ISubEmitter<IFu
ICompilerProject project = this.getProject();
if (project instanceof FlexJSProject)
((FlexJSProject) project).needLanguage = true;
+ getEmitter().getModel().needLanguage = true;
startMapping(node.getNameNode());
write(JSFlexJSEmitterTokens.LANGUAGE_QNAME);
write(ASEmitterTokens.MEMBER_ACCESS);
@@ -205,6 +207,7 @@ public class FunctionCallEmitter extends JSSubEmitter implements ISubEmitter<IFu
ICompilerProject project = this.getProject();
if (project instanceof FlexJSProject)
((FlexJSProject) project).needLanguage = true;
+ getEmitter().getModel().needLanguage = true;
write(JSFlexJSEmitterTokens.LANGUAGE_QNAME);
write(ASEmitterTokens.MEMBER_ACCESS);
write("sortOn");
@@ -228,6 +231,7 @@ public class FunctionCallEmitter extends JSSubEmitter implements ISubEmitter<IFu
{
if (project instanceof FlexJSProject)
((FlexJSProject) project).needLanguage = true;
+ getEmitter().getModel().needLanguage = true;
write(JSFlexJSEmitterTokens.LANGUAGE_QNAME);
write(ASEmitterTokens.MEMBER_ACCESS);
write("sort");
[07/50] git commit: [flex-falcon] [refs/heads/master] - FLEX-35300
don't look for js files for external classes
Posted by ah...@apache.org.
FLEX-35300 don't look for js files for external classes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/37128e83
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/37128e83
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/37128e83
Branch: refs/heads/master
Commit: 37128e83d5c00e93d0b04e5b36c7ce949c573a87
Parents: 8dd7f9c
Author: Alex Harui <ah...@apache.org>
Authored: Mon May 1 17:23:33 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon May 1 17:23:33 2017 -0700
----------------------------------------------------------------------
.../flex/compiler/internal/graph/GoogDepsWriter.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/37128e83/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index b26b632..afc8d00 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -47,6 +47,7 @@ import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
import org.apache.flex.compiler.internal.projects.CompilerProject;
import org.apache.flex.compiler.internal.projects.DefinitionPriority;
import org.apache.flex.compiler.internal.projects.DependencyGraph;
+import org.apache.flex.compiler.internal.projects.FlexJSProject;
import org.apache.flex.compiler.problems.FileNotFoundProblem;
import org.apache.flex.compiler.units.ICompilationUnit;
import org.apache.flex.swc.ISWC;
@@ -354,7 +355,7 @@ public class GoogDepsWriter {
private void addDeps(String className)
{
- if (depMap.containsKey(className) || isGoogClass(className))
+ if (depMap.containsKey(className) || isGoogClass(className) || isExternal(className))
return;
// build goog dependency list
@@ -919,6 +920,15 @@ public class GoogDepsWriter {
path = path.replace('\\', '/');
return path;
}
+
+ boolean isExternal(String className)
+ {
+ ICompilationUnit cu = project.resolveQNameToCompilationUnit(className);
+ if (cu == null) return false; // unit testing
+
+ return ((FlexJSProject)project).isExternalLinkage(cu);
+ }
+
private class GoogDep
{
public String filePath;
[33/50] git commit: [flex-falcon] [refs/heads/master] - compiler-jx:
fixed issue where require() calls generated by PackageHeaderEmitter for
Node.js modules would create invalid variable names because it didn't convert
from dashes to camel case
Posted by ah...@apache.org.
compiler-jx: fixed issue where require() calls generated by PackageHeaderEmitter for Node.js modules would create invalid variable names because it didn't convert from dashes to camel case
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/5a32df89
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/5a32df89
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/5a32df89
Branch: refs/heads/master
Commit: 5a32df89de60f93f3da9dddbbd60788654eda875
Parents: 693af59
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri May 26 15:01:17 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri May 26 15:01:17 2017 -0700
----------------------------------------------------------------------
.../internal/codegen/js/jx/PackageHeaderEmitter.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5a32df89/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
index 0f1d0cd..5d2c413 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
@@ -51,6 +51,7 @@ import org.apache.flex.compiler.targets.ITarget.TargetType;
import org.apache.flex.compiler.tree.as.ITypeNode;
import org.apache.flex.compiler.units.ICompilationUnit;
import org.apache.flex.compiler.utils.NativeUtils;
+import org.apache.flex.compiler.utils.NodeJSUtils;
public class PackageHeaderEmitter extends JSSubEmitter implements
ISubEmitter<IPackageDefinition>
@@ -402,26 +403,28 @@ public class PackageHeaderEmitter extends JSSubEmitter implements
if (externalRequiresList != null)
{
Collections.sort(externalRequiresList);
- for (String imp : externalRequiresList)
+ for (String nodeJSModuleName : externalRequiresList)
{
- if (writtenRequires.indexOf(imp) == -1)
+ if (writtenRequires.indexOf(nodeJSModuleName) == -1)
{
+ String moduleVariableName = NodeJSUtils.convertFromDashesToCamelCase(nodeJSModuleName);
/* var x = require('x');\n */
+ /* var someModule = require('some-module');\n */
write(ASEmitterTokens.VAR);
write(ASEmitterTokens.SPACE);
- write(imp);
+ write(moduleVariableName);
write(ASEmitterTokens.SPACE);
write(ASEmitterTokens.EQUAL);
write(ASEmitterTokens.SPACE);
write(NodeEmitterTokens.REQUIRE);
write(ASEmitterTokens.PAREN_OPEN);
write(ASEmitterTokens.SINGLE_QUOTE);
- write(imp);
+ write(nodeJSModuleName);
write(ASEmitterTokens.SINGLE_QUOTE);
write(ASEmitterTokens.PAREN_CLOSE);
writeNewline(ASEmitterTokens.SEMICOLON);
- writtenRequires.add(imp);
+ writtenRequires.add(nodeJSModuleName);
emitsExternalRequires = true;
}
[25/50] git commit: [flex-falcon] [refs/heads/master] - compiler-jx:
fixed the -version compiler option
Posted by ah...@apache.org.
compiler-jx: fixed the -version compiler option
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/61b22833
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/61b22833
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/61b22833
Branch: refs/heads/master
Commit: 61b2283322e56eb503de7099ff7e3ce9f4ab1407
Parents: d210ac5
Author: Josh Tynjala <jo...@apache.org>
Authored: Wed May 17 09:47:43 2017 -0400
Committer: Josh Tynjala <jo...@apache.org>
Committed: Wed May 17 09:47:43 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/61b22833/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
index 135b0d3..0916598 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -41,6 +41,7 @@ import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
import org.apache.flex.compiler.codegen.js.IJSPublisher;
import org.apache.flex.compiler.codegen.js.IJSWriter;
+import org.apache.flex.compiler.common.VersionInfo;
import org.apache.flex.compiler.config.Configuration;
import org.apache.flex.compiler.config.ConfigurationBuffer;
import org.apache.flex.compiler.config.Configurator;
@@ -830,7 +831,10 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
configBuffer = projectConfigurator.getConfigurationBuffer();
if (configBuffer.getVar("version") != null) //$NON-NLS-1$
+ {
+ System.out.println(VersionInfo.buildMessage());
return false;
+ }
if (problems.hasErrors())
return false;
[22/50] git commit: [flex-falcon] [refs/heads/master] - improve FB
integration. Get a better list of source files so we can compare timestamps
so we know when to recompile. Also don't fail if just warnings. FB seemed to
keep requesting compiles when w
Posted by ah...@apache.org.
improve FB integration. Get a better list of source files so we can compare timestamps so we know when to recompile. Also don't fail if just warnings. FB seemed to keep requesting compiles when we failed with just warnings and never ask for the Report. But if you fail with errors it doesn't keep requesting compiles. Go figure
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ad8fb20e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ad8fb20e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ad8fb20e
Branch: refs/heads/master
Commit: ad8fb20ee552f44c3c717824af0da9d140ec6425
Parents: eadadca
Author: Alex Harui <ah...@apache.org>
Authored: Sun May 14 21:59:30 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun May 14 21:59:30 2017 -0700
----------------------------------------------------------------------
.../src/main/java/flex2/compiler/Source.java | 12 ++++++++++++
.../src/main/java/flex2/tools/oem/Application.java | 14 ++++++++++++--
.../main/java/flex2/tools/oem/internal/OEMReport.java | 2 +-
3 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ad8fb20e/flex-compiler-oem/src/main/java/flex2/compiler/Source.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/compiler/Source.java b/flex-compiler-oem/src/main/java/flex2/compiler/Source.java
index 91a1ce6..3869b40 100644
--- a/flex-compiler-oem/src/main/java/flex2/compiler/Source.java
+++ b/flex-compiler-oem/src/main/java/flex2/compiler/Source.java
@@ -19,6 +19,8 @@
package flex2.compiler;
+import java.io.File;
+
import flex2.compiler.io.VirtualFile;
/**
@@ -118,6 +120,16 @@ public final class Source implements Comparable<Source>
return file.getNameForReporting();
}
+ public String getSourceFileName()
+ {
+ String s = getName();
+ if (relativePath.length() > 0)
+ s += relativePath;
+ s += File.separator;
+ s += shortName;
+ return s;
+ }
+
public boolean exists()
{
return file.getLastModified() > 0;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ad8fb20e/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java
index 0d9a307..11b14aa 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java
@@ -43,6 +43,7 @@ import org.apache.flex.swf.ISWF;
import org.apache.flex.swf.types.RGB;
import flash.swf.tags.SetBackgroundColor;
+import flex2.compiler.CompilerException;
import flex2.compiler.Source;
import flex2.compiler.SourceList;
import flex2.compiler.io.FileUtil;
@@ -635,7 +636,7 @@ public class Application implements Builder
mxmljsc.noLink = true;
//int returnValue = mxmlc.mainCompileOnly(constructCommandLine2(tempOEMConfiguration.configuration), null);
int returnValue = mxmljsc.mainNoExit(constructCommandLine(oemConfiguration), null, true);
- if (returnValue == 0)
+ if (returnValue == 0 || returnValue == 2)
returnValue = OK;
else
returnValue = FAIL;
@@ -673,8 +674,10 @@ public class Application implements Builder
ApplicationCompilerConfiguration acc = ((ApplicationCompilerConfiguration)config.configuration);
sources = new ArrayList<Source>();
VirtualFile[] sourcePaths = acc.getCompilerConfiguration().getSourcePath();
+
List<String> sourceFiles = mxmljsc.getSourceList();
String mainFile = mxmljsc.getMainSource();
+ VirtualFile mainVirtualFile = null;
for (String sourceFile : sourceFiles)
{
for (VirtualFile sourcePath : sourcePaths)
@@ -689,10 +692,17 @@ public class Application implements Builder
boolean isRoot = sourceFile.equals(mainFile);
Source source = new Source(sourcePath, relPath, shortName, null, false, isRoot);
sources.add(source);
- break;
+ if (pathName.equals(mainFile))
+ mainVirtualFile = sourcePath;
}
}
}
+ try {
+ sourceList = new SourceList(new ArrayList<VirtualFile>(), sourcePaths, mainVirtualFile, new String[0]);
+ } catch (CompilerException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ }
ProblemQuery pq = mxmljsc.getProblemQuery();
List<ICompilerProblem> probs = pq.getProblems();
for (ICompilerProblem prob : probs)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ad8fb20e/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMReport.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMReport.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMReport.java
index 21b1d73..e628e08 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMReport.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMReport.java
@@ -530,7 +530,7 @@ public class OEMReport implements Report
// use this version for now
for (Source s : sources)
{
- sourceNames.add(s.getName());
+ sourceNames.add(s.getSourceFileName());
}
/*
// AJH not sure why all this is needed
[49/50] git commit: [flex-falcon] [refs/heads/master] - fix release
target
Posted by ah...@apache.org.
fix release target
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4d1cff92
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4d1cff92
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4d1cff92
Branch: refs/heads/master
Commit: 4d1cff9255b9a35ebd5bbae7f5d050e9403cba6e
Parents: a7bcf12
Author: Alex Harui <ah...@apache.org>
Authored: Sun Jun 25 23:27:31 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Jun 25 23:27:31 2017 -0700
----------------------------------------------------------------------
releasecandidate.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4d1cff92/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index d6c581f..d9fafda 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -475,7 +475,7 @@ ${my.name}
<arg value="${dist.dev}/flex/falcon/${release.version}/rc${rc}" />
<arg value="${dist.release}/flex/falcon/${release.version}" />
</exec>
- <exec executable="${svn}" dir="${dist.release}/flex/falcon" failonerror="true" >
+ <exec executable="${svn}" dir="${dist.release}/.." failonerror="true" >
<arg value="commit" />
<arg value="--username" />
<arg value="${apache.username}" />
[04/50] git commit: [flex-falcon] [refs/heads/master] - hashmaps
iterate in different orders on different Java versions,
so sort the list so tests will ass
Posted by ah...@apache.org.
hashmaps iterate in different orders on different Java versions, so sort the list so tests will ass
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7137de6b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7137de6b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7137de6b
Branch: refs/heads/master
Commit: 7137de6b19cd11630ee1ef29f7a9164166e35b10
Parents: 3f9ed83
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 24 00:17:35 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 24 00:17:35 2017 -0700
----------------------------------------------------------------------
.../compiler/internal/codegen/js/jx/PackageHeaderEmitter.java | 6 ++++++
.../compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7137de6b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
index 5c9c91c..0f1d0cd 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
@@ -154,8 +154,14 @@ public class PackageHeaderEmitter extends JSSubEmitter implements
HashMap<String, String> internalClasses = getEmitter().getModel().getInternalClasses();
if (internalClasses.size() > 0)
{
+ ArrayList<String> classesInOrder = new ArrayList<String>();
for (String internalClass : internalClasses.keySet())
{
+ classesInOrder.add(internalClass);
+ }
+ Collections.sort(classesInOrder);
+ for (String internalClass : classesInOrder)
+ {
/* goog.provide('x');\n\n */
write(JSGoogEmitterTokens.GOOG_PROVIDE);
write(ASEmitterTokens.PAREN_OPEN);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7137de6b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
index 01932d0..f9afc81 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
@@ -1000,8 +1000,8 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
- "goog.provide('foo.bar.baz.A.InternalClass');\n" +
"goog.provide('foo.bar.baz.A.ITestInterface');\n" +
+ "goog.provide('foo.bar.baz.A.InternalClass');\n" +
"\n" +
"\n" +
"\n" +
[36/50] git commit: [flex-falcon] [refs/heads/master] - remove
org.json dependency
Posted by ah...@apache.org.
remove org.json dependency
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3e8c099a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3e8c099a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3e8c099a
Branch: refs/heads/master
Commit: 3e8c099a095c345b7a68c165f7e7f59ef2688ed5
Parents: 530dfed
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 30 12:48:18 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 30 12:49:49 2017 -0700
----------------------------------------------------------------------
compiler-jx/.classpath | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3e8c099a/compiler-jx/.classpath
----------------------------------------------------------------------
diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath
index d249dbd..79c17cd 100644
--- a/compiler-jx/.classpath
+++ b/compiler-jx/.classpath
@@ -9,7 +9,6 @@
<classpathentry kind="lib" path="lib/google/closure-compiler/compiler.jar"/>
<classpathentry kind="lib" path="lib/commons-io.jar"/>
<classpathentry kind="lib" path="lib/args4j.jar"/>
- <classpathentry kind="lib" path="lib/org.json.jar"/>
<classpathentry kind="lib" path="lib/guava.jar"/>
<classpathentry kind="lib" path="lib/flex-tool-api.jar"/>
<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
[42/50] git commit: [flex-falcon] [refs/heads/master] - test commit
Posted by ah...@apache.org.
test commit
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ed360672
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ed360672
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ed360672
Branch: refs/heads/master
Commit: ed360672c872faeb2121b03577137fc24ac3312f
Parents: 78e8514
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 8 20:55:13 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 8 20:55:13 2017 -0700
----------------------------------------------------------------------
build.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ed360672/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c6df1c3..5a55219 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" ?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
[39/50] git commit: [flex-falcon] [refs/heads/master] - FLEX-35323
compiler: fixed issue in BindingDestinationMaker where setting a dynmaic
property with binding would result in a NullPointerException.
Posted by ah...@apache.org.
FLEX-35323 compiler: fixed issue in BindingDestinationMaker where setting a dynmaic property with binding would result in a NullPointerException.
Dynamic properties are public, and the InstructionList is only created for non-public properties. We can simply check that the definition is null or not to fix this issue.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/57a56977
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/57a56977
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/57a56977
Branch: refs/heads/master
Commit: 57a56977f5f75fb8c41144cf035d78eadd9a75d0
Parents: 74d1487
Author: Josh Tynjala <jo...@apache.org>
Authored: Wed Jun 7 09:36:13 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Wed Jun 7 09:36:13 2017 -0700
----------------------------------------------------------------------
.../databinding/BindingDestinationMaker.java | 21 ++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/57a56977/compiler/src/main/java/org/apache/flex/compiler/internal/codegen/databinding/BindingDestinationMaker.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/codegen/databinding/BindingDestinationMaker.java b/compiler/src/main/java/org/apache/flex/compiler/internal/codegen/databinding/BindingDestinationMaker.java
index 0e78d5d..89ad6a2 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/codegen/databinding/BindingDestinationMaker.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/codegen/databinding/BindingDestinationMaker.java
@@ -128,15 +128,20 @@ public class BindingDestinationMaker
{
IMXMLPropertySpecifierNode psn = (IMXMLPropertySpecifierNode)parent;
IDefinition d = psn.getDefinition();
- Binding b = host.getInstanceScope().getBinding(d);
- INamespaceReference ns = psn.getDefinition().getNamespaceReference();
- if (ns != NamespaceDefinition.getPublicNamespaceDefinition())
+ //it's possible for the definition to be null if we're dealing with
+ //a dynamic property on a class like Object -JT
+ if (d != null)
{
- InstructionList insns = new InstructionList();
- insns.addInstruction(OP_getlocal0);
- insns.addInstruction(OP_getlocal1);
- insns.addInstruction(OP_setproperty, b.getName());
- ret = new InstructionListNode(insns); // Wrap the IL in a node and return it
+ Binding b = host.getInstanceScope().getBinding(d);
+ INamespaceReference ns = d.getNamespaceReference();
+ if (ns != NamespaceDefinition.getPublicNamespaceDefinition())
+ {
+ InstructionList insns = new InstructionList();
+ insns.addInstruction(OP_getlocal0);
+ insns.addInstruction(OP_getlocal1);
+ insns.addInstruction(OP_setproperty, b.getName());
+ ret = new InstructionListNode(insns); // Wrap the IL in a node and return it
+ }
}
}
return ret;
[21/50] git commit: [flex-falcon] [refs/heads/master] - don't fail if
just warnings
Posted by ah...@apache.org.
don't fail if just 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/eadadcae
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/eadadcae
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/eadadcae
Branch: refs/heads/master
Commit: eadadcae8874aeade4369c8d58b7c1807eb29c76
Parents: 8122f9f
Author: Alex Harui <ah...@apache.org>
Authored: Sun May 14 21:56:20 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun May 14 21:56:20 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/flex/compiler/clients/MXMLJSC.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/eadadcae/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
index 795466e..135b0d3 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -335,7 +335,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
result = mxmlc.mainCompileOnly(removeJSArgs(args), err);
else
result = mxmlc.mainNoExit(removeJSArgs(args));
- if (result != 0)
+ if (result != 0 && result != 2)
{
problems.addAll(mxmlc.problems.getProblems());
break targetloop;
@@ -345,7 +345,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
MXMLJSCFlex flex = new MXMLJSCFlex();
lastCompiler = flex;
result = flex.mainNoExit(removeASArgs(args), problems.getProblems(), false);
- if (result != 0)
+ if (result != 0 && result != 2)
{
break targetloop;
}
@@ -354,7 +354,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
MXMLJSCFlexCordova flexCordova = new MXMLJSCFlexCordova();
lastCompiler = flexCordova;
result = flexCordova.mainNoExit(removeASArgs(args), problems.getProblems(), false);
- if (result != 0)
+ if (result != 0 && result != 2)
{
break targetloop;
}
@@ -363,7 +363,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
MXMLJSCNode node = new MXMLJSCNode();
lastCompiler = node;
result = node.mainNoExit(removeASArgs(args), problems.getProblems(), false);
- if (result != 0)
+ if (result != 0 && result != 2)
{
break targetloop;
}
@@ -372,7 +372,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
MXMLJSCNative jsc = new MXMLJSCNative();
lastCompiler = jsc;
result = jsc.mainNoExit(removeASArgs(args), problems.getProblems(), false);
- if (result != 0)
+ if (result != 0 && result != 2)
{
break targetloop;
}
[34/50] git commit: [flex-falcon] [refs/heads/master] - compiler-jx:
added JSNodeModule to JSTargetType
Posted by ah...@apache.org.
compiler-jx: added JSNodeModule to JSTargetType
JSNode exports a standalone script that may be run directly by Node.js. JSNodeModule exports a CommonJS module that may be imported into Node with require().
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/530dfed2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/530dfed2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/530dfed2
Branch: refs/heads/master
Commit: 530dfed2fa1cf026bdf6352cab40c6d0b8de44f9
Parents: 5a32df8
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri May 26 16:29:21 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri May 26 16:29:21 2017 -0700
----------------------------------------------------------------------
.../apache/flex/compiler/clients/MXMLJSC.java | 31 +++++++++----
.../flex/compiler/clients/MXMLJSCNode.java | 8 +++-
.../compiler/clients/MXMLJSCNodeModule.java | 30 +++++++++++++
.../internal/codegen/js/node/NodePublisher.java | 17 +++++--
.../driver/js/node/NodeModuleBackend.java | 47 ++++++++++++++++++++
5 files changed, 119 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/530dfed2/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
index 1f14259..1c72e74 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -149,8 +149,12 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
SWF("SWF"),
JS_FLEX("JSFlex"),
JS_FLEX_CORDOVA("JSFlexCordova"),
+ //JS without the FlexJS framework
JS_NATIVE("JS"),
- JS_NODE("JSNode");
+ //Node.js application
+ JS_NODE("JSNode"),
+ //Node.js module
+ JS_NODE_MODULE("JSNodeModule");
private String text;
@@ -361,14 +365,23 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
}
break;
case JS_NODE:
- MXMLJSCNode node = new MXMLJSCNode();
- lastCompiler = node;
- result = node.mainNoExit(removeASArgs(args), problems.getProblems(), false);
- if (result != 0 && result != 2)
- {
- break targetloop;
- }
- break;
+ MXMLJSCNode node = new MXMLJSCNode();
+ lastCompiler = node;
+ result = node.mainNoExit(removeASArgs(args), problems.getProblems(), false);
+ if (result != 0 && result != 2)
+ {
+ break targetloop;
+ }
+ break;
+ case JS_NODE_MODULE:
+ MXMLJSCNodeModule nodeModule = new MXMLJSCNodeModule();
+ lastCompiler = nodeModule;
+ result = nodeModule.mainNoExit(removeASArgs(args), problems.getProblems(), false);
+ if (result != 0 && result != 2)
+ {
+ break targetloop;
+ }
+ break;
case JS_NATIVE:
MXMLJSCNative jsc = new MXMLJSCNative();
lastCompiler = jsc;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/530dfed2/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java
index 49a4013..6ae1999 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java
@@ -174,10 +174,14 @@ public class MXMLJSCNode implements JSCompilerEntryPoint, ProblemQueryProvider,
protected ITargetSettings targetSettings;
protected IJSApplication jsTarget;
private IJSPublisher jsPublisher;
-
+
public MXMLJSCNode()
{
- IBackend backend = new NodeBackend();
+ this(new NodeBackend());
+ }
+
+ protected MXMLJSCNode(IBackend backend)
+ {
workspace = new Workspace();
workspace.setASDocDelegate(new FlexJSASDocDelegate());
project = new FlexJSProject(workspace, backend);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/530dfed2/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNodeModule.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNodeModule.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNodeModule.java
new file mode 100644
index 0000000..7b65fc1
--- /dev/null
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNodeModule.java
@@ -0,0 +1,30 @@
+/*
+ *
+ * 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.clients;
+
+import org.apache.flex.compiler.internal.driver.js.node.NodeModuleBackend;
+
+public class MXMLJSCNodeModule extends MXMLJSCNode
+{
+ public MXMLJSCNodeModule()
+ {
+ super(new NodeModuleBackend());
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/530dfed2/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/node/NodePublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/node/NodePublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/node/NodePublisher.java
index 4d0747c..4a74a65 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/node/NodePublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/node/NodePublisher.java
@@ -29,6 +29,8 @@ import java.util.List;
public class NodePublisher extends JSCPublisher
{
+ public boolean exportModule = false;
+
public NodePublisher(Configuration config, FlexJSProject project)
{
super(project, config);
@@ -63,9 +65,18 @@ public class NodePublisher extends JSCPublisher
protected String getTemplateBody(String projectName)
{
StringBuilder bodyJS = new StringBuilder();
- bodyJS.append("new ");
- bodyJS.append(projectName);
- bodyJS.append("();");
+ if (exportModule)
+ {
+ bodyJS.append("module.exports = ");
+ bodyJS.append(projectName);
+ bodyJS.append(";");
+ }
+ else
+ {
+ bodyJS.append("new ");
+ bodyJS.append(projectName);
+ bodyJS.append("();");
+ }
return bodyJS.toString();
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/530dfed2/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/node/NodeModuleBackend.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/node/NodeModuleBackend.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/node/NodeModuleBackend.java
new file mode 100644
index 0000000..8968894
--- /dev/null
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/node/NodeModuleBackend.java
@@ -0,0 +1,47 @@
+/*
+ *
+ * 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.driver.js.node;
+
+import java.util.List;
+
+import org.apache.flex.compiler.config.Configuration;
+import org.apache.flex.compiler.driver.IBackend;
+import org.apache.flex.compiler.internal.codegen.js.node.NodePublisher;
+import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSPublisher;
+import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend;
+import org.apache.flex.compiler.internal.projects.FlexJSProject;
+import org.apache.flex.compiler.problems.ICompilerProblem;
+
+/**
+ * A concrete implementation of the {@link IBackend} API for Node.js modules.
+ *
+ * @author Josh Tynjala
+ */
+public class NodeModuleBackend extends JSCBackend
+{
+ @Override
+ public MXMLFlexJSPublisher createPublisher(FlexJSProject project,
+ List<ICompilerProblem> errors, Configuration config)
+ {
+ NodePublisher publisher = new NodePublisher(config, project);
+ publisher.exportModule = true;
+ return publisher;
+ }
+}
[06/50] git commit: [flex-falcon] [refs/heads/master] - Merge branch
'develop' into dual
Posted by ah...@apache.org.
Merge branch 'develop' into dual
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8dd7f9c3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8dd7f9c3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8dd7f9c3
Branch: refs/heads/master
Commit: 8dd7f9c3064ac929440c02f631366d41920a43cc
Parents: 55d9fcf 7137de6
Author: Alex Harui <ah...@apache.org>
Authored: Sun Apr 30 19:57:52 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Apr 30 19:57:52 2017 -0700
----------------------------------------------------------------------
.../codegen/js/flexjs/JSFlexJSEmitter.java | 2 +-
.../codegen/js/jx/PackageHeaderEmitter.java | 24 ++++++++++++++++++++
.../compiler/internal/graph/GoogDepsWriter.java | 15 +++++++++++-
.../apache/flex/compiler/utils/NativeUtils.java | 1 +
.../codegen/js/flexjs/TestFlexJSPackage.java | 8 +++++++
.../projects/internal/MainClass_result.js | 1 +
.../semantics/MethodBodySemanticChecker.java | 11 +++++----
.../internal/tree/as/ExpressionNodeBase.java | 6 +++++
8 files changed, 61 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8dd7f9c3/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
[11/50] git commit: [flex-falcon] [refs/heads/master] - compiler-jx:
source map directive is output for MXML files
Posted by ah...@apache.org.
compiler-jx: source map directive is output for MXML files
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3afd5d4f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3afd5d4f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3afd5d4f
Branch: refs/heads/master
Commit: 3afd5d4f29b57843dc6716bc812df2b9bf6ba6d1
Parents: faec4e0
Author: Josh Tynjala <jo...@apache.org>
Authored: Mon May 8 15:54:57 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Mon May 8 15:54:57 2017 -0700
----------------------------------------------------------------------
.../codegen/mxml/flexjs/IMXMLFlexJSEmitter.java | 4 ++--
.../codegen/js/jx/SourceMapDirectiveEmitter.java | 14 +++++++++++++-
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 11 +++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3afd5d4f/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
index 333aa00..3c899c4 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
@@ -22,6 +22,7 @@ package org.apache.flex.compiler.codegen.mxml.flexjs;
import java.io.Writer;
import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
+import org.apache.flex.compiler.tree.as.ITypeNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.visitor.IASNodeStrategy;
@@ -33,7 +34,6 @@ import org.apache.flex.compiler.visitor.IASNodeStrategy;
*/
public interface IMXMLFlexJSEmitter extends IMXMLEmitter
{
-
void emitDocument(IMXMLDocumentNode node);
-
+ void emitSourceMapDirective(ITypeNode node);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3afd5d4f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java
index 14674de..4bf158f 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java
@@ -25,11 +25,17 @@ import org.apache.flex.compiler.codegen.js.IJSEmitter;
import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
import org.apache.flex.compiler.internal.projects.FlexJSProject;
import org.apache.flex.compiler.tree.as.ITypeNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.visitor.IBlockWalker;
public class SourceMapDirectiveEmitter extends JSSubEmitter implements
ISubEmitter<ITypeNode>
{
+ private static final String SOURCE_MAP_PREFIX = "//# sourceMappingURL=./";
+ private static final String EXTENSION_JS = ".js";
+ private static final String EXTENSION_MXML = ".mxml";
+ private static final String EXTENSION_MAP = ".map";
+
public SourceMapDirectiveEmitter(IJSEmitter emitter)
{
super(emitter);
@@ -53,8 +59,14 @@ public class SourceMapDirectiveEmitter extends JSSubEmitter implements
if (sourceMap)
{
+ String name = node.getName() + EXTENSION_JS;
+ if (node instanceof IMXMLDocumentNode)
+ {
+ IMXMLDocumentNode mxmlNode = (IMXMLDocumentNode) node;
+ name = mxmlNode.getFileNode().getName() + EXTENSION_MXML;
+ }
writeNewline();
- write("//# sourceMappingURL=./" + node.getName() + ".js.map");
+ write(SOURCE_MAP_PREFIX + name + EXTENSION_MAP);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3afd5d4f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 0fbf7ac..e41daf8 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -35,6 +35,7 @@ import org.apache.flex.abc.semantics.Name;
import org.apache.flex.abc.semantics.Namespace;
import org.apache.flex.compiler.codegen.IEmitterTokens;
import org.apache.flex.compiler.codegen.as.IASEmitter;
+import org.apache.flex.compiler.codegen.js.IJSEmitter;
import org.apache.flex.compiler.codegen.js.IMappingEmitter;
import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLFlexJSEmitter;
import org.apache.flex.compiler.common.ASModifier;
@@ -576,6 +577,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
emitBindingData(cname, cdef);
emitMetaData(cdef);
+
+ emitSourceMapDirective(node);
}
public void emitSubDocument(IMXMLComponentNode node)
@@ -684,6 +687,14 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
metadataNodes.add(node);
}
+ @Override
+ public void emitSourceMapDirective(ITypeNode node)
+ {
+ IMXMLBlockWalker walker = (IMXMLBlockWalker) getMXMLWalker();
+ IJSEmitter jsEmitter = (IJSEmitter) walker.getASEmitter();
+ jsEmitter.emitSourceMapDirective(node);
+ }
+
//--------------------------------------------------------------------------
protected void emitClassDeclStart(String cname, String baseClassName,
[24/50] git commit: [flex-falcon] [refs/heads/master] - revert
appending library-path to js-library-path and swc-library-path
Posted by ah...@apache.org.
revert appending library-path to js-library-path and swc-library-path
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d210ac57
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d210ac57
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d210ac57
Branch: refs/heads/master
Commit: d210ac57c1a2d3bd8f87c664d8453fdc702c623c
Parents: 55ca0b2
Author: Alex Harui <ah...@apache.org>
Authored: Mon May 15 15:12:46 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon May 15 15:12:46 2017 -0700
----------------------------------------------------------------------
.../flex/compiler/internal/projects/FlexJSProject.java | 10 ++++++----
.../flex/compiler/internal/projects/FlexProject.java | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d210ac57/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index a726d38..8dc88b0 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -392,8 +392,9 @@ public class FlexJSProject extends FlexProject
public List<String> getCompilerExternalLibraryPath(Configuration config)
{
List<String> list = ((JSConfiguration)config).getCompilerJsExternalLibraryPath();
- list.addAll(config.getCompilerExternalLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerExternalLibraryPath();
}
/**
@@ -402,8 +403,9 @@ public class FlexJSProject extends FlexProject
public List<String> getCompilerLibraryPath(Configuration config)
{
List<String> list = ((JSConfiguration)config).getCompilerJsLibraryPath();
- list.addAll(config.getCompilerLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerLibraryPath();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d210ac57/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
index b01eed5..6a8ffd9 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
@@ -2340,8 +2340,9 @@ public class FlexProject extends ASProject implements IFlexProject
public List<String> getCompilerExternalLibraryPath(Configuration config)
{
List<String> list = config.getCompilerSwfExternalLibraryPath();
- list.addAll(config.getCompilerExternalLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerExternalLibraryPath();
}
/**
@@ -2350,8 +2351,9 @@ public class FlexProject extends ASProject implements IFlexProject
public List<String> getCompilerLibraryPath(Configuration config)
{
List<String> list = config.getCompilerSwfLibraryPath();
- list.addAll(config.getCompilerLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerLibraryPath();
}
/**
[09/50] git commit: [flex-falcon] [refs/heads/master] - try to get
type of exception in output
Posted by ah...@apache.org.
try to get type of exception in output
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8511fac4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8511fac4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8511fac4
Branch: refs/heads/master
Commit: 8511fac4e5f0d6d249bb9e177bfec9145fc9ff90
Parents: fae10ea
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 3 21:45:01 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 3 21:45:01 2017 -0700
----------------------------------------------------------------------
.../flex/compiler/problems/InternalCompilerProblem.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8511fac4/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java b/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java
index bd1318b..2bf0ed9 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java
@@ -32,11 +32,16 @@ public class InternalCompilerProblem extends CompilerProblem {
public InternalCompilerProblem(Exception exception)
{
- this(exception.getStackTrace());
+ this(exception.toString(), exception.getStackTrace());
}
public InternalCompilerProblem(StackTraceElement[] stackTraceElements)
{
+ this("", stackTraceElements);
+ }
+
+ public InternalCompilerProblem(String message, StackTraceElement[] stackTraceElements)
+ {
super();
// Save off the stack trace from the exception/throwable
if(stackTraceElements != null) {
@@ -44,7 +49,7 @@ public class InternalCompilerProblem extends CompilerProblem {
for (StackTraceElement stackTraceElement : stackTraceElements) {
stacktraceBuilder.append(stackTraceElement.toString());
}
- this.stackTrace = stacktraceBuilder.toString();
+ this.stackTrace = message + " " + stacktraceBuilder.toString();
} else {
this.stackTrace = null;
}
[35/50] git commit: [flex-falcon] [refs/heads/master] - report error
instead of NPE if namespace isn't right
Posted by ah...@apache.org.
report error instead of NPE if namespace isn't right
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2f5a3751
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2f5a3751
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2f5a3751
Branch: refs/heads/master
Commit: 2f5a3751c54e0ef6d3dccd02de57941c0f0700c7
Parents: 3e8c099
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 30 12:49:06 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 30 12:49:49 2017 -0700
----------------------------------------------------------------------
.../flex/compiler/internal/definitions/AccessorDefinition.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2f5a3751/compiler/src/main/java/org/apache/flex/compiler/internal/definitions/AccessorDefinition.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/definitions/AccessorDefinition.java b/compiler/src/main/java/org/apache/flex/compiler/internal/definitions/AccessorDefinition.java
index aadd143..575580e 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/definitions/AccessorDefinition.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/definitions/AccessorDefinition.java
@@ -31,6 +31,7 @@ import org.apache.flex.compiler.definitions.IInterfaceDefinition;
import org.apache.flex.compiler.definitions.INamespaceDefinition;
import org.apache.flex.compiler.definitions.IPackageDefinition;
import org.apache.flex.compiler.definitions.ISetterDefinition;
+import org.apache.flex.compiler.problems.UnresolvedNamespaceProblem;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.scopes.IDefinitionSet;
import org.apache.flex.compiler.tree.as.IVariableNode;
@@ -163,6 +164,11 @@ public abstract class AccessorDefinition extends FunctionDefinition implements I
{
INamespaceReference testDefRef = definition.getNamespaceReference();
INamespaceDefinition testNamespaceDef = testDefRef.resolveNamespaceReference(project);
+ if (testNamespaceDef == null)
+ {
+ project.getProblems().add(new UnresolvedNamespaceProblem(definition.getNode()));
+ return null;
+ }
final boolean testBindable = ((NamespaceDefinition)testNamespaceDef).getAETNamespace().getName().equals(
BindableHelper.bindableNamespaceDefinition.getAETNamespace().getName());
/* aharui: namespaces shouldn't have to match. A subclass may only override
[20/50] git commit: [flex-falcon] [refs/heads/master] - update SWF
product info version
Posted by ah...@apache.org.
update SWF product info version
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8122f9f5
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8122f9f5
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8122f9f5
Branch: refs/heads/master
Commit: 8122f9f5c5829195a13601b1f2fdd9b9a0605354
Parents: 9a95845
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 11 11:51:41 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 11 11:51:41 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/flex/compiler/common/VersionInfo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8122f9f5/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java b/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java
index 99a4194..8fadbd9 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java
@@ -31,8 +31,8 @@ import org.apache.flex.utils.Trace;
*/
public class VersionInfo
{
- public static final String FLEX_MAJOR_VERSION = "4";
- public static final String FLEX_MINOR_VERSION = "7";
+ public static final String FLEX_MAJOR_VERSION = "0";
+ public static final String FLEX_MINOR_VERSION = "8";
public static final String FLEX_NANO_VERSION = "0";
/**
[40/50] git commit: [flex-falcon] [refs/heads/master] - updated
release notes for fixed issue
Posted by ah...@apache.org.
updated release notes for fixed issue
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/833705e0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/833705e0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/833705e0
Branch: refs/heads/master
Commit: 833705e09c0e7fb9c657dfb14eb4cfe95b2cf370
Parents: 57a5697
Author: Josh Tynjala <jo...@apache.org>
Authored: Wed Jun 7 09:38:52 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Wed Jun 7 09:38:52 2017 -0700
----------------------------------------------------------------------
RELEASE_NOTES_JX | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/833705e0/RELEASE_NOTES_JX
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES_JX b/RELEASE_NOTES_JX
index 968c8ca..f683ea8 100644
--- a/RELEASE_NOTES_JX
+++ b/RELEASE_NOTES_JX
@@ -15,6 +15,7 @@ New Features
Bug Fixes
---------
+-FLEX-35323 NullPointerException when setting property of <fx:Object/> with binding
-FLEX-35317 Generated require() call for Node.js modules does not produce valid code if module name includes dashes
-FLEX-35316 -version compiler option does not show version
-FLEX-35300 Could not find file for class: Error
[19/50] git commit: [flex-falcon] [refs/heads/master] - update
copyright year
Posted by ah...@apache.org.
update copyright year
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9a95845b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9a95845b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9a95845b
Branch: refs/heads/master
Commit: 9a95845b6f84d37fff09185dd83200c56bdbd879
Parents: e485eee
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 11 11:35:41 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 11 11:35:41 2017 -0700
----------------------------------------------------------------------
NOTICE | 2 +-
NOTICE.base | 2 +-
NOTICE.fdb | 2 +-
NOTICE.jx | 2 +-
NOTICE.oem | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_da.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_de.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_en.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_es.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_fi.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_fr.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_it.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_ja.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_ko.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_nb.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_nl.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_pt.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_ru.properties | 2 +-
.../src/main/resources/flex/tools/debugger/cli/fdb_sv.properties | 2 +-
.../main/resources/flex/tools/debugger/cli/fdb_zh_CN.properties | 2 +-
.../main/resources/flex/tools/debugger/cli/fdb_zh_TW.properties | 2 +-
21 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index e9ed444..2f34c3b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Flex Compiler
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/NOTICE.base
----------------------------------------------------------------------
diff --git a/NOTICE.base b/NOTICE.base
index 4afe0a6..5a27857 100644
--- a/NOTICE.base
+++ b/NOTICE.base
@@ -1,5 +1,5 @@
Apache Flex Compiler
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/NOTICE.fdb
----------------------------------------------------------------------
diff --git a/NOTICE.fdb b/NOTICE.fdb
index a58ab89..4962b1c 100644
--- a/NOTICE.fdb
+++ b/NOTICE.fdb
@@ -1,5 +1,5 @@
Apache Flex Debugger
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/NOTICE.jx
----------------------------------------------------------------------
diff --git a/NOTICE.jx b/NOTICE.jx
index a833bf3..9f7bf65 100644
--- a/NOTICE.jx
+++ b/NOTICE.jx
@@ -1,5 +1,5 @@
Apache Flex Cross-Compiler
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/NOTICE.oem
----------------------------------------------------------------------
diff --git a/NOTICE.oem b/NOTICE.oem
index 8240a10..735b898 100644
--- a/NOTICE.oem
+++ b/NOTICE.oem
@@ -1,5 +1,5 @@
Apache Flex Compiler
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_da.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_da.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_da.properties
index 210b0c7..a8a07c6 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_da.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_da.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Afspilleren reagerede ikke som forventet p\u00e5 kommandoen; kommandoen er afbrudt.
notSuspendedException=Kommandoen kan ikke afgives mens afspilleren k\u00f8rer
illegalStateException=Kommandoen fungerer ikke uden for en session.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_de.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_de.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_de.properties
index 95caf4a..4015eda 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_de.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_de.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [Build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Der Player hat nicht wie erwartet auf den Befehl reagiert; der Befehl wird abgebrochen.
notSuspendedException=Der Befehl kann nicht ausgestellt werden, w\u00e4hrend der Player ausgef\u00fchrt wird
illegalStateException=Der Befehl ist ohne Sitzung nicht zul\u00e4ssig.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_en.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_en.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_en.properties
index 60da901..4635cd0 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_en.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_en.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Player did not respond to the command as expected; command aborted.
notSuspendedException=Command cannot be issued while Player is running
illegalStateException=Command not valid without a session.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_es.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_es.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_es.properties
index 284d3ca..9265038 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_es.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_es.properties
@@ -28,7 +28,7 @@
defaultBuildName=desarrollo
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=El reproductor no respondi\u00f3 al comando como se esperaba; se cancel\u00f3 el comando.
notSuspendedException=No puede emitirse el comando mientras el reproductor se est\u00e1 ejecutando.
illegalStateException=El comando no es v\u00e1lido sin una sesi\u00f3n.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fi.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fi.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fi.properties
index b35aa24..83c685a 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fi.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fi.properties
@@ -28,7 +28,7 @@
defaultBuildName=kehitys
about=Apache fdb (Flash Player Debugger) [versio ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Soitin ei vastannut komentoon odotetulla tavalla. Komento keskeytettiin.
notSuspendedException=Komentoa ei voi antaa, kun soitin on k\u00e4ynniss\u00e4
illegalStateException=Komento ei kelpaa ilman istuntoa.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fr.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fr.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fr.properties
index 1fc316f..bfaedd2 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fr.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_fr.properties
@@ -28,7 +28,7 @@
defaultBuildName=d\u00e9veloppement
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Le lecteur n'a pas r\u00e9pondu \u00e0 la commande comme pr\u00e9vu ; commande annul\u00e9e.
notSuspendedException=Impossible d'\u00e9mettre la commande lorsque le lecteur est en cours d'ex\u00e9cution
illegalStateException=Commande incorrecte sans session.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_it.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_it.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_it.properties
index 5ad1431..1860937 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_it.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_it.properties
@@ -28,7 +28,7 @@
defaultBuildName=sviluppo
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Player non ha risposto al comando come previsto. Comando terminato.
notSuspendedException=Impossibile inviare il comando mentre Player \u00e8 in esecuzione
illegalStateException=Comando non valido senza una sessione.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ja.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ja.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ja.properties
index 0c3f39e..45381f5 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ja.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ja.properties
@@ -28,7 +28,7 @@
defaultBuildName=development
about=Apache fdb (Flash Player Debugger) [\u30d3\u30eb\u30c9 ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Player \u304c\u30b3\u30de\u30f3\u30c9\u306b\u5bfe\u3057\u3066\u4e88\u671f\u3055\u308c\u305f\u5fdc\u7b54\u3092\u3057\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u30b3\u30de\u30f3\u30c9\u51e6\u7406\u306f\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f\u3002
notSuspendedException=Player \u306e\u5b9f\u884c\u4e2d\u306b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
illegalStateException=\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u78ba\u7acb\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u3001\u30b3\u30de\u30f3\u30c9\u306f\u7121\u52b9\u3067\u3059\u3002
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ko.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ko.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ko.properties
index 380c0bb..eec05cf 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ko.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ko.properties
@@ -28,7 +28,7 @@
defaultBuildName=\uac1c\ubc1c
about=Apache fdb(Flash Player Debugger) [\ube4c\ub4dc ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=\ud50c\ub808\uc774\uc5b4\uac00 \uc608\uc0c1\ub300\ub85c \uba85\ub839\uc5d0 \uc751\ub2f5\ud558\uc9c0 \uc54a\uc544 \uba85\ub839\uc774 \uc911\ub2e8\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
notSuspendedException=\ud50c\ub808\uc774\uc5b4 \uc2e4\ud589 \uc911\uc5d0 \uba85\ub839\uc744 \uc218\ud589\ud560 \uc218 \uc5c6\uc74c
illegalStateException=\uc138\uc158\uc774 \uc5c6\uc73c\uba74 \uba85\ub839\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nb.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nb.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nb.properties
index 32726a3..6fe465a 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nb.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nb.properties
@@ -28,7 +28,7 @@
defaultBuildName=utvikling
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Spilleren reagerte ikke som forventet p\u00e5 kommandoen. Kommando ble avbrutt.
notSuspendedException=Kommandoen kan ikke gis mens spilleren kj\u00f8rer
illegalStateException=Kommandoen er ikke gyldig uten en \u00f8kt.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nl.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nl.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nl.properties
index 204f541..936e473 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nl.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_nl.properties
@@ -28,7 +28,7 @@
defaultBuildName=ontwikkeling
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Player heeft op onverwachte wijze gereageerd op de opdracht; opdracht afgebroken.
notSuspendedException=Kan opdracht niet uitvoeren terwijl Player wordt uitgevoerd
illegalStateException=Opdracht niet geldig zonder sessie
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_pt.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_pt.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_pt.properties
index 84c53f7..bf8cfad 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_pt.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_pt.properties
@@ -28,7 +28,7 @@
defaultBuildName=desenvolvimento
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=O Player n\u00e3o respondeu ao comando como esperado; comando anulado.
notSuspendedException=N\u00e3o \u00e9 poss\u00edvel emitir o comando enquanto o Player est\u00e1 em execu\u00e7\u00e3o
illegalStateException=Comando inv\u00e1lido sem uma sess\u00e3o.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ru.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ru.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ru.properties
index 3fb7a50..1dfba74 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ru.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_ru.properties
@@ -28,7 +28,7 @@
defaultBuildName=\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0430
about=Apache fdb (\u043e\u0442\u043b\u0430\u0434\u0447\u0438\u043a Flash Player) [\u0441\u0431\u043e\u0440\u043a\u0430 ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=\u041f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u043e\u0442\u0432\u0435\u0442\u0438\u043b \u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0443 \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u043c \u043e\u0431\u0440\u0430\u0437\u043e\u043c; \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e.
notSuspendedException=\u041a\u043e\u043c\u0430\u043d\u0434\u0443 \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0440\u0430\u0431\u043e\u0442\u044b \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044f
illegalStateException=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0439 \u0431\u0435\u0437 \u0441\u0435\u0430\u043d\u0441\u0430.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_sv.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_sv.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_sv.properties
index 58d1880..e9f445b 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_sv.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_sv.properties
@@ -28,7 +28,7 @@
defaultBuildName=utveckling
about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Spelaren svarade inte p\u00e5 kommandot som f\u00f6rv\u00e4ntat. Kommandot har avbrutits.
notSuspendedException=Du kan inte ange kommandon n\u00e4r spelaren k\u00f6rs.
illegalStateException=Kommandot \u00e4r inte giltigt utan session.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_CN.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_CN.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_CN.properties
index c70870a..37451db 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_CN.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_CN.properties
@@ -28,7 +28,7 @@
defaultBuildName=\u5f00\u53d1
about=Apache fdb\uff08Flash Player \u8c03\u8bd5\u5668\uff09[\u5185\u90e8\u7248\u672c ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Player \u672a\u6309\u9884\u671f\u65b9\u5f0f\u54cd\u5e94\u547d\u4ee4\uff1b\u547d\u4ee4\u5df2\u5f02\u5e38\u7ec8\u6b62\u3002
notSuspendedException=Player \u5904\u4e8e\u8fd0\u884c\u72b6\u6001\u65f6\u65e0\u6cd5\u53d1\u51fa\u547d\u4ee4
illegalStateException=\u5982\u679c\u6ca1\u6709\u4f1a\u8bdd\uff0c\u5219\u547d\u4ee4\u65e0\u6548\u3002
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a95845b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_TW.properties
----------------------------------------------------------------------
diff --git a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_TW.properties b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_TW.properties
index 54b5b2a..f5d34e4 100644
--- a/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_TW.properties
+++ b/debugger/src/main/resources/flex/tools/debugger/cli/fdb_zh_TW.properties
@@ -28,7 +28,7 @@
defaultBuildName=\u958b\u767c
about=Apache fdb (Flash Player \u9664\u932f\u7a0b\u5f0f) [\u7d44\u5efa ${build}]
-copyright=Copyright 2016 The Apache Software Foundation.
+copyright=Copyright 2017 The Apache Software Foundation.
noResponseException=Player \u672a\u5982\u9810\u671f\u56de\u61c9\u6307\u4ee4\uff1b\u6307\u4ee4\u5df2\u4e2d\u6b62\u3002
notSuspendedException=Player \u6b63\u5728\u57f7\u884c\u6642\u7121\u6cd5\u767c\u51fa\u6307\u4ee4
illegalStateException=\u5982\u679c\u6c92\u6709\u5de5\u4f5c\u968e\u6bb5\uff0c\u6307\u4ee4\u5c31\u7121\u6548\u3002
[17/50] git commit: [flex-falcon] [refs/heads/master] - update jar
list
Posted by ah...@apache.org.
update jar list
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b6b713a1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b6b713a1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b6b713a1
Branch: refs/heads/master
Commit: b6b713a165352cbbcc46db8f9543c790d9d5e384
Parents: 7c48ace
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 11 10:44:02 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 11 10:44:02 2017 -0700
----------------------------------------------------------------------
ApproveFalcon.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b6b713a1/ApproveFalcon.xml
----------------------------------------------------------------------
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index b732e29..49d5677 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -189,7 +189,7 @@
<delete file="jars.txt" />
<!-- this is a comma-delimited, no spaces, no-line-breaks list used to decide which jars
to skip in the rat-check of the binaries and which jars to examine before approval -->
- <property name="jars-list" value="compiler/lib/falcon-flexTasks.jar,compiler/lib/compc.jar,compiler/lib/compiler.jar,compiler/lib/falcon-asc.jar,compiler/lib/falcon-compc.jar,compiler/lib/falcon-flexTasks.jar,compiler/lib/falcon-mxmlc.jar,compiler/lib/falcon-optimizer.jar,compiler/lib/falcon-swfdump.jar,compiler/lib/fdb.jar,compiler/lib/flex-compiler-oem.jar,js/lib/compc.jar,js/lib/externc.jar,js/lib/jsc.jar,js/lib/mxmlc.jar"/>
+ <property name="jars-list" value="compiler/lib/compc.jar,compiler/lib/compiler.jar,compiler/lib/falcon-asc.jar,compiler/lib/falcon-compc.jar,compiler/lib/falcon-mxmlc.jar,compiler/lib/falcon-optimizer.jar,compiler/lib/falcon-swfdump.jar,compiler/lib/fdb.jar,compiler/lib/flex-compiler-oem.jar,js/lib/asdoc.jar,js/lib/falcon-flexTasks.jar,js/lib/compc.jar,js/lib/externc.jar,js/lib/jsc.jar,js/lib/mxmlc.jar"/>
<echo file="${basedir}/jars.txt" message="${jars-list}"/>
<echo file="${basedir}/jarexcludes.txt" message="${jars-list}"/>
<replaceregexp file="${basedir}/jarexcludes.txt" match="," flags="g" replace="${line.separator}" />
[50/50] git commit: [flex-falcon] [refs/heads/master] - Merge branch
'release0.8.0'
Posted by ah...@apache.org.
Merge branch 'release0.8.0'
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9ca949d0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9ca949d0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9ca949d0
Branch: refs/heads/master
Commit: 9ca949d059843bb43527b31746d004e008b05c91
Parents: 22d17c8 4d1cff9
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 26 08:42:30 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 26 08:42:30 2017 -0700
----------------------------------------------------------------------
ApproveFalcon.xml | 2 +-
LICENSE.jx | 4 +
LICENSE.jx.bin | 23 -
NOTICE | 2 +-
NOTICE.base | 2 +-
NOTICE.fdb | 2 +-
NOTICE.jx | 2 +-
NOTICE.oem | 2 +-
README_JX | 1 -
RELEASE_NOTES | 13 +
RELEASE_NOTES_JX | 8 +
build.xml | 3 +-
compiler-jx/.classpath | 1 -
compiler-jx/pom.xml | 10 +-
.../apache/flex/compiler/clients/ASDOCJSC.java | 22 +-
.../apache/flex/compiler/clients/COMPJSC.java | 181 ++++-
.../flex/compiler/clients/COMPJSCFlex.java | 566 +++++++++++++
.../flex/compiler/clients/COMPJSCNative.java | 529 +++++++++++++
.../compiler/clients/ExternCConfiguration.java | 11 +-
.../flex/compiler/clients/FlexJSToolGroup.java | 4 +-
.../compiler/clients/JSCompilerEntryPoint.java | 5 +
.../flex/compiler/clients/JSConfiguration.java | 291 ++++++-
.../apache/flex/compiler/clients/MXMLJSC.java | 317 ++++++--
.../flex/compiler/clients/MXMLJSCFlex.java | 784 +++++++++++++++++++
.../compiler/clients/MXMLJSCFlexCordova.java | 784 +++++++++++++++++++
.../flex/compiler/clients/MXMLJSCNative.java | 779 ++++++++++++++++++
.../flex/compiler/clients/MXMLJSCNode.java | 781 ++++++++++++++++++
.../compiler/clients/MXMLJSCNodeModule.java | 30 +
.../codegen/mxml/flexjs/IMXMLFlexJSEmitter.java | 3 +-
.../internal/codegen/js/JSSessionModel.java | 4 +
.../codegen/js/flexjs/JSFlexJSEmitter.java | 55 +-
.../codegen/js/goog/JSGoogEmitterTokens.java | 2 +
.../codegen/js/goog/JSGoogPublisher.java | 8 +-
.../internal/codegen/js/jx/AsIsEmitter.java | 2 +-
.../internal/codegen/js/jx/FieldEmitter.java | 25 +
.../codegen/js/jx/FunctionCallEmitter.java | 4 +
.../internal/codegen/js/jx/LiteralEmitter.java | 3 +-
.../codegen/js/jx/PackageHeaderEmitter.java | 37 +-
.../js/jx/SourceMapDirectiveEmitter.java | 14 +-
.../internal/codegen/js/node/NodePublisher.java | 17 +-
.../codegen/mxml/flexjs/MXMLEventSpecifier.java | 3 +
.../mxml/flexjs/MXMLFlexJSCordovaPublisher.java | 63 ++
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 88 ++-
.../mxml/flexjs/MXMLFlexJSPublisher.java | 111 +--
.../js/flexjs/JSCSSCompilationSession.java | 4 +
.../js/goog/JSGoogCompcConfiguration.java | 407 ++++++++++
.../driver/js/goog/JSGoogConfiguration.java | 4 +
.../driver/js/node/NodeModuleBackend.java | 47 ++
.../mxml/flexjs/MXMLFlexJSCordovaBackend.java | 78 ++
.../compiler/internal/graph/GoogDepsWriter.java | 494 ++++++++----
.../internal/graph/GoogDepsWriterCordova.java | 67 ++
.../internal/projects/FlexJSProject.java | 70 +-
.../utils/JSClosureCompilerWrapper.java | 8 +-
.../apache/flex/compiler/utils/NativeUtils.java | 14 +
.../apache/flex/compiler/utils/NodeJSUtils.java | 41 +
compiler-jx/src/main/resources/downloads.xml | 15 -
compiler-jx/src/test/build.xml | 2 +
.../codegen/externals/ExternalsTestUtils.java | 2 +
.../js/flexjs/TestFlexJSGlobalFunctions.java | 2 +-
.../codegen/js/flexjs/TestFlexJSPackage.java | 8 +
.../codegen/js/flexjs/TestFlexJSProject.java | 4 +-
.../mxml/flexjs/TestFlexJSMXMLApplication.java | 63 ++
.../sourcemaps/TestSourceMapMXMLEvents.java | 44 ++
.../compiler/internal/test/FlexJSTestBase.java | 1 +
.../flex/compiler/internal/test/TestBase.java | 2 +
.../org/apache/flex/utils/EnvProperties.java | 11 +-
.../resources/flexjs/files/CSSTestSource.css | 2 +-
.../flexjs/files/CSSTestSource_result.css | 2 +-
.../flexjs/files/FlexJSTest_again_Flash.mxml | 51 ++
.../resources/flexjs/files/MyInitialView.mxml | 4 +-
.../flexjs/files/MyInitialView_result.js | 7 +-
.../projects/internal/MainClass_result.js | 1 +
.../projects/xml_requires/XMLRequire_result.js | 2 -
compiler-test-utils/pom.xml | 4 +-
compiler/pom.xml | 6 +-
.../org/apache/flex/compiler/internal/css/CSS.g | 4 +-
.../org/apache/flex/compiler/clients/COMPC.java | 2 +-
.../org/apache/flex/compiler/clients/MXMLC.java | 6 +-
.../flex/compiler/common/VersionInfo.java | 4 +-
.../flex/compiler/config/Configuration.java | 78 +-
.../flex/compiler/config/Configurator.java | 10 +-
.../constants/IMetaAttributeConstants.java | 1 +
.../databinding/BindingDestinationMaker.java | 21 +-
.../internal/config/FileConfigurator.java | 1 +
.../internal/config/TargetSettings.java | 8 +-
.../css/semantics/CSSSemanticAnalyzer.java | 45 +-
.../definitions/AccessorDefinition.java | 6 +
.../compiler/internal/projects/FlexProject.java | 92 ++-
.../semantics/MethodBodySemanticChecker.java | 11 +-
.../internal/semantics/SemanticUtils.java | 7 +-
.../compiler/internal/targets/SWFTarget.java | 9 +-
.../internal/tree/as/ExpressionNodeBase.java | 6 +
.../internal/units/CompilationUnitBase.java | 23 +-
.../problems/InternalCompilerProblem.java | 9 +-
.../flex/compiler/projects/IFlexProject.java | 24 +
debugger/pom.xml | 6 +-
.../flex/tools/debugger/cli/fdb_da.properties | 2 +-
.../flex/tools/debugger/cli/fdb_de.properties | 2 +-
.../flex/tools/debugger/cli/fdb_en.properties | 2 +-
.../flex/tools/debugger/cli/fdb_es.properties | 2 +-
.../flex/tools/debugger/cli/fdb_fi.properties | 2 +-
.../flex/tools/debugger/cli/fdb_fr.properties | 2 +-
.../flex/tools/debugger/cli/fdb_it.properties | 2 +-
.../flex/tools/debugger/cli/fdb_ja.properties | 2 +-
.../flex/tools/debugger/cli/fdb_ko.properties | 2 +-
.../flex/tools/debugger/cli/fdb_nb.properties | 2 +-
.../flex/tools/debugger/cli/fdb_nl.properties | 2 +-
.../flex/tools/debugger/cli/fdb_pt.properties | 2 +-
.../flex/tools/debugger/cli/fdb_ru.properties | 2 +-
.../flex/tools/debugger/cli/fdb_sv.properties | 2 +-
.../tools/debugger/cli/fdb_zh_CN.properties | 2 +-
.../tools/debugger/cli/fdb_zh_TW.properties | 2 +-
env-template.properties | 5 +
flex-compiler-oem/pom.xml | 8 +-
.../src/main/java/flex2/compiler/Source.java | 12 +
.../compiler/common/CompilerConfiguration.java | 281 +++++++
.../flex2/compiler/common/Configuration.java | 297 +++++++
.../flex2/tools/CommandLineConfiguration.java | 20 +
.../src/main/java/flex2/tools/Compc.java | 2 -
.../src/main/java/flex2/tools/Mxmlc.java | 2 -
.../src/main/java/flex2/tools/Tool.java | 248 +-----
.../main/java/flex2/tools/oem/Application.java | 48 +-
.../src/main/java/flex2/tools/oem/Library.java | 59 +-
.../oem/internal/ConfigurationConstants.java | 6 +
.../tools/oem/internal/OEMConfiguration.java | 20 +
.../flex2/tools/oem/internal/OEMReport.java | 18 +-
.../java/flex2/tools/oem/internal/OEMUtil.java | 74 +-
flexjs-ant-tasks/build.xml | 10 +-
flexjs-ant-tasks/pom.xml | 4 +-
.../org/apache/flex/compiler/ant/COMPCTask.java | 41 +-
.../org/apache/flex/compiler/ant/FlexTask.java | 8 +-
.../org/apache/flex/compiler/ant/MXMLCTask.java | 43 +-
flexjs-ant-tasks/src/test/build.xml | 33 +-
flexjs-maven-extension/pom.xml | 2 +-
.../flexjs/extension/FlexJsLanguageSupport.java | 14 +
.../flexjs/extension/FlexJsScopeDeriver.java | 14 +
.../flexjs/extension/FlexJsScopeSelector.java | 14 +
flexjs-maven-plugin/pom.xml | 4 +-
.../org/apache/flex/maven/flexjs/BaseMojo.java | 89 ++-
.../apache/flex/maven/flexjs/CompileASMojo.java | 52 +-
.../flex/maven/flexjs/CompileAppMojo.java | 54 +-
.../apache/flex/maven/flexjs/CompileJSMojo.java | 55 +-
.../resources/config/compile-app-config.xml | 410 ++++++++++
.../config/compile-app-flash-config.xml | 382 ---------
.../config/compile-app-javascript-config.xml | 387 ---------
.../main/resources/config/compile-as-config.xml | 117 ---
.../main/resources/config/compile-js-config.xml | 48 +-
.../resources/config/compile-swf-config.xml | 159 ++++
pom.xml | 26 +-
releasecandidate.xml | 11 +-
150 files changed, 8772 insertions(+), 1775 deletions(-)
----------------------------------------------------------------------
[10/50] git commit: [flex-falcon] [refs/heads/master] - don't put
external library dependencies in the requires
Posted by ah...@apache.org.
don't put external library dependencies in the requires
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/faec4e06
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/faec4e06
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/faec4e06
Branch: refs/heads/master
Commit: faec4e06a1390d709e5255826f2f4ba1a1e0769a
Parents: 8511fac
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 3 21:45:38 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 3 21:45:38 2017 -0700
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/JSFlexJSEmitter.java | 13 ++++++++++++-
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 13 ++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/faec4e06/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index 897408f..2d7b257 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -101,6 +101,7 @@ import org.apache.flex.compiler.tree.as.ISetterNode;
import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.flex.compiler.units.ICompilationUnit;
import org.apache.flex.compiler.utils.ASNodeUtils;
import com.google.common.base.Joiner;
@@ -551,7 +552,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
if (!staticUsedNames.contains(name) && !NativeUtils.isJSNative(name))
staticUsedNames.add(name);
- if (!usedNames.contains(name))
+ if (!usedNames.contains(name) && !isExternal(name))
usedNames.add(name);
}
return name;
@@ -1286,4 +1287,14 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
{
write(JSFlexJSEmitterTokens.VECTOR);
}
+
+ boolean isExternal(String className)
+ {
+ ICompilerProject project = getWalker().getProject();
+ ICompilationUnit cu = project.resolveQNameToCompilationUnit(className);
+ if (cu == null) return false; // unit testing
+
+ return ((FlexJSProject)project).isExternalLinkage(cu);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/faec4e06/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 573e0ff..0fbf7ac 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -278,6 +278,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
boolean firstOne = true;
for (String mixin : mixins)
{
+ if (isExternal(mixin))
+ continue;
if (!firstOne)
mixinInject += ", ";
mixinInject += mixin;
@@ -2695,7 +2697,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
if (subDocumentNames.contains(name))
return documentDefinition.getQualifiedName() + "." + name;
if (NativeUtils.isJSNative(name)) return name;
- if (useName && !usedNames.contains(name))
+ if (useName && !usedNames.contains(name) && !isExternal(name))
usedNames.add(name);
return name;
}
@@ -2791,4 +2793,13 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
interfaceList = list.toString();
}
+ boolean isExternal(String className)
+ {
+ ICompilerProject project = getMXMLWalker().getProject();
+ ICompilationUnit cu = project.resolveQNameToCompilationUnit(className);
+ if (cu == null) return false; // unit testing
+
+ return ((FlexJSProject)project).isExternalLinkage(cu);
+ }
+
}
[03/50] git commit: [flex-falcon] [refs/heads/master] - add provides
for internal classes so the GoogDepsWriter will search for all dependencies
in a file
Posted by ah...@apache.org.
add provides for internal classes so the GoogDepsWriter will search for all dependencies in a file
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3f9ed83d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3f9ed83d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3f9ed83d
Branch: refs/heads/master
Commit: 3f9ed83de08907a52392044be78ad324287c6662
Parents: e11cf7e
Author: Alex Harui <ah...@apache.org>
Authored: Sun Apr 23 22:43:30 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Apr 23 22:43:30 2017 -0700
----------------------------------------------------------------------
.../codegen/js/jx/PackageHeaderEmitter.java | 18 ++++++++++++++++++
.../compiler/internal/graph/GoogDepsWriter.java | 15 ++++++++++++++-
.../codegen/js/flexjs/TestFlexJSPackage.java | 8 ++++++++
.../flexjs/projects/internal/MainClass_result.js | 1 +
4 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3f9ed83d/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
index 73d3b80..5c9c91c 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
@@ -149,7 +150,24 @@ public class PackageHeaderEmitter extends JSSubEmitter implements
write(ASEmitterTokens.SINGLE_QUOTE);
write(ASEmitterTokens.PAREN_CLOSE);
writeNewline(ASEmitterTokens.SEMICOLON);
+
+ HashMap<String, String> internalClasses = getEmitter().getModel().getInternalClasses();
+ if (internalClasses.size() > 0)
+ {
+ for (String internalClass : internalClasses.keySet())
+ {
+ /* goog.provide('x');\n\n */
+ write(JSGoogEmitterTokens.GOOG_PROVIDE);
+ write(ASEmitterTokens.PAREN_OPEN);
+ write(ASEmitterTokens.SINGLE_QUOTE);
+ write(((JSFlexJSEmitter)getEmitter()).formatQualifiedName(internalClass, true));
+ write(ASEmitterTokens.SINGLE_QUOTE);
+ write(ASEmitterTokens.PAREN_CLOSE);
+ writeNewline(ASEmitterTokens.SEMICOLON);
+ }
+ }
writeNewline();
+
}
public void emitContents(IPackageDefinition definition)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3f9ed83d/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index 5c122d4..49038cd 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -379,6 +379,8 @@ public class GoogDepsWriter {
{
for (String dep : gd.fileInfo.impls)
{
+ if (gd.fileInfo.provides != null &&
+ gd.fileInfo.provides.contains(dep)) continue;
addDeps(dep);
}
}
@@ -388,6 +390,8 @@ public class GoogDepsWriter {
for (String dep : gd.fileInfo.deps)
{
gd.deps.add(dep);
+ if (gd.fileInfo.provides != null &&
+ gd.fileInfo.provides.contains(dep)) continue;
addDeps(dep);
}
}
@@ -590,8 +594,16 @@ public class GoogDepsWriter {
c = line.indexOf("goog.provide");
if (c > -1)
{
- if (fi.googProvideLine == -i)
+ if (fi.googProvideLine == -1)
fi.googProvideLine = i;
+ if (numProvides > 0)
+ {
+ if (fi.provides == null)
+ fi.provides = new ArrayList<String>();
+ c2 = line.indexOf(")", c);
+ String provide = line.substring(c + 14, c2 - 1);
+ fi.provides.add(provide);
+ }
numProvides++;
}
else
@@ -865,6 +877,7 @@ public class GoogDepsWriter {
public ArrayList<String> impls;
public ArrayList<String> deps;
public ArrayList<String> staticDeps;
+ public ArrayList<String> provides;
public int constructorLine;
public int depsLine;
public int suppressLine;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3f9ed83d/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
index 9e94828..01932d0 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
@@ -434,6 +434,7 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
+ "goog.provide('foo.bar.baz.A.InternalClass');\n" +
"\n" +
"\n" +
"\n" +
@@ -538,6 +539,7 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
+ "goog.provide('foo.bar.baz.A.internalFunction');\n" +
"\n" +
"\n" +
"\n" +
@@ -606,6 +608,7 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
+ "goog.provide('foo.bar.baz.A.internalVar');\n" +
"\n" +
"\n" +
"\n" +
@@ -686,6 +689,7 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
+ "goog.provide('foo.bar.baz.A.InternalClass');\n" +
"\n" +
"\n" +
"\n" +
@@ -838,6 +842,7 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
+ "goog.provide('foo.bar.baz.A.InternalClass');\n" +
"\n" +
"\n" +
"\n" +
@@ -995,6 +1000,8 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
+ "goog.provide('foo.bar.baz.A.InternalClass');\n" +
+ "goog.provide('foo.bar.baz.A.ITestInterface');\n" +
"\n" +
"\n" +
"\n" +
@@ -1153,6 +1160,7 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.A');\n" +
+ "goog.provide('foo.bar.A.Internal');\n" +
"\n" +
"\n" +
"\n" +
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3f9ed83d/compiler-jx/src/test/resources/flexjs/projects/internal/MainClass_result.js
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/flexjs/projects/internal/MainClass_result.js b/compiler-jx/src/test/resources/flexjs/projects/internal/MainClass_result.js
index a96b203..c1f9dd7 100644
--- a/compiler-jx/src/test/resources/flexjs/projects/internal/MainClass_result.js
+++ b/compiler-jx/src/test/resources/flexjs/projects/internal/MainClass_result.js
@@ -20,6 +20,7 @@
*/
goog.provide('MainClass');
+goog.provide('MainClass.InternalClass');
goog.require('OtherClass');
[43/50] git commit: [flex-falcon] [refs/heads/master] - make temp dir
on windows
Posted by ah...@apache.org.
make temp dir 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/85c4376e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/85c4376e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/85c4376e
Branch: refs/heads/master
Commit: 85c4376e455e116ef087e2a728d318aea05f59dd
Parents: ed36067
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 8 21:47:47 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 8 21:47:47 2017 -0700
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/85c4376e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5a55219..3a4b664 100644
--- a/build.xml
+++ b/build.xml
@@ -283,6 +283,7 @@
<target name="stage-source"
description="Package source files required to build in zip file" >
<antcall target="clean-temp"/>
+ <mkdir dir="${basedir}/temp"/>
<copy todir="${basedir}/temp" includeEmptyDirs="false">
<fileset dir="${basedir}">
[26/50] git commit: [flex-falcon] [refs/heads/master] - fix issues
with library projects in FB
Posted by ah...@apache.org.
fix issues with library projects in FB
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b36ee033
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b36ee033
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b36ee033
Branch: refs/heads/master
Commit: b36ee0336b9a0e0cd3be8114bd007d047f7213f0
Parents: 61b2283
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 17 16:32:15 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 17 16:36:27 2017 -0700
----------------------------------------------------------------------
.../apache/flex/compiler/clients/COMPJSC.java | 3 ++
.../flex/compiler/clients/COMPJSCFlex.java | 38 +++++++++++++
.../apache/flex/compiler/clients/MXMLJSC.java | 4 +-
.../src/main/java/flex2/tools/oem/Library.java | 57 +++++++++++++++++---
.../tools/oem/internal/OEMConfiguration.java | 15 ++++++
.../java/flex2/tools/oem/internal/OEMUtil.java | 40 ++++++++++++++
6 files changed, 148 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b36ee033/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
index f13ee22..8b82cb8 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
@@ -202,6 +202,7 @@ public class COMPJSC extends MXMLJSC
case SWF:
System.out.println("COMPC");
COMPC compc = new COMPC();
+ mxmlc = compc;
compc.configurationClass = JSGoogCompcConfiguration.class;
result = compc.mainNoExit(removeJSArgs(args));
if (result != 0)
@@ -213,6 +214,7 @@ public class COMPJSC extends MXMLJSC
case JS_FLEX:
System.out.println("COMPCJSCFlex");
COMPJSCFlex flex = new COMPJSCFlex();
+ lastCompiler = flex;
result = flex.mainNoExit(removeASArgs(args), problems.getProblems(), false);
if (result != 0)
{
@@ -221,6 +223,7 @@ public class COMPJSC extends MXMLJSC
break;
case JS_NATIVE:
COMPJSCNative jsc = new COMPJSCNative();
+ lastCompiler = jsc;
result = jsc.mainNoExit(removeASArgs(args), problems.getProblems(), false);
if (result != 0)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b36ee033/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java
index c403bbc..3744a67 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java
@@ -29,8 +29,10 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
+import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import java.util.TreeSet;
import java.util.zip.Deflater;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -64,6 +66,7 @@ import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
import org.apache.flex.compiler.targets.ITarget.TargetType;
import org.apache.flex.compiler.targets.ITargetSettings;
import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
import org.apache.flex.swc.io.SWCReader;
/**
@@ -525,4 +528,39 @@ public class COMPJSCFlex extends MXMLJSCFlex
{
return TargetType.SWC;
}
+
+ @Override
+ public List<String> getSourceList()
+ {
+ ArrayList<String> list = new ArrayList<String>();
+ LinkedList<ICompilerProblem> problemList = new LinkedList<ICompilerProblem>();
+ try
+ {
+ Collection<ICompilerProblem> errors = new ArrayList<ICompilerProblem>();
+ Collection<ICompilationUnit> roots = ((FlexJSSWCTarget)target).getReachableCompilationUnits(errors);
+ Collection<ICompilationUnit> units = project.getReachableCompilationUnitsInSWFOrder(roots);
+ for (ICompilationUnit unit : units)
+ {
+ UnitType ut = unit.getCompilationUnitType();
+ if (ut == UnitType.AS_UNIT || ut == UnitType.MXML_UNIT)
+ {
+ list.add(unit.getAbsoluteFilename());
+ }
+ }
+ }
+ catch (InterruptedException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return list;
+ }
+
+ @Override
+ public String getMainSource()
+ {
+ return null;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b36ee033/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
index 0916598..1f14259 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -261,8 +261,8 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
protected ITargetSettings targetSettings;
protected IJSApplication jsTarget;
private IJSPublisher jsPublisher;
- private MXMLC mxmlc;
- private JSCompilerEntryPoint lastCompiler;
+ protected MXMLC mxmlc;
+ protected JSCompilerEntryPoint lastCompiler;
public boolean noLink;
public OutputStream err;
public Class<? extends Configuration> configurationClass = JSGoogConfiguration.class;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b36ee033/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
index bdcb3be..182c325 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
@@ -37,13 +37,16 @@ import java.util.TreeSet;
import java.lang.annotation.Annotation;
import java.net.URI;
-import org.apache.flex.compiler.clients.COMPC;
+import org.apache.flex.compiler.clients.COMPJSC;
import org.apache.flex.compiler.clients.problems.ProblemFormatter;
import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.problems.CompilerProblemSeverity;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.problems.annotations.DefaultSeverity;
+import flex2.compiler.CompilerException;
+import flex2.compiler.Source;
+import flex2.compiler.SourceList;
import flex2.compiler.common.CompilerConfiguration;
import flex2.compiler.config.ConfigurationException;
import flex2.compiler.io.FileUtil;
@@ -55,6 +58,9 @@ import flex2.compiler.util.CompilerMessage;
import flex2.compiler.util.MimeMappings;
import flex2.compiler.util.PerformanceData;
import flex2.compiler.util.ThreadLocalToolkit;
+import flex2.linker.SimpleMovie;
+import flex2.tools.oem.internal.ApplicationCompilerConfiguration;
+import flex2.tools.oem.internal.LibraryCompilerConfiguration;
import flex2.tools.oem.internal.OEMConfiguration;
import flex2.tools.oem.internal.OEMReport;
import flex2.tools.oem.internal.OEMUtil;
@@ -249,6 +255,10 @@ public class Library implements Builder, Cloneable
private CompilerControl cc;
private ApplicationCache applicationCache;
private LibraryCache libraryCache;
+
+ private List<Source> compiledSources;
+ private SourceList sourceList;
+
// clean() would null out the following variables
//LibraryData data;
@@ -746,10 +756,10 @@ public class Library implements Builder, Cloneable
public Report getReport()
{
//OEMUtil.setupLocalizationManager();
- return new OEMReport(null,
- null,
+ return new OEMReport(compiledSources,
null,
null,
+ sourceList,
configurationReport,
messages, files);
}
@@ -904,14 +914,47 @@ public class Library implements Builder, Cloneable
true /* cleanConfig */,
false /* cleanMessages */,
false /* cleanThreadLocals */);
- COMPC compc = new COMPC();
- int returnValue = compc.mainNoExit(constructCommandLine(oemConfiguration));
- if (returnValue == 0)
+ COMPJSC compc = new COMPJSC();
+ int returnValue = compc.mainNoExit(constructCommandLine(oemConfiguration), null, true);
+ if (returnValue == 0 || returnValue == 2)
returnValue = OK;
else
returnValue = FAIL;
- convertMessages(compc.getProblems());
+ LibraryCompilerConfiguration acc = ((LibraryCompilerConfiguration)tempOEMConfiguration.configuration);
+ VirtualFile[] sourcePaths = acc.getCompilerConfiguration().getSourcePath();
+
+ compiledSources = new ArrayList<Source>();
+ List<String> sourceFiles = compc.getSourceList();
+ String mainFile = compc.getMainSource();
+ VirtualFile mainVirtualFile = null;
+ for (String sourceFile : sourceFiles)
+ {
+ for (VirtualFile sourcePath : sourcePaths)
+ {
+ String pathName = sourcePath.getName();
+ if (sourceFile.indexOf(pathName) == 0)
+ {
+ String relPath = sourceFile.substring(pathName.length());
+ int lastSep = relPath.lastIndexOf(File.separator);
+ String shortName = relPath.substring(lastSep + 1);
+ relPath = relPath.substring(0, lastSep);
+ boolean isRoot = sourceFile.equals(mainFile);
+ Source source = new Source(sourcePath, relPath, shortName, null, false, isRoot);
+ compiledSources.add(source);
+ if (mainFile != null && pathName.equals(mainFile))
+ mainVirtualFile = sourcePath;
+ }
+ }
+ }
+ try {
+ sourceList = new SourceList(new ArrayList<VirtualFile>(), sourcePaths, mainVirtualFile, new String[0]);
+ } catch (CompilerException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ }
+
+ convertMessages(compc.getProblemQuery());
clean(returnValue != OK, false, false);
return returnValue;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b36ee033/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMConfiguration.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMConfiguration.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMConfiguration.java
index f141fd8..eef9c03 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMConfiguration.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMConfiguration.java
@@ -1163,6 +1163,21 @@ public class OEMConfiguration implements Configuration, ConfigurationConstants,
*
* @param paths an array of <code>java.io.File</code> (<code>File.isDirectory()</code> must return <code>true</code>).
*/
+ public File[] getSourcePath()
+ {
+ if (args.containsKey(COMPILER_SOURCE_PATH))
+ return (File[]) args.get(COMPILER_SOURCE_PATH);
+ if (more.containsKey(COMPILER_SOURCE_PATH))
+ return (File[]) more.get(COMPILER_SOURCE_PATH);
+ return null;
+ }
+
+ /**
+ * Sets a list of path elements that form the roots of ActionScript class hierarchies.
+ * This is equivalent to using <code>mxmlc/compc --compiler.source-path</code>.
+ *
+ * @param paths an array of <code>java.io.File</code> (<code>File.isDirectory()</code> must return <code>true</code>).
+ */
public void setSourcePath(File[] paths)
{
args.put(COMPILER_SOURCE_PATH, paths);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b36ee033/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMUtil.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMUtil.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMUtil.java
index b6e1d5b..d791e10 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMUtil.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/internal/OEMUtil.java
@@ -243,6 +243,8 @@ public class OEMUtil
private static LibraryCompilerConfiguration processCOMPCCConfiguration(org.apache.flex.compiler.config.Configuration config)
{
LibraryCompilerConfiguration acc = new LibraryCompilerConfiguration();
+ ConfigurationPathResolver resolver = new ConfigurationPathResolver();
+ acc.setConfigPathResolver(resolver);
acc.setBackgroundColor(config.getDefaultBackgroundColor());
acc.setDebug(config.debug());
acc.setFrameRate(config.getDefaultFrameRate());
@@ -251,7 +253,45 @@ public class OEMUtil
acc.setSwfVersion(config.getSwfVersion());
acc.setScriptRecursionLimit(config.getScriptRecursionLimit());
acc.setScriptTimeLimit(config.getScriptTimeLimit());
+ CompilerConfiguration cc = acc.getCompilerConfiguration();
+ List<String> externalLibraries = config.getCompilerExternalLibraryPath();
+ String[] extlibs = new String[externalLibraries.size()];
+ externalLibraries.toArray(extlibs);
+ try
+ {
+ cc.cfgExternalLibraryPath(null, extlibs);
+ }
+ catch (ConfigurationException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ List<String> libraries = config.getCompilerLibraryPath();
+ String[] libs = new String[libraries.size()];
+ libraries.toArray(libs);
+ try
+ {
+ cc.cfgLibraryPath(null, libs);
+ }
+ catch (ConfigurationException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ List<String> sources = config.getCompilerSourcePath();
+ String[] srcs = new String[sources.size()];
+ sources.toArray(srcs);
+ try
+ {
+ cc.cfgSourcePath(null, srcs);
+ }
+ catch (ConfigurationException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
return acc;
}
[13/50] git commit: [flex-falcon] [refs/heads/master] - make
-library-path be additional libraries for both js-library-path and
swf-library-path
Posted by ah...@apache.org.
make -library-path be additional libraries for both js-library-path and swf-library-path
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8fb27211
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8fb27211
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8fb27211
Branch: refs/heads/master
Commit: 8fb27211d20ae85079461f8b7c52d1fbb3bcef12
Parents: 1a5ea9f
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 10 10:51:41 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 10 11:24:42 2017 -0700
----------------------------------------------------------------------
.../internal/projects/FlexJSProject.java | 10 +++---
.../compiler/internal/projects/FlexProject.java | 10 +++---
.../org/apache/flex/maven/flexjs/BaseMojo.java | 38 ++++++++++++++++++++
.../apache/flex/maven/flexjs/CompileASMojo.java | 23 +++++++++---
.../flex/maven/flexjs/CompileAppMojo.java | 19 +++++++---
.../apache/flex/maven/flexjs/CompileJSMojo.java | 18 ++++++----
.../resources/config/compile-app-config.xml | 10 ++++++
.../main/resources/config/compile-js-config.xml | 22 ++++++++++++
.../resources/config/compile-swf-config.xml | 10 ++++++
9 files changed, 132 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index 2dbbcf7..a726d38 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -392,9 +392,8 @@ public class FlexJSProject extends FlexProject
public List<String> getCompilerExternalLibraryPath(Configuration config)
{
List<String> list = ((JSConfiguration)config).getCompilerJsExternalLibraryPath();
- if (list != null && list.size() > 0)
- return list;
- return config.getCompilerExternalLibraryPath();
+ list.addAll(config.getCompilerExternalLibraryPath());
+ return list;
}
/**
@@ -403,9 +402,8 @@ public class FlexJSProject extends FlexProject
public List<String> getCompilerLibraryPath(Configuration config)
{
List<String> list = ((JSConfiguration)config).getCompilerJsLibraryPath();
- if (list != null && list.size() > 0)
- return list;
- return config.getCompilerLibraryPath();
+ list.addAll(config.getCompilerLibraryPath());
+ return list;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
index c2d58c4..b01eed5 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
@@ -2340,9 +2340,8 @@ public class FlexProject extends ASProject implements IFlexProject
public List<String> getCompilerExternalLibraryPath(Configuration config)
{
List<String> list = config.getCompilerSwfExternalLibraryPath();
- if (list != null && list.size() > 0)
- return list;
- return config.getCompilerExternalLibraryPath();
+ list.addAll(config.getCompilerExternalLibraryPath());
+ return list;
}
/**
@@ -2351,9 +2350,8 @@ public class FlexProject extends ASProject implements IFlexProject
public List<String> getCompilerLibraryPath(Configuration config)
{
List<String> list = config.getCompilerSwfLibraryPath();
- if (list != null && list.size() > 0)
- return list;
- return config.getCompilerLibraryPath();
+ list.addAll(config.getCompilerLibraryPath());
+ return list;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
index 315c8c1..40f05be 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
@@ -116,14 +116,18 @@ public abstract class BaseMojo
List<Artifact> filteredLibraries = getFilteredLibraries(allLibraries);
List<Artifact> libraries = getLibraries(filteredLibraries);
List<Artifact> jsLibraries = getJSLibraries(filteredLibraries);
+ List<Artifact> swfLibraries = getSWFLibraries(filteredLibraries);
List<Artifact> externalLibraries = getExternalLibraries(filteredLibraries);
List<Artifact> jsExternalLibraries = getJSExternalLibraries(filteredLibraries);
+ List<Artifact> swfExternalLibraries = getSWFExternalLibraries(filteredLibraries);
List<Artifact> themeLibraries = getThemeLibraries(filteredLibraries);
List<String> sourcePaths = getSourcePaths();
context.put("libraries", libraries);
context.put("externalLibraries", externalLibraries);
context.put("jsLibraries", jsLibraries);
context.put("jsExternalLibraries", jsExternalLibraries);
+ context.put("swfLibraries", swfLibraries);
+ context.put("swfExternalLibraries", swfExternalLibraries);
context.put("themeLibraries", themeLibraries);
context.put("sourcePaths", sourcePaths);
context.put("namespaces", getNamespaces());
@@ -321,6 +325,10 @@ public abstract class BaseMojo
return internalGetLibrariesJS(artifacts);
}
+ protected List<Artifact> getSWFLibraries(List<Artifact> artifacts) {
+ return internalGetLibrariesSWF(artifacts);
+ }
+
protected List<Artifact> getThemeLibraries(List<Artifact> artifacts) {
List<Artifact> themeLibraries = new LinkedList<Artifact>();
for(Artifact artifact : artifacts) {
@@ -360,6 +368,19 @@ public abstract class BaseMojo
return externalLibraries;
}
+ protected List<Artifact> getSWFExternalLibraries(List<Artifact> artifacts) {
+ List<Artifact> externalLibraries = new LinkedList<Artifact>();
+ for(Artifact artifact : artifacts) {
+ if(("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope()))
+ && includeLibrarySWF(artifact)) {
+ if(!"pom".equals(artifact.getType())) {
+ externalLibraries.add(artifact);
+ }
+ }
+ }
+ return externalLibraries;
+ }
+
protected boolean isForceSwcExternalLibraryPath() {
return forceSwcExternalLibraryPath;
}
@@ -390,6 +411,19 @@ public abstract class BaseMojo
return libraries;
}
+ private List<Artifact> internalGetLibrariesSWF(List<Artifact> artifacts) {
+ List<Artifact> libraries = new LinkedList<Artifact>();
+ for (Artifact artifact : artifacts) {
+ if (!("provided".equalsIgnoreCase(artifact.getScope()) || "runtime".equalsIgnoreCase(artifact.getScope()))
+ && includeLibrarySWF(artifact)) {
+ if(!"pom".equals(artifact.getType())) {
+ libraries.add(artifact);
+ }
+ }
+ }
+ return libraries;
+ }
+
protected List<Define> getDefines() throws MojoExecutionException {
List<Define> defines = new LinkedList<Define>();
if(this.defines != null) {
@@ -407,5 +441,9 @@ public abstract class BaseMojo
protected boolean includeLibraryJS(Artifact library) {
return true;
}
+
+ protected boolean includeLibrarySWF(Artifact library) {
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
index c4dbdc3..2610286 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
@@ -17,9 +17,11 @@ package org.apache.flex.maven.flexjs;
import org.apache.flex.tools.FlexTool;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProjectHelper;
import java.io.File;
import java.util.LinkedList;
@@ -33,7 +35,7 @@ public class CompileASMojo
extends BaseMojo
{
- @Parameter(defaultValue = "${project.artifactId}-${project.version}.swc")
+ @Parameter(defaultValue = "${project.artifactId}-${project.version}-swf.swc")
private String outputFileName;
@Parameter(defaultValue = "false")
@@ -42,6 +44,9 @@ public class CompileASMojo
@Parameter(defaultValue = "false")
private boolean skipAS;
+ @Component
+ private MavenProjectHelper projectHelper;
+
@Override
protected String getToolGroupName() {
return "FlexJS";
@@ -74,6 +79,7 @@ public class CompileASMojo
if(getOutput().exists()) {
// Attach the file created by the compiler as artifact file to maven.
project.getArtifact().setFile(getOutput());
+ projectHelper.attachArtifact(project, getOutput(), "swf");
}
}
@@ -117,15 +123,22 @@ public class CompileASMojo
@Override
protected boolean includeLibrary(Artifact library) {
- return !("typedefs".equalsIgnoreCase(library.getClassifier()) ||
- "js".equalsIgnoreCase(library.getClassifier()));
+ String classifier = library.getClassifier();
+ return (classifier == null) && !("provided".equalsIgnoreCase(library.getScope()));
}
@Override
protected boolean includeLibraryJS(Artifact library) {
- return "typedefs".equalsIgnoreCase(library.getClassifier()) ||
- "js".equalsIgnoreCase(library.getClassifier());
+ String classifier = library.getClassifier();
+ return "typedefs".equalsIgnoreCase(classifier) ||
+ "js".equalsIgnoreCase(classifier);
}
+ @Override
+ protected boolean includeLibrarySWF(Artifact library) {
+ String classifier = library.getClassifier();
+ return "swf".equalsIgnoreCase(classifier) ||
+ ((classifier == null) && "provided".equalsIgnoreCase(library.getScope()));
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
index 61ab8bf..d8c5ded 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@ -169,18 +169,27 @@ public class CompileAppMojo
@Override
protected boolean includeLibrary(Artifact library) {
- return !("typedefs".equalsIgnoreCase(library.getClassifier()) ||
- "js".equalsIgnoreCase(library.getClassifier()));
+ String classifier = library.getClassifier();
+ return (classifier == null) && !("provided".equalsIgnoreCase(library.getScope()));
}
@Override
protected boolean includeLibraryJS(Artifact library) {
+ String classifier = library.getClassifier();
// Strip out all externs except if the dependency was declared inside the pom itself.
- return ("typedefs".equalsIgnoreCase(library.getClassifier()) ||
- "js".equalsIgnoreCase(library.getClassifier()));
+ return "typedefs".equalsIgnoreCase(classifier) ||
+ "js".equalsIgnoreCase(classifier);
// || library.getDependencyTrail().size() == 2;
}
-
+
+ @Override
+ protected boolean includeLibrarySWF(Artifact library) {
+ String classifier = library.getClassifier();
+ return "swf".equalsIgnoreCase(classifier) ||
+ ((classifier == null) && "provided".equalsIgnoreCase(library.getScope()));
+ // || library.getDependencyTrail().size() == 2;
+ }
+
/*private void zipDirectory(File source, File target) {
byte[] buffer = new byte[1024];
try {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
index 98bbe75..d30eec4 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
@@ -121,18 +121,24 @@ public class CompileJSMojo
@Override
protected boolean includeLibrary(Artifact library) {
- return "typedefs".equalsIgnoreCase(library.getClassifier()) ||
- "js".equalsIgnoreCase(library.getClassifier());
+ String classifier = library.getClassifier();
+ return (classifier == null) && !("provided".equalsIgnoreCase(library.getScope()));
}
- /* return false since we will already list the libraries we want on the
- regular library-path and external-library-path
- */
@Override
protected boolean includeLibraryJS(Artifact library) {
- return false;
+ String classifier = library.getClassifier();
+ return "typedefs".equalsIgnoreCase(classifier) ||
+ "js".equalsIgnoreCase(classifier);
}
+ @Override
+ protected boolean includeLibrarySWF(Artifact library) {
+ String classifier = library.getClassifier();
+ return "typedefs".equalsIgnoreCase(classifier) ||
+ "js".equalsIgnoreCase(classifier);
+ }
+
private void createEmptySwc(File outputFile) throws MojoExecutionException {
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml
index 60a87e4..425552a 100644
--- a/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml
+++ b/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml
@@ -65,6 +65,11 @@
#foreach($artifact in $jsExternalLibraries) <path-element>$artifact.file</path-element>
#end
</js-external-library-path>
+
+ <swf-external-library-path>
+ #foreach($artifact in $swfExternalLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </swf-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
<!-- the compiler during mxml translation and are helpful with understanding and -->
@@ -89,6 +94,11 @@
#end
</js-library-path>
+ <swf-library-path>
+ #foreach($artifact in $swfLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </swf-library-path>
+
<allow-subclass-overrides>$allowSubclassOverrides</allow-subclass-overrides>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
index 8d010e4..2731b1e 100644
--- a/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
+++ b/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
@@ -33,6 +33,28 @@
#end
</external-library-path>
+ <js-library-path>
+ #foreach($artifact in $jsLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </js-library-path>
+
+ <!-- use js libraries for SWF compile as well -->
+ <swf-library-path>
+ #foreach($artifact in $jsLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </swf-library-path>
+
+ <js-external-library-path>
+ #foreach($artifact in $jsExternalLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </js-external-library-path>
+
+ <!-- use js libraries for SWF compile as well -->
+ <swf-external-library-path>
+ #foreach($artifact in $jsExternalLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </swf-external-library-path>
+
<source-path>
#foreach($sourcePath in $sourcePaths) <path-element>$sourcePath</path-element>
#end
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8fb27211/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml
index afee4db..7633a94 100644
--- a/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml
+++ b/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml
@@ -33,6 +33,11 @@
#end
</js-library-path>
+ <swf-library-path>
+ #foreach($artifact in $swfLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </swf-library-path>
+
<external-library-path>
#foreach($artifact in $externalLibraries) <path-element>$artifact.file</path-element>
#end
@@ -43,6 +48,11 @@
#end
</js-external-library-path>
+ <swf-external-library-path>
+ #foreach($artifact in $swfExternalLibraries) <path-element>$artifact.file</path-element>
+ #end
+ </swf-external-library-path>
+
<theme>
#foreach($artifact in $themeLibraries) <filename>$artifact.file</filename>
#end