Repository: flex-sdk Updated Branches: refs/heads/develop 4502b01e5 -> c502f442c
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/develop Commit: 296ca0195439c2d2863f027f58e4f2478105b6ef Parents: 8747164 Author: Alex Harui <aha...@apache.org> Authored: Tue Feb 25 17:14:34 2014 -0800 Committer: Alex Harui <aha...@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="<target-player>${playerglobal.version}</target-player>" + value="<target-player>${flash.sdk.version}</target-player>"/> + </replace> + <replace file="${FLEX_HOME}/frameworks/air-config.xml"> + <replacefilter token="<target-player>${playerglobal.version}</target-player>" + value="<target-player>${flash.sdk.version}</target-player>"/> + </replace> + <replace file="${FLEX_HOME}/frameworks/airmobile-config.xml"> + <replacefilter token="<target-player>${playerglobal.version}</target-player>" + value="<target-player>${flash.sdk.version}</target-player>"/> + </replace> + </target> + + <target name="fixup-config-files-swfversion" if="flash.swfversion.changed"> + <replace file="${FLEX_HOME}/frameworks/flex-config.xml"> + <replacefilter token="<swf-version>${flash.sdk.default.swfversion}</swf-version>" + value="<swf-version>${flash.sdk.swfversion}</swf-version>"/> + </replace> + <replace file="${FLEX_HOME}/frameworks/air-config.xml"> + <replacefilter token="<swf-version>${flash.sdk.default.swfversion}</swf-version>" + value="<swf-version>${flash.sdk.swfversion}</swf-version>"/> + </replace> + <replace file="${FLEX_HOME}/frameworks/airmobile-config.xml"> + <replacefilter token="<swf-version>${flash.sdk.default.swfversion}</swf-version>" + value="<swf-version>${flash.sdk.swfversion}</swf-version>"/> + </replace> + </target> + + <target name="fixup-config-files-locale" if="locale.changed"> + <replace file="${FLEX_HOME}/frameworks/flex-config.xml"> + <replacefilter token="<locale-element>${locale}</locale-element>" + value="<locale-element>${bundle}</locale-element>"/> + </replace> + <replace file="${FLEX_HOME}/frameworks/air-config.xml"> + <replacefilter token="<locale-element>${locale}</locale-element>" + value="<locale-element>${bundle}</locale-element>"/> + </replace> + <replace file="${FLEX_HOME}/frameworks/airmobile-config.xml"> + <replacefilter token="<locale-element>${locale}</locale-element>" + value="<locale-element>${bundle}</locale-element>"/> </replace> </target>