royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] 01/02: Revert "try to pick up options from system properties as well"
Date Sun, 15 Oct 2017 21:52:35 GMT
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

commit fa72ad1b5c7ecb99357edacbd3e2fbe5a61c6b36
Author: Alex Harui <aharui@apache.org>
AuthorDate: Sun Oct 15 14:36:53 2017 -0700

    Revert "try to pick up options from system properties as well"
    
    This reverts commit ef15b0c6f065f134842a2bea1dd9dee4441ccd11.
---
 .../main/java/org/apache/royale/utils/EnvProperties.java   | 14 +++-----------
 1 file changed, 3 insertions(+), 11 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 57c63f6..346e857 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,12 +111,8 @@ public class EnvProperties {
 	        // Ignore
         }
 		
-        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);
+		SDK = p.getProperty(prefix + "FLEX_HOME", System.getenv("FLEX_HOME"));
+		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);
@@ -135,11 +131,7 @@ public class EnvProperties {
 		FDBG = p.getProperty(prefix + "FLASHPLAYER_DEBUGGER", System.getenv("FLASHPLAYER_DEBUGGER"));
 		System.out.println("environment property - FLASHPLAYER_DEBUGGER = " + FDBG);
 
-		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);
+		ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME"));
 		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" <commits@royale.apache.org>.

Mime
View raw message