flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [1/2] git commit: [flex-falcon] [refs/heads/develop] - Update VF2JS config defaults to point to new JS framework location.
Date Wed, 06 Aug 2014 10:11:59 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 68a73fc46 -> b79ede7c9


Update VF2JS config defaults to point to new JS framework location.

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>


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

Branch: refs/heads/develop
Commit: 69c863d81c08503a143c7b42fd15cc1d12032e18
Parents: 68a73fc
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Tue Aug 5 12:12:14 2014 +0200
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Tue Aug 5 12:12:14 2014 +0200

----------------------------------------------------------------------
 .../driver/js/goog/JSGoogConfiguration.java     |  2 +-
 .../driver/js/vf2js/JSVF2JSConfiguration.java   | 23 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/69c863d8/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index d54809d..e5216e6 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -144,7 +144,7 @@ public class JSGoogConfiguration extends JSConfiguration
     // 'sdk-js-lib'
     //
 
-    private List<String> sdkJSLib = new ArrayList<String>();
+    protected List<String> sdkJSLib = new ArrayList<String>();
 
     public List<String> getSDKJSLib()
     {

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/69c863d8/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/JSVF2JSConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/JSVF2JSConfiguration.java
b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/JSVF2JSConfiguration.java
index ec431ca..b98fb37 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/JSVF2JSConfiguration.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/JSVF2JSConfiguration.java
@@ -19,6 +19,8 @@
 
 package org.apache.flex.compiler.internal.driver.js.vf2js;
 
+import java.util.List;
+
 import org.apache.flex.compiler.clients.MXMLJSC;
 import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
 
@@ -59,4 +61,25 @@ public class JSVF2JSConfiguration extends JSGoogConfiguration
         return closureLib;
     }
 
+    //
+    // 'sdk-js-lib'
+    //
+
+    public List<String> getSDKJSLib()
+    {
+        if (sdkJSLib.size() == 0)
+        {
+            try
+            {
+                String path = getAbsolutePathFromPathRelativeToMXMLC(
+                            "../../../../frameworks/js/vf2js/src");
+
+                sdkJSLib.add(path);
+            }
+            catch (Exception e) { /* better to try and fail... */ }
+        }
+        
+        return sdkJSLib;
+    }
+
 }


Mime
View raw message