Return-Path: 
 <commits-return-9698-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B1BA810C38
	for <apmail-flex-commits-archive@www.apache.org>;
 Wed, 26 Feb 2014 01:15:17 +0000 (UTC)
Received: (qmail 75460 invoked by uid 500); 26 Feb 2014 01:15:17 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 75419 invoked by uid 500); 26 Feb 2014 01:15:17 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 75412 invoked by uid 99); 26 Feb 2014 01:15:17 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Feb 2014 01:15:17 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id B6FD592D434; Wed, 26 Feb 2014 01:15:16 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aharui@apache.org
To: commits@flex.apache.org
Message-Id: <5f6d90e0e66c4a04a77631e5da451aae@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [flex-sdk] [refs/heads/release4.12.0] - fix up
 -config.xml files with player version, swf version and locale
Date: Wed, 26 Feb 2014 01:15:16 +0000 (UTC)

Repository: flex-sdk
Updated Branches:
  refs/heads/release4.12.0 874716440 -> 296ca0195


fix up -config.xml files with player version, swf version and locale


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

Branch: refs/heads/release4.12.0
Commit: 296ca0195439c2d2863f027f58e4f2478105b6ef
Parents: 8747164
Author: Alex Harui <aharui@apache.org>
Authored: Tue Feb 25 17:14:34 2014 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Feb 25 17:15:06 2014 -0800

----------------------------------------------------------------------
 installer.xml | 61 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/296ca019/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index bb7bd0e..49e9e97 100644
--- a/installer.xml
+++ b/installer.xml
@@ -129,6 +129,13 @@
         <property name="flash.sdk.url.file" refid="${flash.sdk.url.file.ref}" />
         <property name="flash.sdk.swfversion.ref" value="flash.sdk.swfversion.${flash.sdk.version}" />
         <property name="flash.sdk.swfversion" refid="${flash.sdk.swfversion.ref}" />
+        <property name="flash.sdk.default.swfversion.ref" value="flash.sdk.swfversion.${playerglobal.version}" />
+        <property name="flash.sdk.default.swfversion" refid="${flash.sdk.default.swfversion.ref}" />
+        <condition property="flash.swfversion.changed" value="true">
+            <not>
+                <equals arg1="${flash.sdk.swfversion}" arg2="${flash.sdk.default.swfversion}" />
+            </not>
+        </condition>
     </target>
     
     <target name="install" depends="get-data,check-binary,ask-licenses,get-third-party-files,fixup-config-files" description="Converts binary package to IDE compatible folder">
@@ -587,15 +594,53 @@
 
     <target name="fixup-config-files" depends="flex-sdk-description-flash,flex-sdk-description-air,flex-sdk-description-locale">
         <echo>${INFO_INSTALLING_CONFIG_FILES}</echo>
+        <antcall target="fixup-config-files-version" />
+        <antcall target="fixup-config-files-swfversion" />
+        <antcall target="fixup-config-files-locale" />
+    </target>
+    
+    <target name="fixup-config-files-version" if="flash.version.changed">
         <replace file="${FLEX_HOME}/frameworks/flex-config.xml">
-            <replacefilter token="@playerversion@"
-                            value="${flash.sdk.version}"/>
-            <replacefilter token="@swfversion@"
-                            value="${flash.sdk.swfversion}"/>
-            <replacefilter token="@locale@"
-                            value="${bundle}"/>
-            <replacefilter token="{playerglobalHome}"
-                            value="libs/player"/>
+            <replacefilter token="&lt;target-player&gt;${playerglobal.version}&lt;/target-player&gt;"
+                            value="&lt;target-player&gt;${flash.sdk.version}&lt;/target-player&gt;"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/air-config.xml">
+            <replacefilter token="&lt;target-player&gt;${playerglobal.version}&lt;/target-player&gt;"
+            value="&lt;target-player&gt;${flash.sdk.version}&lt;/target-player&gt;"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/airmobile-config.xml">
+            <replacefilter token="&lt;target-player&gt;${playerglobal.version}&lt;/target-player&gt;"
+            value="&lt;target-player&gt;${flash.sdk.version}&lt;/target-player&gt;"/>
+        </replace>
+    </target>
+    
+    <target name="fixup-config-files-swfversion" if="flash.swfversion.changed">
+        <replace file="${FLEX_HOME}/frameworks/flex-config.xml">
+            <replacefilter token="&lt;swf-version&gt;${flash.sdk.default.swfversion}&lt;/swf-version&gt;"
+                            value="&lt;swf-version&gt;${flash.sdk.swfversion}&lt;/swf-version&gt;"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/air-config.xml">
+            <replacefilter token="&lt;swf-version&gt;${flash.sdk.default.swfversion}&lt;/swf-version&gt;"
+            value="&lt;swf-version&gt;${flash.sdk.swfversion}&lt;/swf-version&gt;"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/airmobile-config.xml">
+            <replacefilter token="&lt;swf-version&gt;${flash.sdk.default.swfversion}&lt;/swf-version&gt;"
+            value="&lt;swf-version&gt;${flash.sdk.swfversion}&lt;/swf-version&gt;"/>
+        </replace>
+    </target>
+    
+    <target name="fixup-config-files-locale" if="locale.changed">
+        <replace file="${FLEX_HOME}/frameworks/flex-config.xml">
+            <replacefilter token="&lt;locale-element&gt;${locale}&lt;/locale-element&gt;"
+                            value="&lt;locale-element&gt;${bundle}&lt;/locale-element&gt;"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/air-config.xml">
+            <replacefilter token="&lt;locale-element&gt;${locale}&lt;/locale-element&gt;"
+            value="&lt;locale-element&gt;${bundle}&lt;/locale-element&gt;"/>
+        </replace>
+        <replace file="${FLEX_HOME}/frameworks/airmobile-config.xml">
+            <replacefilter token="&lt;locale-element&gt;${locale}&lt;/locale-element&gt;"
+            value="&lt;locale-element&gt;${bundle}&lt;/locale-element&gt;"/>
         </replace>
     </target>