- Merged latest changes from develop - Hopefully fixed an issue if the closure-lib is specified on the commandline/ant
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9f20c163 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9f20c163 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9f20c163 Branch: refs/heads/develop Commit: 9f20c1635923ea7eed773a52ae23a0719e2b453f Parents: a36a800 Author: Christofer Dutz <[email protected]> Authored: Fri Nov 4 10:32:11 2016 +0100 Committer: Christofer Dutz <[email protected]> Committed: Fri Nov 4 10:32:11 2016 +0100 ---------------------------------------------------------------------- .../flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java | 4 ---- .../internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f20c163/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java index 915aacf..0637c43 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java @@ -75,10 +75,6 @@ public class SuperCallEmitter extends JSSubEmitter IClassNode cnode = (IClassNode) node .getAncestorOfType(IClassNode.class); - // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation - if (cnode == null && MXMLJSC.jsOutputType == JSOutputType.VF2JS) - return; - if (fnode != null && (fnode.getNodeID() == ASTNodeID.GetterID || fnode .getNodeID() == ASTNodeID.SetterID)) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f20c163/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java index 858525c..aecc180 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java @@ -218,7 +218,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher if(!closureLibDir.exists() || !closureLibDir.isDirectory()) { throw new RuntimeException("Parameter 'closure-lib' doesn't point to a valid directory."); } - closureSourceFiles = getDirectoryResources(closureLibDir); + closureSourceFiles = getDirectoryResources(new File(closureLibDir, "closure")); } else { // Check if the "goog/deps.js" is available in the classpath. File closureLibraryJar = getJarThatContainsClasspathResources("goog/deps.js");
