You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ad...@apache.org on 2016/01/13 22:38:06 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - fixed wrong
double-quote characters and variable reference in .bat files.
Repository: flex-falcon
Updated Branches:
refs/heads/develop d71c431cf -> 9f31b8793
fixed wrong double-quote characters and variable reference in .bat
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/94544954
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/94544954
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/94544954
Branch: refs/heads/develop
Commit: 945449549ed91914193db852e17014cafb440c5d
Parents: d71c431
Author: Andy Dufilie <ad...@apache.org>
Authored: Wed Jan 13 09:29:37 2016 -0500
Committer: Andy Dufilie <ad...@apache.org>
Committed: Wed Jan 13 09:29:37 2016 -0500
----------------------------------------------------------------------
compiler.jx/bin/asjsc | 2 +-
compiler.jx/bin/asjsc.bat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/94544954/compiler.jx/bin/asjsc
----------------------------------------------------------------------
diff --git a/compiler.jx/bin/asjsc b/compiler.jx/bin/asjsc
index e03bb08..6c65155 100755
--- a/compiler.jx/bin/asjsc
+++ b/compiler.jx/bin/asjsc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" -external-library-path="$SCRIPT_HOME/../libs/JS.swc” "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" -external-library-path="$SCRIPT_HOME/../libs/JS.swc" "$@"
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/94544954/compiler.jx/bin/asjsc.bat
----------------------------------------------------------------------
diff --git a/compiler.jx/bin/asjsc.bat b/compiler.jx/bin/asjsc.bat
index dda17aa..041fbcf 100644
--- a/compiler.jx/bin/asjsc.bat
+++ b/compiler.jx/bin/asjsc.bat
@@ -26,4 +26,4 @@ if "x%FALCON_HOME%"=="x" (set FALCON_HOME=%~dp0..) else echo Using Falcon codeb
if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\mxmlc.jar" -external-library-path="$FALCON_HOME\libs\JS.swc” %*
\ No newline at end of file
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\mxmlc.jar" -external-library-path="%FALCON_HOME%\libs\JS.swc" %*
\ No newline at end of file
[2/2] git commit: [flex-falcon] [refs/heads/develop] - added support
for --js flag inside -js-compiler-option
Posted by ad...@apache.org.
added support for --js flag inside -js-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/9f31b879
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9f31b879
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9f31b879
Branch: refs/heads/develop
Commit: 9f31b8793d3f55ecd6269c8a0e943b064dbe39f5
Parents: 9454495
Author: Andy Dufilie <ad...@apache.org>
Authored: Wed Jan 13 16:38:01 2016 -0500
Committer: Andy Dufilie <ad...@apache.org>
Committed: Wed Jan 13 16:38:01 2016 -0500
----------------------------------------------------------------------
.../apache/flex/compiler/utils/JSClosureCompilerWrapper.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9f31b879/compiler.jx/src/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java b/compiler.jx/src/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java
index 05e0328..e353dc8 100644
--- a/compiler.jx/src/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java
+++ b/compiler.jx/src/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java
@@ -145,10 +145,15 @@ public class JSClosureCompilerWrapper
private void initOptions(List<String> args)
{
+ final String JS_FLAG = "--js ";
+
boolean hasCompilationLevel = false;
boolean hasWarningLevel = false;
for (String s : args)
{
+ if (s.startsWith(JS_FLAG))
+ addJSSourceFile(s.substring(JS_FLAG.length()));
+
if (s.startsWith("--compilation_level ") ||
s.startsWith("-O "))
hasCompilationLevel = true;