adjust xml format so it is less hacky
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/5aabf939 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/5aabf939 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/5aabf939 Branch: refs/heads/develop Commit: 5aabf939854833134952b47f05059481c08a6e25 Parents: 19145b3 Author: Alex Harui <aha...@apache.org> Authored: Mon Jan 20 21:15:11 2014 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Mon Jan 20 21:15:11 2014 -0800 ---------------------------------------------------------------------- installer/src/InstallApacheFlex.mxml | 4 +--- installer/src/installer/sdk-installer-config-4.0.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5aabf939/installer/src/InstallApacheFlex.mxml ---------------------------------------------------------------------- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index f877c89..36dfaaa 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -450,9 +450,7 @@ variables are not required because the locations of these pieces are known. for each (var productVersion:XML in productVersionList) { var shortName:String = productVersion.@file.toString(); var fileName:String = shortName + (_os.isWindows() ? Constants.ARCHIVE_EXTENSION_WIN : Constants.ARCHIVE_EXTENSION_MAC); - versionString = productVersion.name().toString(); - if (versionString.charAt(0) == "v") - versionString = versionString.substr(1); + versionString = productVersion.@version.toString(); var label:String = productName + " " + versionString; var ver:String = fileName.substr(productPrefix.length).split("-")[0]; var path:String = productVersion.@path.toString(); http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5aabf939/installer/src/installer/sdk-installer-config-4.0.xml ---------------------------------------------------------------------- diff --git a/installer/src/installer/sdk-installer-config-4.0.xml b/installer/src/installer/sdk-installer-config-4.0.xml index 58cfd4f..700e884 100644 --- a/installer/src/installer/sdk-installer-config-4.0.xml +++ b/installer/src/installer/sdk-installer-config-4.0.xml @@ -46,25 +46,25 @@ limitations under the License. - remove the extension from the file name --> <ApacheFlexSDK name="Apache Flex SDK" prefix="apache-flex-sdk-"> <versions> - <v4.9.1 id="4.9.1" path="http://archive.apache.org/dist/flex/4.9.1/binaries/"; file="apache-flex-sdk-4.9.1-bin" /> - <v4.10.0 id="4.10.0" path="http://archive.apache.org/dist/flex/4.10.0/binaries/"; file="apache-flex-sdk-4.10.0-bin" /> - <v4.11.0 id="4.11.0" path="flex/4.11.0/binaries/" file="apache-flex-sdk-4.11.0-bin" default="true"/> - <Nightly id="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/"; file="apache-flex-sdk-4.12.0-bin" /> + <versionA id="4.9.1" version="4.9.1" path="http://archive.apache.org/dist/flex/4.9.1/binaries/"; file="apache-flex-sdk-4.9.1-bin" /> + <versionB id="4.10.0" version="4.10.0" path="http://archive.apache.org/dist/flex/4.10.0/binaries/"; file="apache-flex-sdk-4.10.0-bin" /> + <versionC id="4.11.0" version="4.11.0" path="flex/4.11.0/binaries/" file="apache-flex-sdk-4.11.0-bin" default="true"/> + <Nightly id="Nightly" version="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/"; file="apache-flex-sdk-4.12.0-bin" /> </versions> </ApacheFlexSDK> <ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-"> <versions> - <Nightly id="FlexJSNightly" path="https://builds.apache.org/job/flex-asjs/lastSuccessfulBuild/artifact/out/"; file="apache-flex-flexjs-4.0.1-bin" /> + <Nightly id="FlexJSNightly" version="Nightly" path="https://builds.apache.org/job/flex-asjs/lastSuccessfulBuild/artifact/out/"; file="apache-flex-flexjs-4.0.1-bin" /> </versions> </ApacheFlexJS> <ApacheFlexFalcon name="Apache Flex Falcon" prefix="apache-flex-falcon-" overlay="true"> <versions> - <Nightly id="FlexFalconNightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/"; file="apache-flex-falcon-0.0.1-bin" /> + <Nightly id="FlexFalconNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/"; file="apache-flex-falcon-0.0.1-bin" /> </versions> </ApacheFlexFalcon> <ApacheFlexFalconJX name="Apache Flex FalconJX" prefix="apache-flex-falconjx-" overlay="true"> <versions> - <Nightly id="FlexFalconJXNightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/"; file="apache-flex-falconjx-0.0.1-bin" /> + <Nightly id="FlexFalconJXNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/"; file="apache-flex-falconjx-0.0.1-bin" /> </versions> </ApacheFlexFalconJX> </products>
