flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshtynj...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - compiler: added new {flexVersion} token for flex-config.xml files so that they can work better with Maven SWCs that have the version number in the file name
Date Sat, 14 Jan 2017 01:58:56 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop a55f38942 -> de5c2b85b


compiler: added new {flexVersion} token for flex-config.xml files so that they can work better
with Maven SWCs that have the version number in the file name


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

Branch: refs/heads/develop
Commit: de5c2b85b3500d5776e3d6fd11e03705dba06f58
Parents: a55f389
Author: Josh Tynjala <joshtynjala@apache.org>
Authored: Fri Jan 13 17:58:22 2017 -0800
Committer: Josh Tynjala <joshtynjala@apache.org>
Committed: Fri Jan 13 17:58:50 2017 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/flex/compiler/config/Configuration.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/de5c2b85/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 0a95de3..f37b9f7 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
@@ -3902,6 +3902,7 @@ public class Configuration
     // Special Case for Apache.  These are not currently exposed with command line options.
     public static final String PLAYERGLOBAL_HOME_TOKEN = "{playerglobalHome}";
     public static final String AIR_HOME_TOKEN = "{airHome}";
+    public static final String FLEX_VERSION_TOKEN = "{flexVersion}";
 
     public static final String STRICT = "compiler.strict";
     public static final String AS3 = "compiler.as3";
@@ -3963,6 +3964,7 @@ public class Configuration
         for (String pathElement : pathElements)
         {
             pathElement = expandRuntimeTokens(pathElement, configurationValue.getBuffer());
+            pathElement = pathElement.replace(FLEX_VERSION_TOKEN, getClass().getPackage().getImplementationVersion());
 
             String playerExpandedPath = pathElement.replaceAll(TARGET_PLAYER_MAJOR_VERSION_TOKEN_REGEX_ESCAPED,
                     targetPlayerMajorVersion).replaceAll(TARGET_PLAYER_MINOR_VERSION_TOKEN_REGEX_ESCAPED,


Mime
View raw message