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 2017/10/15 07:10:12 UTC

[royale-compiler] branch feature/rename updated: try to pick up options from system properties as well

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

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


The following commit(s) were added to refs/heads/feature/rename by this push:
     new ef15b0c  try to pick up options from system properties as well
ef15b0c is described below

commit ef15b0c6f065f134842a2bea1dd9dee4441ccd11
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Oct 15 00:10:03 2017 -0700

    try to pick up options from system properties as well
---
 .../main/java/org/apache/royale/utils/EnvProperties.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
index 346e857..57c63f6 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
@@ -111,8 +111,12 @@ public class EnvProperties {
 	        // Ignore
         }
 		
-		SDK = p.getProperty(prefix + "FLEX_HOME", System.getenv("FLEX_HOME"));
-		System.out.println("environment property - FLEX_HOME = " + SDK);
+        SDK = System.getProperty("FLEX_HOME");
+        if (SDK == null)
+        	SDK = p.getProperty(prefix + "FLEX_HOME", System.getenv("FLEX_HOME"));
+        else
+            System.out.println("system property - FLEX_HOME = " + SDK);
+        System.out.println("environment property - FLEX_HOME = " + SDK);
 		
 		FPSDK = p.getProperty(prefix + "PLAYERGLOBAL_HOME", System.getenv("PLAYERGLOBAL_HOME"));
 		System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK);
@@ -131,7 +135,11 @@ public class EnvProperties {
 		FDBG = p.getProperty(prefix + "FLASHPLAYER_DEBUGGER", System.getenv("FLASHPLAYER_DEBUGGER"));
 		System.out.println("environment property - FLASHPLAYER_DEBUGGER = " + FDBG);
 
-		ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME"));
+		ASJS = System.getProperty("ASJS_HOME");
+		if (ASJS == null)
+			ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME"));
+		else
+			System.out.println("system property - ASJS_HOME = " + ASJS);
 		if (ASJS == null)
 			ASJS = FilenameNormalization.normalize("../../../../royale-asjs");
 		System.out.println("environment property - ASJS_HOME = " + ASJS);

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].