Updated Branches: refs/heads/develop 79b81427e -> cd397df88
Modify installer to track sdk label (to differentiate between flex sdk, flexjs sdk and flex falcon compiler) Also add ability to track a failure or an abort. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/cd397df8 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/cd397df8 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/cd397df8 Branch: refs/heads/develop Commit: cd397df88cc7740fc74f60a0255641e12748bad6 Parents: 79b8142 Author: Om <bigosma...@gmail.com> Authored: Thu Feb 13 13:15:15 2014 -0800 Committer: Om <bigosma...@gmail.com> Committed: Thu Feb 13 13:15:15 2014 -0800 ---------------------------------------------------------------------- .../org/apache/flex/utilities/common/Constants.as | 1 + installer/.actionScriptProperties | 1 + installer/src/InstallApacheFlex.mxml | 8 ++++++-- .../packageflexsdk/view/components/Tracker.mxml | 18 +++++++++++++++--- 4 files changed, 23 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cd397df8/common/src/org/apache/flex/utilities/common/Constants.as ---------------------------------------------------------------------- diff --git a/common/src/org/apache/flex/utilities/common/Constants.as b/common/src/org/apache/flex/utilities/common/Constants.as index 524c840..77ad22d 100644 --- a/common/src/org/apache/flex/utilities/common/Constants.as +++ b/common/src/org/apache/flex/utilities/common/Constants.as @@ -41,6 +41,7 @@ public class Constants public static const CONFIG_XML_NAME:String = "installer/sdk-installer-config-4.0.xml"; public static const DISCLAIMER_PATH:String = "about-binaries.html"; public static const INSTALLER_TRACK_SUCCESS:String = "track-installer.html"; + public static const INSTALLER_TRACK_FAILURE:String = "track-installer.html?failure=true"; public static const SDK_BINARY_FILE_NAME_PREFIX:String = "apache-flex-sdk-"; http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cd397df8/installer/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/installer/.actionScriptProperties b/installer/.actionScriptProperties index efc67e2..4c6a7a0 100644 --- a/installer/.actionScriptProperties +++ b/installer/.actionScriptProperties @@ -31,6 +31,7 @@ </libraryPathEntry> <libraryPathEntry kind="1" linkType="1" path="libs"/> <libraryPathEntry kind="3" linkType="1" path="/common/bin/common.swc" useDefaultLinkType="false"/> + <libraryPathEntry kind="3" linkType="1" path="/ant_on_air/bin/ant_on_air.swc" useDefaultLinkType="false"/> </libraryPath> <sourceAttachmentPath/> </compiler> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cd397df8/installer/src/InstallApacheFlex.mxml ---------------------------------------------------------------------- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index b35ed0a..e9b0b5f 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -1979,7 +1979,7 @@ variables are not required because the locations of these pieces are known. } } if (allComponentsInstalled) { - tracker.trackInstallerSuccess(APACHE_FLEX_BIN_DISTRO_VERSION, _os.os); + tracker.trackInstallerSuccess(APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY, APACHE_FLEX_BIN_DISTRO_VERSION, _os.os); cleanup(false); } } @@ -1991,7 +1991,11 @@ variables are not required because the locations of these pieces are known. log(_viewResourceConstants.ERROR_UNABLE_TO_DELETE_TEMP_DIRECTORY); } - if (!isAbort) { + if (isAbort) { + tracker.trackInstallerFailure(APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY, APACHE_FLEX_BIN_DISTRO_VERSION, _os.os); + } + else + { log(_viewResourceConstants.INFO_INSTALLATION_COMPLETE); updateUIHandleInstallationComplete(); } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cd397df8/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml ---------------------------------------------------------------------- diff --git a/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml b/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml index 6ee8ab1..4838882 100644 --- a/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml +++ b/installer/src/org/apache/flex/packageflexsdk/view/components/Tracker.mxml @@ -23,7 +23,7 @@ limitations under the License. <fx:Script> <![CDATA[ import org.apache.flex.utilities.common.Constants; - public function trackInstallerSuccess(version:String=null,os:String=null):void + public function trackInstallerSuccess(sdkLabel:String=null,version:String=null,os:String=null):void { if(version == null && os == null) { @@ -31,10 +31,22 @@ limitations under the License. } else { - trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_SUCCESS + "?version=" + version + "&os=" + os; + trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_SUCCESS + "?label=" + sdkLabel + "&version=" + version + "&os=" + os; } - } + + public function trackInstallerFailure(sdkLabel:String=null,version:String=null,os:String=null):void + { + if(version == null && os == null) + { + trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_FAILURE; + } + else + { + trackInstallerHTML.location = Constants.APACHE_FLEX_URL + Constants.INSTALLER_TRACK_FAILURE + "&label=" + sdkLabel + "&version=" + version + "&os=" + os; + } + } + ]]> </fx:Script> <mx:HTML id="trackInstallerHTML" width="100%" height="100%" />
