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 21:52:34 UTC

[royale-compiler] branch feature/rename updated (ef15b0c -> 713cfe8)

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

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


    from ef15b0c  try to pick up options from system properties as well
     new fa72ad1  Revert "try to pick up options from system properties as well"
     new 713cfe8  generate an env.properties for jenkins so we can point to different branches

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:
 .../main/java/org/apache/royale/utils/EnvProperties.java   | 14 +++-----------
 jenkins.xml                                                | 11 ++++++++++-
 2 files changed, 13 insertions(+), 12 deletions(-)

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

[royale-compiler] 01/02: Revert "try to pick up options from system properties as well"

Posted by ah...@apache.org.
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 <ah...@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" <co...@royale.apache.org>.

[royale-compiler] 02/02: generate an env.properties for jenkins so we can point to different branches

Posted by ah...@apache.org.
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 713cfe828f80361ee1f2ac15720a1320dce813ab
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Oct 15 14:52:22 2017 -0700

    generate an env.properties for jenkins so we can point to different branches
---
 jenkins.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jenkins.xml b/jenkins.xml
index ede556c..fab3965 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -30,7 +30,7 @@
     <!-- (erikdebruin) Hard coded path for Windows, sorry ;-) -->
     <property name="closure.root" location="C:/Google/Closure/Library" />
 
-    <target name="main" depends="clean,init,jflex-download,closure-lib-download"/>
+    <target name="main" depends="clean,init,jflex-download,closure-lib-download,env-properties"/>
 
     <target name="init">
         <mkdir dir="${falcon.jenkins.home}" />
@@ -67,5 +67,14 @@
 
         <delete dir="${closure.root}" />
      </target>
+    
+    <target name="check-env" >
+        <available file="${basedir}/env.properties" type="file"
+            property="env.available" />
+    </target>
+    
+    <target name="env-properties" depends="check-env" unless="env.available" >
+        <echo file="${basedir}/env.properties">env.ASJS_HOME=${env.ASJS_HOME}</echo>
+    </target>
 
 </project>

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