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/02/21 08:23:07 UTC
git commit: [flex-sdk] [refs/heads/release4.12.0] - fix up
flex-sdk-description
Repository: flex-sdk
Updated Branches:
refs/heads/release4.12.0 5dfc698ae -> 3ead8cc1d
fix up flex-sdk-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/3ead8cc1
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3ead8cc1
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3ead8cc1
Branch: refs/heads/release4.12.0
Commit: 3ead8cc1d775edb758fda3bb66be45abc7167bca
Parents: 5dfc698
Author: Alex Harui <ah...@apache.org>
Authored: Thu Feb 20 23:22:02 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Feb 20 23:22:37 2014 -0800
----------------------------------------------------------------------
installer.xml | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3ead8cc1/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 3dd139e..2e9ad0f 100644
--- a/installer.xml
+++ b/installer.xml
@@ -91,6 +91,22 @@
<isset property="installer" />
</condition>
+ <condition property="flash.version.changed" value="true">
+ <not>
+ <equals arg1="${playerglobal.version}" arg2="${flash.sdk.version}" />
+ </not>
+ </condition>
+ <condition property="air.version.changed" value="true">
+ <not>
+ <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>
<available file="${env.JAVA_HOME}" type="dir" />
@@ -566,7 +582,7 @@
</target>
- <target name="fixup-config-files">
+ <target name="fixup-config-files" depends="flex-sdk-description-flash,flex-sdk-description-air,flex-sdk-description-locale">
<echo>${INFO_INSTALLING_CONFIG_FILES}</echo>
<replace file="${FLEX_HOME}/frameworks/flex-config.xml">
<replacefilter token="@playerversion@"
@@ -579,5 +595,25 @@
value="libs/player"/>
</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}"
+ value="FP${flash.sdk.version}"/>
+ </replace>
+ </target>
+ <target name="flex-sdk-description-air" if="air.version.changed">
+ <replace file="${FLEX_HOME}/flex-sdk-description.xml">
+ <replacefilter token="AIR${air.version}"
+ 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>