You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2015/06/27 21:42:23 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - Added jasmine
externs - uncommented the externc build
Repository: flex-falcon
Updated Branches:
refs/heads/develop 9775608ba -> a305f10ad
Added jasmine externs - uncommented the externc 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/599ebc95
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/599ebc95
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/599ebc95
Branch: refs/heads/develop
Commit: 599ebc957e93a39be5fcc87a271bca9b7e47df04
Parents: 9775608
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Sat Jun 27 20:41:00 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Sat Jun 27 20:41:00 2015 +0100
----------------------------------------------------------------------
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/599ebc95/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 99a403d..94741b5 100644
--- a/build.xml
+++ b/build.xml
@@ -606,12 +606,12 @@
<target name="externc.jasmine.swc" >
<echo>${env.ASJS_HOME}</echo>
- <!--<java jar="${basedir}/compiler.jx/lib/externc.jar" fork="true"
+ <java jar="${basedir}/compiler.jx/lib/externc.jar" fork="true"
failonerror="false">
<arg value="+flexlib=${env.ASJS_HOME}/frameworks" />
<arg value="-debug" />
<arg value="-load-config=${basedir}/externs/jasmine/jasmine-compile-config.xml" />
- </java>-->
+ </java>
<java jar="${basedir}/compiler/generated/dist/sdk/lib/falcon-compc.jar" fork="true"
failonerror="true">
<arg value="+flexlib=${env.ASJS_HOME}/frameworks" />
[2/2] git commit: [flex-falcon] [refs/heads/develop] - Fix: EXTERNC -
IMPORT NOT EMITTED
Posted by ft...@apache.org.
Fix: EXTERNC - IMPORT NOT EMITTED
Should apply to global functions too.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a305f10a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a305f10a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a305f10a
Branch: refs/heads/develop
Commit: a305f10ad8d4ef341ae25282a84ff330be524dbc
Parents: 599ebc9
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Sat Jun 27 20:42:06 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Sat Jun 27 20:42:06 2015 +0100
----------------------------------------------------------------------
.../externals/reference/FunctionReference.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a305f10a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
index 83ad795..8232d69 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
@@ -19,13 +19,12 @@
package org.apache.flex.compiler.internal.codegen.externals.reference;
-import java.io.File;
-
+import com.google.javascript.rhino.JSDocInfo;
+import com.google.javascript.rhino.Node;
import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
import org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
-import com.google.javascript.rhino.JSDocInfo;
-import com.google.javascript.rhino.Node;
+import java.io.File;
public class FunctionReference extends BaseReference
{
@@ -80,7 +79,7 @@ public class FunctionReference extends BaseReference
sb.append("{\n");
sb.append("\n");
- printImports();
+ printImports(sb);
emitComment(sb);
@@ -117,9 +116,13 @@ public class FunctionReference extends BaseReference
sb.append("}\n"); // package
}
- private void printImports()
+ private void printImports(final StringBuilder sb)
{
- // TODO Auto-generated method stub
+ final String returnType = transformReturnString();
+ if (returnType.contains("."))
+ {
+ sb.append("import ").append(returnType).append(";");
+ }
}