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 2015/12/17 18:42:10 UTC
git commit: [flex-falcon] [refs/heads/develop] - missing Language in
a few scenarios
Repository: flex-falcon
Updated Branches:
refs/heads/develop b5776589d -> 3d99cff04
missing Language in a few scenarios
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3d99cff0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3d99cff0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3d99cff0
Branch: refs/heads/develop
Commit: 3d99cff046dde8eb89d04c59102db13a92bb6fcd
Parents: b577658
Author: Alex Harui <ah...@apache.org>
Authored: Thu Dec 17 09:42:03 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Dec 17 09:42:03 2015 -0800
----------------------------------------------------------------------
.../compiler/internal/codegen/js/jx/PackageHeaderEmitter.java | 5 ++++-
.../internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d99cff0/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
index d7cc4e0..d0e161b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
@@ -41,6 +41,7 @@ import org.apache.flex.compiler.internal.scopes.PackageScope;
import org.apache.flex.compiler.internal.tree.as.ClassNode;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.scopes.IASScope;
+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;
@@ -213,9 +214,11 @@ public class PackageHeaderEmitter extends JSSubEmitter implements
// 'as' operators. We don't need to worry about requiring
// this in every project: ADVANCED_OPTIMISATIONS will NOT
// include any of the code if it is not used in the project.
+ boolean makingSWC = flexProject.getSWFTarget() != null &&
+ flexProject.getSWFTarget().getTargetType() == TargetType.SWC;
boolean isMainCU = flexProject.mainCU != null
&& cu.getName().equals(flexProject.mainCU.getName());
- if (isMainCU)
+ if (isMainCU || makingSWC)
{
ICompilerProject project = this.getProject();
if (project instanceof FlexJSProject)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d99cff0/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index ff9bd16..950f66e 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -918,6 +918,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
// top level is 'mxmlContent', skip it...
if (descriptorTree.size() > 0)
{
+ FlexJSProject project = (FlexJSProject) getMXMLWalker().getProject();
+ project.needLanguage = true;
MXMLDescriptorSpecifier root = descriptorTree.get(0);
root.isTopNode = false;