flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [43/50] [abbrv] git commit: [flex-sdk] [refs/heads/new_android_skins] - don't touch locale in -config.xml and flex-description
Date Wed, 19 Mar 2014 01:41:24 GMT
don't touch locale in -config.xml and flex-description


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

Branch: refs/heads/new_android_skins
Commit: 54d0aea1e7e10581e1f683db2831df09bc689ac9
Parents: 65294c8
Author: Alex Harui <aharui@apache.org>
Authored: Sun Mar 16 00:09:26 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sun Mar 16 00:09:26 2014 -0700

----------------------------------------------------------------------
 installer.xml | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54d0aea1/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 67935b5..118643c 100644
--- a/installer.xml
+++ b/installer.xml
@@ -101,11 +101,6 @@
             <equals arg1="${air.version}" arg2="${air.sdk.version}" />
         </not>
     </condition>
-    <condition property="locale.changed" value="true">
-        <not>
-            <equals arg1="${locale}" arg2="${bundle}" />
-        </not>
-    </condition>
     
     <condition property="java.home" value="${env.JAVA_HOME}" >
         <and>
@@ -593,11 +588,10 @@
     </target>
 
 
-    <target name="fixup-config-files" depends="flex-sdk-description-flash,flex-sdk-description-air,flex-sdk-description-locale">
+    <target name="fixup-config-files" depends="flex-sdk-description-flash,flex-sdk-description-air">
         <echo>${INFO_INSTALLING_CONFIG_FILES}</echo>
         <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"/>
@@ -642,21 +636,6 @@
         </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>
-
     <target name="flex-sdk-description-flash" if="flash.version.changed">
         <replace file="${FLEX_HOME}/flex-sdk-description.xml">
             <replacefilter token="FP${playerglobal.version}"
@@ -669,12 +648,5 @@
                 value="AIR${air.sdk.version}"/>
         </replace>
     </target>
-    
-    <target name="flex-sdk-description-locale" if="locale.changed">
-        <replace file="${FLEX_HOME}/flex-sdk-description.xml">
-            <replacefilter token="${locale}"
-                value="${bundle}"/>
-        </replace>
-    </target>
-    
+        
 </project>


Mime
View raw message