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/02/14 07:52:02 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - call
tracker if successful after xml installs
Updated Branches:
refs/heads/develop 0d70ef205 -> b74c67097
call tracker if successful after xml installs
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e85d4539
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e85d4539
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e85d4539
Branch: refs/heads/develop
Commit: e85d4539873c04393f232b14676cd64e1d91b7ae
Parents: 0d70ef2
Author: Alex Harui <ah...@apache.org>
Authored: Thu Feb 13 20:40:54 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Feb 13 20:41:47 2014 -0800
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e85d4539/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 6e7334b..bc202b9 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -814,7 +814,7 @@ variables are not required because the locations of these pieces are known.
if (APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.URL_PREFIX.length) != Constants.URL_PREFIX
&& APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.FILE_PREFIX.length) != Constants.FILE_PREFIX) {
APACHE_FLEX_BIN_DISTRO_URL = useMirrorPath(_mirrorURLUtil.mirrorURL) + APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_DISTRO_FILE;
- APACHE_FLEX_BIN_INSTALLER_URL = useMirrorPath(_mirrorURLUtil.mirrorURL) + APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_INSTALLER_FILE;
+ APACHE_FLEX_BIN_INSTALLER_URL = MD5CompareUtil.MD5_DOMAIN + APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_INSTALLER_FILE;
} else {
APACHE_FLEX_BIN_DISTRO_URL = APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_DISTRO_FILE;
APACHE_FLEX_BIN_INSTALLER_URL = APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_INSTALLER_FILE;
@@ -1384,7 +1384,9 @@ variables are not required because the locations of these pieces are known.
updateActivityStep(stepLabels[currentStep - 1], StepItem.ERROR);
else if (currentStep == stepLabels.length)
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);
}
[2/2] git commit: [flex-utilities] [refs/heads/develop] - allow for
local.properties file
Posted by ah...@apache.org.
allow for local.properties file
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b74c6709
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b74c6709
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b74c6709
Branch: refs/heads/develop
Commit: b74c67097eadb96e3e3853ec2134aaf2dd10a358
Parents: e85d453
Author: Alex Harui <ah...@apache.org>
Authored: Thu Feb 13 22:51:47 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Feb 13 22:51:47 2014 -0800
----------------------------------------------------------------------
installer/build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b74c6709/installer/build.xml
----------------------------------------------------------------------
diff --git a/installer/build.xml b/installer/build.xml
index 6ac40fb..7718746 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -24,6 +24,7 @@
<property environment="env"/>
<!--location of property file -->
+ <property file="${basedir}/local.properties" />
<property file="${basedir}/build.properties" description="Properties for Apache Flex SDK Installer project" />
<property file="${basedir}/build.number"/>
<property file="${CERT_PASSWORD_FILE}"/>