Repository: flex-falcon Updated Branches: refs/heads/develop 2af5714e4 -> 8e3e0af7c
assume where playerglobal should be Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0c2510b6 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0c2510b6 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0c2510b6 Branch: refs/heads/develop Commit: 0c2510b6bc550e58c82cd229a5cfff87094de339 Parents: 2af5714 Author: Alex Harui <[email protected]> Authored: Fri Sep 15 14:16:26 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Sep 15 14:16:26 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/flex/compiler/config/Configuration.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0c2510b6/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java index 3c8465d..6c7475d 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java +++ b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java @@ -4129,9 +4129,7 @@ public class Configuration { // Look at property file first, if it exists, and see if the particular property // is defined. If not found, then look for the environment variable. - // If there is neither leave the token in place since it is easier to - // diagnose the problem with a token in the error message path then it is with - // a "" in the path. + // If there is neither use libs/player Properties envProperties = loadEnvPropertyFile(); String playerglobalHome = envProperties != null @@ -4141,7 +4139,7 @@ public class Configuration if (playerglobalHome == null) playerglobalHome = buffer.getToken("env.PLAYERGLOBAL_HOME"); if (playerglobalHome == null) - playerglobalHome = PLAYERGLOBAL_HOME_TOKEN; + playerglobalHome = "libs/player"; String airHome = envProperties != null ? envProperties.getProperty("env.AIR_HOME", System.getenv("AIR_HOME")) : System.getenv("AIR_HOME"); @@ -4149,7 +4147,7 @@ public class Configuration if (airHome == null) airHome = buffer.getToken("env.AIR_HOME"); if (airHome == null) - airHome = AIR_HOME_TOKEN; + airHome = "libs/air"; pathElement = pathElement.replace(PLAYERGLOBAL_HOME_TOKEN, playerglobalHome); pathElement = pathElement.replace(AIR_HOME_TOKEN, airHome);
