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/03/11 05:37:43 UTC
git commit: [flex-utilities] [refs/heads/develop] - make sure version
is in the log. Fix a problem with progress square handling
Repository: flex-utilities
Updated Branches:
refs/heads/develop e615f2ad6 -> d757ec8f1
make sure version is in the log. Fix a problem with progress square handling
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d757ec8f
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d757ec8f
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d757ec8f
Branch: refs/heads/develop
Commit: d757ec8f1f7f92aab2cfac3d801d6f13316d59c3
Parents: e615f2a
Author: Alex Harui <ah...@apache.org>
Authored: Mon Mar 10 21:37:24 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Mar 10 21:37:24 2014 -0700
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d757ec8f/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 900bc40..f2158af 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -375,6 +375,7 @@ variables are not required because the locations of these pieces are known.
CursorManager.setBusyCursor();
updateWindow();
loadXML();
+ logVersion();
}
/**
@@ -902,7 +903,22 @@ variables are not required because the locations of these pieces are known.
doUpdate();
}
}
-
+
+ private function logVersion():void
+ {
+ if (!loggedVersion)
+ {
+ //Current version
+ var applicationDescriptor:XML = NativeApplication.nativeApplication.applicationDescriptor;
+ var xmlns:Namespace = new Namespace(applicationDescriptor.namespace());
+ var currentVersion:String = applicationDescriptor.xmlns::versionNumber.toString();
+
+ // Log the Installer version to help with any support issues that arise.
+ log("Version " + currentVersion + " (" + _os.os + ")", 0);
+ loggedVersion = true;
+ }
+ }
+
protected function shouldUpdate():Boolean {
var shouldUpdate:Boolean = false;
//Current version
@@ -910,12 +926,7 @@ variables are not required because the locations of these pieces are known.
var xmlns:Namespace = new Namespace(applicationDescriptor.namespace());
var currentVersion:String = applicationDescriptor.xmlns::versionNumber.toString();
- if (!loggedVersion)
- {
- // Log the Installer version to help with any support issues that arise.
- log("Version " + currentVersion + " (" + _os.os + ")", 0);
- loggedVersion = true;
- }
+ logVersion();
var availBuildNumbers:Array = _latestVersion.split(".");
var currentBuildNumbers:Array = currentVersion.split(".");
@@ -1464,8 +1475,8 @@ variables are not required because the locations of these pieces are known.
{
if (!Ant.currentAnt.project.status)
updateActivityStep(stepLabels[currentStep], StepItem.ERROR);
- else if (currentStep == stepLabels.length)
- updateActivityStep(stepLabels[currentStep], StepItem.COMPLETE);
+ else if (currentStep == stepLabels.length && currentStep > 0)
+ updateActivityStep(stepLabels[currentStep - 1], StepItem.COMPLETE);
if (Ant.currentAnt.project.status)
tracker.trackInstallerSuccess(APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY, APACHE_FLEX_BIN_DISTRO_VERSION, _os.os);
cleanup(!Ant.currentAnt.project.status);