add time to timestamping. log if using cached version
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/41f8b22f Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/41f8b22f Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/41f8b22f Branch: refs/heads/develop Commit: 41f8b22f2bd876679950460f1e4701667f46468e Parents: 29f951f Author: Alex Harui <[email protected]> Authored: Sun Jun 22 23:42:36 2014 -0700 Committer: Alex Harui <[email protected]> Committed: Sun Jun 22 23:42:36 2014 -0700 ---------------------------------------------------------------------- installer.properties/en_US.properties | 1 + installer.xml | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/41f8b22f/installer.properties/en_US.properties ---------------------------------------------------------------------- diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties index 3075c72..d9d2256 100644 --- a/installer.properties/en_US.properties +++ b/installer.properties/en_US.properties @@ -123,3 +123,4 @@ INFO_INSTALLING_CONFIG_FILES=Installing frameworks configuration files configure 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-sdk/blob/41f8b22f/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index e09fd19..dde7595 100644 --- a/installer.xml +++ b/installer.xml @@ -153,7 +153,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"/> <xmlproperty file="${basedir}/flex-sdk-description.xml" semanticAttributes="true" collapseAttributes="true"/> @@ -895,13 +896,14 @@ <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>
