You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/03/02 17:45:00 UTC

[1/2] git commit: [flex-sdk] [refs/heads/release4.12.0] - replace tokens in config files

Repository: flex-sdk
Updated Branches:
  refs/heads/release4.12.0 4fb600686 -> 470705c00


replace tokens in config files


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

Branch: refs/heads/release4.12.0
Commit: 563c8e14766ee2b355f5c72ce8ec25c877c4b70c
Parents: 306a2f0
Author: Alex Harui <ah...@apache.org>
Authored: Sun Mar 2 08:42:34 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Mar 2 08:43:40 2014 -0800

----------------------------------------------------------------------
 installer.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/563c8e14/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index baeecbc..67935b5 100644
--- a/installer.xml
+++ b/installer.xml
@@ -598,6 +598,18 @@
         <antcall target="fixup-config-files-version" />
         <antcall target="fixup-config-files-swfversion" />
         <antcall target="fixup-config-files-locale" />
+        <replace file="${FLEX_HOME}/frameworks/flex-config.xml">
+            <replacefilter token="{playerglobalHome}"
+                value="libs/player"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/air-config.xml">
+            <replacefilter token="{airHome}/frameworks/libs"
+            value="libs"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/airmobile-config.xml">
+            <replacefilter token="{airHome}/frameworks/libs"
+            value="libs"/>
+        </replace>
     </target>
     
     <target name="fixup-config-files-version" if="flash.version.changed">


[2/2] git commit: [flex-sdk] [refs/heads/release4.12.0] - Merge branch 'develop' into release4.12.0

Posted by ah...@apache.org.
Merge branch 'develop' into release4.12.0


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

Branch: refs/heads/release4.12.0
Commit: 470705c00049e2de12dcb55dd165e81d165a15ef
Parents: 4fb6006 563c8e1
Author: Alex Harui <ah...@apache.org>
Authored: Sun Mar 2 08:44:15 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Mar 2 08:44:15 2014 -0800

----------------------------------------------------------------------
 installer.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------