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/07/18 08:01:28 UTC
[20/22] git commit: [flex-sdk] [refs/heads/develop] - handle
versionID for when two or more config entries have the same version.
versionID is used to differentiate between the config entries
handle versionID for when two or more config entries have the same version. versionID is used to differentiate between the config entries
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/94825389
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/94825389
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/94825389
Branch: refs/heads/develop
Commit: 94825389f46298ef203036887b21b5b47a566f31
Parents: 0bf05aa
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 30 23:09:00 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 30 23:09:00 2014 -0700
----------------------------------------------------------------------
installer.xml | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/94825389/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index f70b0d5..4c75227 100644
--- a/installer.xml
+++ b/installer.xml
@@ -178,27 +178,36 @@
<equals arg1="${air.version}" arg2="${air.sdk.version}" />
</not>
</condition>
- <property name="air.sdk.url.server.ref" value="air.sdk.server.${platform}.${air.sdk.version}" />
+ <condition property="air.sdk.version.ref" value="${air.sdk.versionID}" >
+ <isset property="air.sdk.versionID" />
+ </condition>
+ <property name="air.sdk.version.ref" value="${air.sdk.version}" />
+ <condition property="flash.sdk.version.ref" value="${flash.sdk.versionID}" >
+ <isset property="flash.sdk.versionID" />
+ </condition>
+ <property name="flash.sdk.version.ref" value="${flash.sdk.version}" />
+
+ <property name="air.sdk.url.server.ref" value="air.sdk.server.${platform}.${air.sdk.version.ref}" />
<property name="air.sdk.url.server" refid="${air.sdk.url.server.ref}" />
- <property name="air.sdk.url.folder.ref" value="air.sdk.folder.${platform}.${air.sdk.version}" />
+ <property name="air.sdk.url.folder.ref" value="air.sdk.folder.${platform}.${air.sdk.version.ref}" />
<property name="air.sdk.url.folder" refid="${air.sdk.url.folder.ref}" />
- <property name="air.sdk.url.file.ref" value="air.sdk.file.${platform}.${air.sdk.version}" />
+ <property name="air.sdk.url.file.ref" value="air.sdk.file.${platform}.${air.sdk.version.ref}" />
<property name="air.sdk.url.file" refid="${air.sdk.url.file.ref}" />
- <property name="air.sdk.url.md5.ref" value="air.sdk.md5.${platform}.${air.sdk.version}" />
+ <property name="air.sdk.url.md5.ref" value="air.sdk.md5.${platform}.${air.sdk.version.ref}" />
<condition property="air-has-md5">
<isreference refid="${air.sdk.url.md5.ref}" />
</condition>
- <property name="flash.sdk.url.server.ref" value="flash.sdk.server.${flash.sdk.version}" />
+ <property name="flash.sdk.url.server.ref" value="flash.sdk.server.${flash.sdk.version.ref}" />
<property name="flash.sdk.url.server" refid="${flash.sdk.url.server.ref}" />
- <property name="flash.sdk.url.folder.ref" value="flash.sdk.folder.${flash.sdk.version}" />
+ <property name="flash.sdk.url.folder.ref" value="flash.sdk.folder.${flash.sdk.version.ref}" />
<property name="flash.sdk.url.folder" refid="${flash.sdk.url.folder.ref}" />
- <property name="flash.sdk.url.file.ref" value="flash.sdk.file.${flash.sdk.version}" />
+ <property name="flash.sdk.url.file.ref" value="flash.sdk.file.${flash.sdk.version.ref}" />
<property name="flash.sdk.url.file" refid="${flash.sdk.url.file.ref}" />
- <property name="flash.sdk.url.md5.ref" value="flash.sdk.md5.${flash.sdk.version}" />
+ <property name="flash.sdk.url.md5.ref" value="flash.sdk.md5.${flash.sdk.version.ref}" />
<condition property="flash-has-md5">
<isreference refid="${flash.sdk.url.md5.ref}" />
</condition>
- <property name="flash.sdk.swfversion.ref" value="flash.sdk.swfversion.${flash.sdk.version}" />
+ <property name="flash.sdk.swfversion.ref" value="flash.sdk.swfversion.${flash.sdk.version.ref}" />
<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}" />