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/06/17 07:03:02 UTC
[3/3] git commit: [flex-asjs] [refs/heads/develop] - add caching info
to log
add caching info to log
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dc843567
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dc843567
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dc843567
Branch: refs/heads/develop
Commit: dc843567519b556e12675e5feead44bb35fda6f9
Parents: 0c4ffa4
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 16 22:02:36 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 16 22:02:36 2014 -0700
----------------------------------------------------------------------
installer.properties/en_US.properties | 1 +
installer.xml | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc843567/installer.properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
index 5de18e1..df50962 100644
--- a/installer.properties/en_US.properties
+++ b/installer.properties/en_US.properties
@@ -81,5 +81,6 @@ INFO_INSTALLING_LAUNCH_CONFIG_FILES=Installing Adobe Flash Builder launch config
INFO_DOWNLOADING_FILE_FROM=Downloading {0} from: {1}
INFO_DOWNLOADED=Download complete
INFO_VALIDATING_FILE=Validating download:
+INFO_USING_CACHED_FILE=Using file from cache:
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc843567/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 1cc8c85..421f087 100644
--- a/installer.xml
+++ b/installer.xml
@@ -136,7 +136,8 @@
<target name="get-data">
<tstamp />
- <property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml?ts=${DSTAMP}" />
+ <property name="ts" value="${DSTAMP}${TSTAMP}" />
+ <property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml?ts=${ts}" />
<get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" />
<xmlproperty file="${basedir}/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
<property name="air.sdk.url.server.ref" value="air.sdk.server.${platform}.${air.sdk.version}" />
@@ -1062,13 +1063,14 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" />
<get src="${srcDomain}/${srcFolder}/${srcFile}" dest="${dest}"/>
</target>
<target name="get-with-no-params" depends="check-params" if="not-local-no-params" >
- <get src="${srcDomain}/${srcFolder}/${srcFile}?ts=${DSTAMP}" dest="${dest}"/>
+ <get src="${srcDomain}/${srcFolder}/${srcFile}?ts=${ts}" dest="${dest}"/>
</target>
<target name="get-with-params" depends="check-params" if="has-params" >
- <get src="${srcDomain}/${srcFolder}/${srcFile}&ts=${DSTAMP}" dest="${dest}"/>
+ <get src="${srcDomain}/${srcFolder}/${srcFile}&ts=${ts}" dest="${dest}"/>
</target>
<target name="copy-if-cached" if="found-in-cache">
+ <echo>${INFO_USING_CACHED_FILE} ${downloadCacheFolder}/${srcFolder}/${srcFile}</echo>
<copy file="${downloadCacheFolder}/${srcFolder}/${srcFile}" tofile="${dest}" overwrite="true" />
</target>
@@ -1095,7 +1097,7 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" />
<target name="check-sum-from-file" if="srcMD5Domain"
description="Verifies MD5 checksum, and fails if checksum doesn't match">
- <get src="${srcMD5Domain}/${srcFolder}/${srcFile}.md5?ts=${DSTAMP}" dest="${dest}.md5"/>
+ <get src="${srcMD5Domain}/${srcFolder}/${srcFile}.md5?ts=${ts}" dest="${dest}.md5"/>
<echo>${INFO_VALIDATING_FILE} ${dest}</echo>
<checksum file="${dest}" algorithm="MD5" verifyproperty="we.failed" />
<fail message="${failmessage}">