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 2016/05/12 16:19:39 UTC
[1/3] git commit: [flex-falcon] [refs/heads/develop] - fix FB option
handling
Repository: flex-falcon
Updated Branches:
refs/heads/develop 576b94a51 -> af288f13b
fix FB option 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/c6b4e741
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c6b4e741
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c6b4e741
Branch: refs/heads/develop
Commit: c6b4e741cc115fdb741d3c19a29418672f18c773
Parents: 576b94a
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 11 22:24:12 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 12 08:39:30 2016 -0700
----------------------------------------------------------------------
.../config/FlashBuilderConfigurator.java | 47 +++++++++++++++-----
1 file changed, 36 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c6b4e741/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java b/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
index f0d0744..27dfaa4 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
@@ -93,7 +93,7 @@ public class FlashBuilderConfigurator
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
FlexLibPropertiesReader flpr = new FlexLibPropertiesReader();
if (suffix.equals(".swc"))
{
@@ -109,7 +109,23 @@ public class FlashBuilderConfigurator
}
for (String arg : args)
+ {
+ if (arg.startsWith("-output="))
+ {
+ // allow command-line -output to override project -output
+ int n = fbArgs.size();
+ for (int i = 0; i < n; i++)
+ {
+ String fbArg = fbArgs.get(i);
+ if (fbArg.startsWith("-output"))
+ {
+ fbArgs.remove(i);
+ break;
+ }
+ }
+ }
fbArgs.add(arg);
+ }
// remove last original arg which should have been project folder
fbArgs.remove(fbArgs.size() - 1);
if (suffix.equals(".swc"))
@@ -132,6 +148,7 @@ public class FlashBuilderConfigurator
private static class ActionScriptPropertiesReader
{
public String applicationPath;
+ public String additionalCompilerArguments;
public void read(ArrayList<String> fbArgs, String fbFolder, boolean isDebug, String suffix, String sdkdir) throws ConfigurationException
{
@@ -147,6 +164,19 @@ public class FlashBuilderConfigurator
final InputSource source = new InputSource(reader);
parser.parse(source, h);
applicationPath = h.applicationPath;
+ if (h.additionalCompilerArguments != null)
+ {
+ String[] parts = h.additionalCompilerArguments.split("\\s+");
+ for (String part : parts)
+ {
+ if (part.contains("-load-config") && part.contains(".."))
+ {
+ String[] pieces = part.split("=");
+ part = pieces[0] + "=" + h.sourcePath + "/" + pieces[1];
+ }
+ fbArgs.add(part);
+ }
+ }
}
catch (SAXConfigurationException e)
{
@@ -204,6 +234,8 @@ public class FlashBuilderConfigurator
private String outputFileName;
private boolean inExclude;
private String workspacePath;
+ public String additionalCompilerArguments;
+ public String sourcePath;
@Override
public void startElement(final String uri, final String localName, final String qname, final Attributes attributes) throws SAXException
@@ -229,21 +261,13 @@ public class FlashBuilderConfigurator
String extras = attributes.getValue("additionalCompilerArguments");
if (extras != null && extras.length() > 0)
{
- String[] parts = extras.split(" ");
- for (String part : parts)
- {
- if (part.contains("-load-config") && part.contains(".."))
- {
- String[] pieces = part.split("=");
- part = pieces[0] + "=" + contextPath + "/src/" + pieces[1];
- }
- fbArgs.add(part);
- }
+ additionalCompilerArguments = extras;
}
String srcPath = attributes.getValue("sourceFolderPath");
if (srcPath != null && srcPath.length() > 0)
{
applicationPath = contextPath + "/" + srcPath + "/" + applicationPath;
+ sourcePath = contextPath + "/" + srcPath;
fbArgs.add("-source-path+=" + contextPath + "/" + srcPath);
}
String isApollo = attributes.getValue("useApolloConfig");
@@ -338,6 +362,7 @@ public class FlashBuilderConfigurator
else if (qname.equals("excludedEntries"))
inExclude = true;
}
+
}
@Override
[3/3] git commit: [flex-falcon] [refs/heads/develop] - fix XML output
Posted by ah...@apache.org.
fix XML 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/af288f13
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/af288f13
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/af288f13
Branch: refs/heads/develop
Commit: af288f13b4c404855f85495433bcea8d9a09432c
Parents: 6bd83ee
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 12 09:19:32 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 12 09:19:32 2016 -0700
----------------------------------------------------------------------
.../codegen/js/jx/BinaryOperatorEmitter.java | 19 ++++++++++++++++---
.../js/flexjs/TestFlexJSGlobalClasses.java | 4 ++--
2 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af288f13/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
index 6a6e470..231cee3 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
@@ -177,8 +177,19 @@ public class BinaryOperatorEmitter extends JSSubEmitter implements
}
else if (node.getNodeID() == ASTNodeID.Op_AddAssignID)
{
- getWalker().walk(xmlNode);
- write(" = ");
+ getWalker().walk(xmlNode.getLeftOperandNode());
+ IExpressionNode rightSide = xmlNode.getRightOperandNode();
+ if (rightSide instanceof UnaryOperatorAtNode)
+ {
+ write(".setAttribute('");
+ getWalker().walk(((UnaryOperatorAtNode)rightSide).getChild(0));
+ }
+ else
+ {
+ write(".setChild('");
+ getWalker().walk(rightSide);
+ }
+ write("', ");
getWalker().walk(node.getLeftOperandNode());
write(".plus(");
getWalker().walk(node.getRightOperandNode());
@@ -242,7 +253,9 @@ public class BinaryOperatorEmitter extends JSSubEmitter implements
if (node.getNodeID() == ASTNodeID.Op_AddAssignID)
{
getWalker().walk(leftSide);
- write(".concat(");
+ write(" = ");
+ getWalker().walk(leftSide);
+ write(".plus(");
getWalker().walk(node.getRightOperandNode());
write(ASEmitterTokens.PAREN_CLOSE);
return;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af288f13/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
index 5851986..f96646e 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
@@ -569,7 +569,7 @@ public class TestFlexJSGlobalClasses extends TestGoogGlobalClasses
{
IBinaryOperatorNode node = getBinaryNode("var a:XML = new XML(\"<top attr1='cat'><child attr2='dog'><grandchild attr3='fish'>text</grandchild></child></top>\");a.foo += a.child");
asBlockWalker.visitBinaryOperator(node);
- //assertOut("a.child('foo') = a.child('foo').plus(a.child('child'))");
+ assertOut("a.setChild('foo', a.child('foo').plus(a.child('child'))");
}
@Test
@@ -577,7 +577,7 @@ public class TestFlexJSGlobalClasses extends TestGoogGlobalClasses
{
IBinaryOperatorNode node = getBinaryNode("var a:XMLList; var b:XMLList; a += b");
asBlockWalker.visitBinaryOperator(node);
- //assertOut("a = a.plus(b)");
+ assertOut("a = a.plus(b)");
}
@Test
[2/3] git commit: [flex-falcon] [refs/heads/develop] - attempt to
move externs folder
Posted by ah...@apache.org.
attempt to move externs folder
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6bd83ee3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6bd83ee3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6bd83ee3
Branch: refs/heads/develop
Commit: 6bd83ee3747dc60cc3a32190301b8b728dfe7006
Parents: c6b4e74
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 12 08:39:01 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 12 08:39:31 2016 -0700
----------------------------------------------------------------------
build.xml | 18 +++++++++---------
installer.xml | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6bd83ee3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1eae4f3..6c90bfe 100644
--- a/build.xml
+++ b/build.xml
@@ -530,15 +530,15 @@
</copy>
<!-- generated -->
- <mkdir dir="${basedir}/temp/js/libs"/>
- <copy tofile="${basedir}/temp/js/libs/js.swc" file="${basedir}/externs/js/target/js.swc" />
- <copy tofile="${basedir}/temp/js/libs/cordova.swc" file="${basedir}/externs/cordova/target/cordova.swc" />
- <copy tofile="${basedir}/temp/js/libs/createjs.swc" file="${basedir}/externs/createjs/target/createjs.swc" />
- <copy tofile="${basedir}/temp/js/libs/google_maps.swc" file="${basedir}/externs/google_maps/target/google_maps.swc" />
- <copy tofile="${basedir}/temp/js/libs/jasmine.swc" file="${basedir}/externs/jasmine/target/jasmine.swc" />
- <copy tofile="${basedir}/temp/js/libs/jquery.swc" file="${basedir}/externs/jquery/target/jquery-1.9.swc" />
- <copy tofile="${basedir}/temp/js/libs/GCL.swc" file="${basedir}/externs/GCL/target/GCL.swc" />
- <copy tofile="${basedir}/temp/js/libs/node.swc" file="${basedir}/externs/node/target/node.swc" />
+ <mkdir dir="${basedir}/temp/frameworks/js/libs"/>
+ <copy tofile="${basedir}/temp/frameworks/js/libs/js.swc" file="${basedir}/externs/js/target/js.swc" />
+ <copy tofile="${basedir}/temp/frameworks/js/libs/cordova.swc" file="${basedir}/externs/cordova/target/cordova.swc" />
+ <copy tofile="${basedir}/temp/frameworks/js/libs/createjs.swc" file="${basedir}/externs/createjs/target/createjs.swc" />
+ <copy tofile="${basedir}/temp/frameworks/js/libs/google_maps.swc" file="${basedir}/externs/google_maps/target/google_maps.swc" />
+ <copy tofile="${basedir}/temp/frameworks/js/libs/jasmine.swc" file="${basedir}/externs/jasmine/target/jasmine.swc" />
+ <copy tofile="${basedir}/temp/frameworks/js/libs/jquery.swc" file="${basedir}/externs/jquery/target/jquery-1.9.swc" />
+ <copy tofile="${basedir}/temp/frameworks/js/libs/GCL.swc" file="${basedir}/externs/GCL/target/GCL.swc" />
+ <copy tofile="${basedir}/temp/frameworks/js/libs/node.swc" file="${basedir}/externs/node/target/node.swc" />
<!-- generated -->
<mkdir dir="${basedir}/temp/externs"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6bd83ee3/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index b3ed920..ed21d67 100644
--- a/installer.xml
+++ b/installer.xml
@@ -157,14 +157,14 @@
<target name="copyfiles.jx" if="install.jx" description="copy FalconJX files into SDK" >
<mkdir dir="${FLEX_HOME}/js/bin" />
<mkdir dir="${FLEX_HOME}/js/lib" />
- <mkdir dir="${FLEX_HOME}/js/libs" />
+ <mkdir dir="${FLEX_HOME}/frameworks/js/libs" />
<copy todir="${FLEX_HOME}/js/lib" failOnError="false" overwrite="true">
<fileset dir="${FALCON_HOME}/js/lib">
<include name="**/**"/>
</fileset>
</copy>
- <copy todir="${FLEX_HOME}/js/libs" failOnError="false" overwrite="true">
- <fileset dir="${FALCON_HOME}/js/libs">
+ <copy todir="${FLEX_HOME}/frameworks/js/libs" failOnError="false" overwrite="true">
+ <fileset dir="${FALCON_HOME}/frameworks/js/libs">
<include name="**/**"/>
</fileset>
</copy>