flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ftho...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - Can't use static to set what compilers we will use.
Date Fri, 26 Jun 2015 15:13:13 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop bb8dcba82 -> 6c98a0ac3


Can't use static to set what compilers we will use.

IntelliJ seems to use the same process for compiling depend
projects, so, we need to set the compilers class to use in each
entry point.


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6c98a0ac
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6c98a0ac
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6c98a0ac

Branch: refs/heads/develop
Commit: 6c98a0ac3b339e8bc8f40461d40302d27ee9a9a1
Parents: bb8dcba
Author: Frédéric THOMAS <webdoublefx@gmail.com>
Authored: Fri Jun 26 16:12:04 2015 +0100
Committer: Frédéric THOMAS <webdoublefx@gmail.com>
Committed: Fri Jun 26 16:12:54 2015 +0100

----------------------------------------------------------------------
 flex-compiler-oem/src/flex2/tools/Compc.java | 11 ++++++-----
 flex-compiler-oem/src/flex2/tools/Mxmlc.java | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c98a0ac/flex-compiler-oem/src/flex2/tools/Compc.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/flex2/tools/Compc.java b/flex-compiler-oem/src/flex2/tools/Compc.java
index 44aae0c..9186cbc 100644
--- a/flex-compiler-oem/src/flex2/tools/Compc.java
+++ b/flex-compiler-oem/src/flex2/tools/Compc.java
@@ -28,11 +28,6 @@ import java.lang.reflect.InvocationTargetException;
  */
 public class Compc extends Tool {
 
-    static {
-        COMPILER = COMPC.class;
-        JS_COMPILER = CompJSC.class;
-    }
-
     /**
      * The entry-point for Mxmlc.
      * Note that if you change anything in this method, make sure to check Compc, Shell,
and
@@ -47,11 +42,17 @@ public class Compc extends Tool {
 
     public static int compcNoExit(String[] args) throws InvocationTargetException, NoSuchMethodException,
InstantiationException, IllegalAccessException {
 
+        COMPILER = COMPC.class;
+        JS_COMPILER = CompJSC.class;
+
         return compile(args);
     }
 
     public static void compc(String[] args) throws InvocationTargetException, NoSuchMethodException,
InstantiationException, IllegalAccessException {
 
+        COMPILER = COMPC.class;
+        JS_COMPILER = CompJSC.class;
+
         compile(args);
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6c98a0ac/flex-compiler-oem/src/flex2/tools/Mxmlc.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/flex2/tools/Mxmlc.java b/flex-compiler-oem/src/flex2/tools/Mxmlc.java
index 71d271f..93ed8e2 100644
--- a/flex-compiler-oem/src/flex2/tools/Mxmlc.java
+++ b/flex-compiler-oem/src/flex2/tools/Mxmlc.java
@@ -47,11 +47,6 @@ public final class Mxmlc extends Tool {
 
     public static final String FILE_SPECS = "file-specs";
 
-    static {
-        COMPILER = MXMLC.class;
-        JS_COMPILER = MxmlJSC.class;
-    }
-
     /**
      * The entry-point for Mxmlc.
      * Note that if you change anything in this method, make sure to check Compc, Shell,
and
@@ -66,11 +61,17 @@ public final class Mxmlc extends Tool {
 
     public static int mxmlcNoExit(String[] args) throws InvocationTargetException, NoSuchMethodException,
InstantiationException, IllegalAccessException {
 
+        COMPILER = MXMLC.class;
+        JS_COMPILER = MxmlJSC.class;
+
         return compile(args);
     }
 
     public static void mxmlc(String[] args) throws InvocationTargetException, NoSuchMethodException,
InstantiationException, IllegalAccessException {
 
+        COMPILER = MXMLC.class;
+        JS_COMPILER = MxmlJSC.class;
+
         compile(args);
     }
 


Mime
View raw message