You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/07/08 07:18:22 UTC
git commit: [flex-utilities] [refs/heads/develop] - FLEX-34298 Log
versionID rather than version if that's set
Repository: flex-utilities
Updated Branches:
refs/heads/develop fd3cf521a -> 186a86dee
FLEX-34298 Log versionID rather than version if that's set
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/186a86de
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/186a86de
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/186a86de
Branch: refs/heads/develop
Commit: 186a86dee0606b13ee8266e871db270e45c242ed
Parents: fd3cf52
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jul 8 15:18:02 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jul 8 15:18:02 2014 +1000
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/186a86de/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 848f43b..27c31c1 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -1050,12 +1050,21 @@ variables are not required because the locations of these pieces are known.
directoryBtn.enabled = false;
AIR_VERSION = airVersion.selectedItem.version;
+ var airVersionID:String = airVersion.selectedItem.versionID;
FLASH_PLAYER_VERSION = flashPlayerVersion.selectedItem.version;
+ var flashVersionID:String = flashPlayerVersion.selectedItem.versionID;
setXMLVariables(); // as AIR and Flash version may of changed
- log("AIR version " + AIR_VERSION);
- log("Flash Player version " + FLASH_PLAYER_VERSION);
+ if (airVersionID)
+ log("AIR version " + airVersionID);
+ else
+ log("AIR version " + AIR_VERSION);
+
+ if (flashVersionID)
+ log("Flash Player version " + flashVersionID);
+ else
+ log("Flash Player version " + FLASH_PLAYER_VERSION);
if (!legacy)
{