You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/08/01 21:53:33 UTC

[royale-compiler] branch develop updated (9adc404 -> 32ac367)

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.


    from 9adc404  handle text in paragraphelements
     new 61a8932  pick up GOOG_HOME directly
     new 32ac367  treat XML and HTTPService as any other instance for now

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../compiler/internal/driver/js/goog/JSGoogConfiguration.java      | 7 ++++++-
 .../royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java      | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)


[royale-compiler] 02/02: treat XML and HTTPService as any other instance for now

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 32ac367d89b24c0f872a4a8be2b1d850606616d3
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Aug 1 14:53:21 2018 -0700

    treat XML and HTTPService as any other instance for now
---
 .../royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
index a3ded60..d15fcb3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
@@ -149,6 +149,10 @@ public class MXMLNodeSwitch implements IASNodeStrategy
         case MXMLObjectID:
             visitor.visitObject((IMXMLObjectNode) node);
         	break;
+        case MXMLHTTPServiceID:
+        case MXMLXMLID:
+            visitor.visitInstance((IMXMLInstanceNode) node);
+            break;
         case MXMLApplicationID:
         case MXMLBindingAttributeID:
         case MXMLClassID:
@@ -160,7 +164,6 @@ public class MXMLNodeSwitch implements IASNodeStrategy
         case MXMLDesignLayerID:
         case MXMLEffectSpecifierID:
         case MXMLFunctionID:
-        case MXMLHTTPServiceID:
         case MXMLHTTPServiceRequestID:
         case MXMLLibraryID:
         case MXMLModelID:
@@ -175,7 +178,6 @@ public class MXMLNodeSwitch implements IASNodeStrategy
         case MXMLResourceID:
         case MXMLWebServiceID:
         case MXMLWebServiceOperationID:
-        case MXMLXMLID:
         case MXMLXMLListID:
         default:
             throw new IllegalArgumentException(


[royale-compiler] 01/02: pick up GOOG_HOME directly

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 61a8932677ee93bcd537310ed0f0cb12eb009fe4
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Aug 1 14:52:53 2018 -0700

    pick up GOOG_HOME directly
---
 .../compiler/internal/driver/js/goog/JSGoogConfiguration.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 01cd133..b6c6d7b 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -71,8 +71,13 @@ public class JSGoogConfiguration extends JSConfiguration
         {
             if (closureLib.equals(""))
             {
-                return getAbsolutePathFromPathRelativeToMXMLC(
+            	if (System.getenv("GOOG_HOME") != null)
+            		closureLib = System.getenv("GOOG_HOME");
+            	if (closureLib.equals(""))
+            	{
+            		return getAbsolutePathFromPathRelativeToMXMLC(
                         "../../js/lib/google/closure-library");
+            	}
             }
         }
         catch (Exception e) { /* better to try and fail... */ }