flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [5/5] git commit: [flex-falcon] [refs/heads/develop] - in Eclipse we needed to pick up unittest.properties in order to compile the sdkswctests. Not sure why this suddenly stopped working
Date Tue, 27 May 2014 22:24:43 GMT
in Eclipse we needed to pick up unittest.properties in order to compile the sdkswctests.  Not
sure why this suddenly stopped working


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

Branch: refs/heads/develop
Commit: cab409d5bc9c21cbb83fd7f5bf8cccd2bfb6dc04
Parents: 4738711
Author: Alex Harui <aharui@apache.org>
Authored: Mon May 26 23:20:01 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue May 27 15:21:41 2014 -0700

----------------------------------------------------------------------
 .../flex/compiler/config/Configuration.java     | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cab409d5/compiler/src/org/apache/flex/compiler/config/Configuration.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/config/Configuration.java b/compiler/src/org/apache/flex/compiler/config/Configuration.java
index 5651197..893dead 100644
--- a/compiler/src/org/apache/flex/compiler/config/Configuration.java
+++ b/compiler/src/org/apache/flex/compiler/config/Configuration.java
@@ -20,6 +20,8 @@
 package org.apache.flex.compiler.config;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -3945,7 +3947,23 @@ public class Configuration
         {
             in = getClass().getClassLoader().getResourceAsStream("env.properties");
             if (in == null)
-               return null;
+            {
+                try {
+                    File f = new File("unittest.properties");
+                    in = new FileInputStream( f );
+                    properties = new Properties();
+                    properties.load(in);
+                    in.close();
+                    properties.setProperty("env.PLAYERGLOBAL_HOME", properties.getProperty("PLAYERGLOBAL_HOME"));
+                    properties.setProperty("env.AIR_HOME", properties.getProperty("AIR_HOME"));
+                    properties.setProperty("env.PLAYERGLOBAL_VERSION", properties.getProperty("PLAYERGLOBAL_VERSION"));
+                    return properties;
+                } catch (FileNotFoundException e) {
+                    return null;
+                } catch (IOException e) {
+                    return null;
+                }
+            }
             
             properties = new Properties();
             properties.load(in);


Mime
View raw message