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/09/10 21:58:18 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34533 fix
installation of optional components
Repository: flex-sdk
Updated Branches:
refs/heads/develop ec8b9bcce -> 572b3a8b3
FLEX-34533 fix installation of optional components
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/67f1f5d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/67f1f5d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/67f1f5d3
Branch: refs/heads/develop
Commit: 67f1f5d3c522c723e0325b3a4aed68e518cb5e3b
Parents: ec8b9bc
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 9 22:37:12 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Sep 10 12:54:55 2014 -0700
----------------------------------------------------------------------
apache-flex-sdk-installer-config.xml | 6 ++--
installer.xml | 54 ++++++++++++++++++++++++-------
2 files changed, 45 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/67f1f5d3/apache-flex-sdk-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-sdk-installer-config.xml b/apache-flex-sdk-installer-config.xml
index edd5286..333893b 100755
--- a/apache-flex-sdk-installer-config.xml
+++ b/apache-flex-sdk-installer-config.xml
@@ -69,7 +69,7 @@
<zh_CN>SWFObject (必须的)</zh_CN>
<zh_TW>SWFObject (必須的)</zh_TW>
</step>
- <step id="osmf-download" property="do.swfobject.install">
+ <step id="osmf-download" property="do.osmf.install">
<de_DE>OSMF (Benötigt)</de_DE>
<el_GR>OSMF (Απαιτούμενο)</el_GR>
<en_US>OSMF (Required)</en_US>
@@ -81,7 +81,7 @@
<zh_CN>OSMF (必须的)</zh_CN>
<zh_TW>OSMF (必須的)</zh_TW>
</step>
- <step id="fontswf-download" property="do.swfobject.install">
+ <step id="fontswf-download" property="do.fontswf.install">
<de_DE>Adobe Bibliothek zur Einbettung von Schriften (Optional)</de_DE>
<el_GR>Adobe Embedded Font Libraries and Utilities (Προαιρετικό)</el_GR>
<en_US>Adobe Embedded Font Libraries and Utilities (Optional)</en_US>
@@ -93,7 +93,7 @@
<zh_CN>Adobe 镶入字体库和实用程序 (可选的)</zh_CN>
<zh_TW>Adobe 鑲入字體庫和實用程式 (可選的)</zh_TW>
</step>
- <step id="blazeds-download" property="do.swfobject.install">
+ <step id="blazeds-download" property="do.blazeds.install">
<de_DE>Remoting Support (Optional)</de_DE>
<el_GR>Remoting Support (Προαιρετικό)</el_GR>
<en_US>Remoting Support (Optional)</en_US>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/67f1f5d3/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 6097703..6191ee3 100644
--- a/installer.xml
+++ b/installer.xml
@@ -334,10 +334,15 @@
<target name="get-third-party-files" depends="air-download,flash-download,swfobject-download,osmf-download,fontswf-download,blazeds-download" />
<target name="air-check" description="Checks if AIR SDK has been downloaded.">
- <available file="${FLEX_HOME}/lib/adt.jar" property="air.jar.present"/>
+ <available file="${FLEX_HOME}/lib/adt.jar" property="skip.air.install"/>
+ <condition property="skip.air.install" value="true">
+ <not>
+ <isset property="do.air.install" />
+ </not>
+ </condition>
</target>
- <target name="air-download" depends="air-check" unless="air.jar.present"
+ <target name="air-download" depends="air-check" unless="skip.air.install"
description="Downloads AIR SDK and copies to correct locations">
<mkdir dir="${download.dir}"/>
@@ -549,10 +554,15 @@
<!-- Because this requires a network connection it downloads Flash SDK only if it doesn't already exist. -->
<target name="flash-check" description="Checks if Flash SDK has been downloaded.">
- <available file="${FLEX_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc" property="flash.swc.present"/>
+ <available file="${FLEX_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc" property="skip.flash.install"/>
+ <condition property="skip.flash.install" value="true">
+ <not>
+ <isset property="do.flash.install" />
+ </not>
+ </condition>
</target>
- <target name="flash-download" depends="flash-check" unless="flash.swc.present"
+ <target name="flash-download" depends="flash-check" unless="skip.flash.install"
description="Downloads playerglobal.swc and copies to correct locations">
<mkdir dir="${download.dir}"/>
@@ -580,10 +590,15 @@
<!-- swfobject.js (Version 2.2) -->
<!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
<target name="swfobject-check" description="Checks if SWFObject has been downloaded.">
- <available file="${basedir}/../templates/swfobject/swfobject.js" property="swfobject.js.present"/>
+ <available file="${basedir}/../templates/swfobject/swfobject.js" property="skip.swfobject.install"/>
+ <condition property="skip.swfobject.install" value="true">
+ <not>
+ <isset property="do.swfobject.install" />
+ </not>
+ </condition>
</target>
- <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present"
+ <target name="swfobject-download" depends="swfobject-check" unless="skip.swfobject.install"
description="Copies SWFObject from code.google.com">
<echo file="${basedir}/swfobject.properties">swfobject.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
@@ -623,10 +638,15 @@
<!-- osmf (Version 2.0) -->
<!-- Because this requires a network connection it downloads OSMF only if it doesn't already exist. -->
<target name="osmf-check" description="Checks if OSMF has been downloaded.">
- <available file="${basedir}/frameworks/libs/osmf.swc" property="osmf.swc.present"/>
+ <available file="${basedir}/frameworks/libs/osmf.swc" property="skip.osmf.install"/>
+ <condition property="skip.osmf.install" value="true">
+ <not>
+ <isset property="do.osmf.install" />
+ </not>
+ </condition>
</target>
- <target name="osmf-download" depends="osmf-check" unless="osmf.swc.present"
+ <target name="osmf-download" depends="osmf-check" unless="skip.osmf.install"
description="Copies OSMF from Open@Adobe">
<echo file="${basedir}/osmf.properties">osmf.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
@@ -657,7 +677,7 @@
<!-- fontswf -->
<!-- Because this requires a network connection it downloads only if it doesn't already exist. -->
<target name="fontswf-check" description="Checks if fontswf has been downloaded.">
- <condition property="fontswf.jars.present">
+ <condition property="skip.fontswf.install">
<and>
<available file="${basedir}/lib/external/optional/afe.jar" />
<available file="${basedir}/lib/external/optional/aglj40.jar" />
@@ -665,9 +685,14 @@
<available file="${basedir}/lib/external/optional/rideau.jar" />
</and>
</condition>
+ <condition property="skip.fontswf.install" value="true">
+ <not>
+ <isset property="do.fontswf.install" />
+ </not>
+ </condition>
</target>
- <target name="fontswf-download" depends="fontswf-check" unless="fontswf.jars.present"
+ <target name="fontswf-download" depends="fontswf-check" unless="skip.fontswf.install"
description="Copies OSMF from Open@Adobe">
<echo file="${basedir}/afe.properties">afe.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
@@ -742,10 +767,15 @@
<!-- BlazeDS -->
<!-- Because this requires a network connection it downloads BlazeDS only if it doesn't already exist. -->
<target name="blazeds-check" description="Checks if BlazeDS has been downloaded.">
- <available file="${basedir}/external/optional/flex-messaging-common.jar" property="blazeds.jar.present"/>
+ <available file="${basedir}/external/optional/flex-messaging-common.jar" property="skip.blazeds.install"/>
+ <condition property="skip.blazeds.install" value="true">
+ <not>
+ <isset property="do.blazeds.install" />
+ </not>
+ </condition>
</target>
- <target name="blazeds-download" depends="blazeds-check" unless="blazeds.jar.present"
+ <target name="blazeds-download" depends="blazeds-check" unless="skip.blazeds.install"
description="Copies BlazeDS from Open@Adobe">
<echo file="${basedir}/blaze.properties">blaze.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
[2/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34534 try to
fix cached installs of fontkit and blazeds on Windows
Posted by ah...@apache.org.
FLEX-34534 try to fix cached installs of fontkit and blazeds on Windows
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/572b3a8b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/572b3a8b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/572b3a8b
Branch: refs/heads/develop
Commit: 572b3a8b391b8fb03d10dfec6b28cb65804d3d99
Parents: 67f1f5d
Author: Alex Harui <ah...@apache.org>
Authored: Wed Sep 10 12:53:29 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Sep 10 12:54:56 2014 -0700
----------------------------------------------------------------------
installer.xml | 87 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 56 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/572b3a8b/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 6191ee3..aaa53d9 100644
--- a/installer.xml
+++ b/installer.xml
@@ -65,29 +65,34 @@
<property name="osmf.url.file" value="OSMF.swc" />
<property name="osmf.url.md5" value="6385228692ab982630e47422403f6890" />
- <property name="afe.url.server" value="http://opensource.adobe.com" />
- <property name="afe.url.folder" value="svn/opensource/flex/sdk/branches/4.y/lib" />
- <property name="afe.url.file" value="afe.jar" />
+ <property name="afe.url.server" value="https://sourceforge.net" />
+ <property name="afe.url.folder" value="adobe/flexsdk/code/HEAD/tree/trunk/lib" />
+ <property name="afe.url.file" value="afe.jar?format=raw" />
+ <property name="afe.url.cachefile" value="afe.jar" />
<property name="afe.url.md5" value="d1469e163c4fd4c1ef8be82dd6d0f1ee" />
- <property name="agl.url.server" value="http://opensource.adobe.com" />
- <property name="agl.url.folder" value="svn/opensource/flex/sdk/branches/4.y/lib" />
- <property name="agl.url.file" value="aglj40.jar" />
+ <property name="agl.url.server" value="https://sourceforge.net" />
+ <property name="agl.url.folder" value="adobe/flexsdk/code/HEAD/tree/trunk/lib" />
+ <property name="agl.url.file" value="aglj40.jar?format=raw" />
+ <property name="agl.url.cachefile" value="aglj40.jar" />
<property name="agl.url.md5" value="b9b6b825787489796d9b6bf607a64824" />
- <property name="fontkit.url.server" value="http://opensource.adobe.com" />
- <property name="fontkit.url.folder" value="svn/opensource/flex/sdk/branches/4.y/lib" />
- <property name="fontkit.url.file" value="flex-fontkit.jar" />
+ <property name="fontkit.url.server" value="https://sourceforge.net" />
+ <property name="fontkit.url.folder" value="adobe/flexsdk/code/HEAD/tree/trunk/lib" />
+ <property name="fontkit.url.file" value="flex-fontkit.jar?format=raw" />
+ <property name="fontkit.url.cachefile" value="flex-fontkit.jar" />
<property name="fontkit.url.md5" value="2abb9f580fa40ad6ef80864f94b6e938" />
- <property name="rideau.url.server" value="http://opensource.adobe.com" />
- <property name="rideau.url.folder" value="svn/opensource/flex/sdk/branches/4.y/lib" />
- <property name="rideau.url.file" value="rideau.jar" />
+ <property name="rideau.url.server" value="https://sourceforge.net" />
+ <property name="rideau.url.folder" value="adobe/flexsdk/code/HEAD/tree/trunk/lib" />
+ <property name="rideau.url.file" value="rideau.jar?format=raw" />
+ <property name="rideau.url.cachefile" value="rideau.jar" />
<property name="rideau.url.md5" value="3b3329c1b3de665dc116121b772c5369" />
- <property name="blazeds.url.server" value="http://opensource.adobe.com" />
- <property name="blazeds.url.folder" value="svn/opensource/flex/sdk/branches/4.y/lib" />
- <property name="blazeds.url.file" value="flex-messaging-common.jar" />
+ <property name="blazeds.url.server" value="https://sourceforge.net" />
+ <property name="blazeds.url.folder" value="adobe/flexsdk/code/HEAD/tree/trunk/lib" />
+ <property name="blazeds.url.file" value="flex-messaging-common.jar?format=raw" />
+ <property name="blazeds.url.cachefile" value="flex-messaging-common.jar" />
<property name="blazeds.url.md5" value="f64cdca3ddfe3068b70197ddb914bb5d" />
<condition property="platform" value="mac">
@@ -650,8 +655,8 @@
description="Copies OSMF from Open@Adobe">
<echo file="${basedir}/osmf.properties">osmf.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
- <replace file="${basedir}/osmf.properties" token="{0}" value="OSMF.swc" />
- <replace file="${basedir}/osmf.properties" token="{1}" value="http://downloads.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29" />
+ <replace file="${basedir}/osmf.properties" token="{0}" value="${osmf.url.file}" />
+ <replace file="${basedir}/osmf.properties" token="{1}" value="${osmf.url.server}/${osmf.url.folder}" />
<property file="${basedir}/osmf.properties" />
<delete file="${basedir}/osmf.properties" />
<echo>${osmf.echo}</echo>
@@ -696,8 +701,8 @@
description="Copies OSMF from Open@Adobe">
<echo file="${basedir}/afe.properties">afe.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
- <replace file="${basedir}/afe.properties" token="{0}" value="afe.jar" />
- <replace file="${basedir}/afe.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" />
+ <replace file="${basedir}/afe.properties" token="{0}" value="${afe.url.file}" />
+ <replace file="${basedir}/afe.properties" token="{1}" value="${afe.url.server}/${afe.url.folder}" />
<property file="${basedir}/afe.properties" />
<delete file="${basedir}/afe.properties" />
<echo>${afe.echo}</echo>
@@ -707,14 +712,15 @@
<param name="srcDomain" value="${afe.url.server}" />
<param name="srcFolder" value="${afe.url.folder}" />
<param name="srcFile" value="${afe.url.file}" />
+ <param name="cacheFile" value="${afe.url.cachefile}" />
<param name="dest" value="${basedir}/lib/external/optional/afe.jar" />
<param name="failmessage" value="afe.jar download failed" />
<param name="md5" value="${afe.url.md5}" />
</antcall>
<echo file="${basedir}/agl.properties">agl.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
- <replace file="${basedir}/agl.properties" token="{0}" value="aglj40.jar" />
- <replace file="${basedir}/agl.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" />
+ <replace file="${basedir}/agl.properties" token="{0}" value="${agl.url.file}" />
+ <replace file="${basedir}/agl.properties" token="{1}" value="${agl.url.server}/${agl.url.folder}" />
<property file="${basedir}/agl.properties" />
<delete file="${basedir}/agl.properties" />
<echo>${agl.echo}</echo>
@@ -723,14 +729,15 @@
<param name="srcDomain" value="${agl.url.server}" />
<param name="srcFolder" value="${agl.url.folder}" />
<param name="srcFile" value="${agl.url.file}" />
+ <param name="cacheFile" value="${agl.url.cachefile}" />
<param name="dest" value="${basedir}/lib/external/optional/aglj40.jar" />
<param name="failmessage" value="aglj40.jar download failed" />
<param name="md5" value="${agl.url.md5}" />
</antcall>
<echo file="${basedir}/fontkit.properties">fontkit.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
- <replace file="${basedir}/fontkit.properties" token="{0}" value="flex-fontkit.jar" />
- <replace file="${basedir}/fontkit.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" />
+ <replace file="${basedir}/fontkit.properties" token="{0}" value="${fontkit.url.file}" />
+ <replace file="${basedir}/fontkit.properties" token="{1}" value="${fontkit.url.server}/${fontkit.url.folder}" />
<property file="${basedir}/fontkit.properties" />
<delete file="${basedir}/fontkit.properties" />
<echo>${fontkit.echo}</echo>
@@ -739,14 +746,15 @@
<param name="srcDomain" value="${fontkit.url.server}" />
<param name="srcFolder" value="${fontkit.url.folder}" />
<param name="srcFile" value="${fontkit.url.file}" />
+ <param name="cacheFile" value="${fontkit.url.cachefile}" />
<param name="dest" value="${basedir}/lib/external/optional/flex-fontkit.jar" />
<param name="failmessage" value="flex-fontkit.jar download failed" />
<param name="md5" value="${fontkit.url.md5}" />
</antcall>
<echo file="${basedir}/rideau.properties">rideau.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
- <replace file="${basedir}/rideau.properties" token="{0}" value="rideau.jar" />
- <replace file="${basedir}/rideau.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" />
+ <replace file="${basedir}/rideau.properties" token="{0}" value="${rideau.url.file}" />
+ <replace file="${basedir}/rideau.properties" token="{1}" value="${rideau.url.server}/${rideau.url.folder}" />
<property file="${basedir}/rideau.properties" />
<delete file="${basedir}/rideau.properties" />
<echo>${rideau.echo}</echo>
@@ -755,6 +763,7 @@
<param name="srcDomain" value="${rideau.url.server}" />
<param name="srcFolder" value="${rideau.url.folder}" />
<param name="srcFile" value="${rideau.url.file}" />
+ <param name="cacheFile" value="${rideau.url.cachefile}" />
<param name="dest" value="${basedir}/lib/external/optional/rideau.jar" />
<param name="failmessage" value="rideau.jar download failed" />
<param name="md5" value="${rideau.url.md5}" />
@@ -779,8 +788,8 @@
description="Copies BlazeDS from Open@Adobe">
<echo file="${basedir}/blaze.properties">blaze.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
- <replace file="${basedir}/blaze.properties" token="{0}" value="flex-messaging-common.jar" />
- <replace file="${basedir}/blaze.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" />
+ <replace file="${basedir}/blaze.properties" token="{0}" value="${blazeds.url.file}" />
+ <replace file="${basedir}/blaze.properties" token="{1}" value="${blazeds.url.server}/${blazeds.url.folder}" />
<property file="${basedir}/blaze.properties" />
<delete file="${basedir}/blaze.properties" />
<echo>${blaze.echo}</echo>
@@ -790,6 +799,7 @@
<param name="srcDomain" value="${blazeds.url.server}" />
<param name="srcFolder" value="${blazeds.url.folder}" />
<param name="srcFile" value="${blazeds.url.file}" />
+ <param name="cacheFile" value="${blazeds.url.cachefile}" />
<param name="dest" value="${basedir}/lib/external/optional/flex-messaging-common.jar" />
<param name="failmessage" value="flex-messaging-common.jar download failed" />
<param name="md5" value="${blazeds.url.md5}" />
@@ -944,16 +954,31 @@
</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" />
+ <condition property="cacheFile" value="${srcFile}" >
+ <not>
+ <isset property="cacheFile" />
+ </not>
+ </condition>
+ <echo>${INFO_USING_CACHED_FILE} ${downloadCacheFolder}/${srcFolder}/${cacheFile}</echo>
+ <copy file="${downloadCacheFolder}/${srcFolder}/${cacheFile}" tofile="${dest}" overwrite="true" />
</target>
<target name="check-cache" if="usingDownloadCache">
- <available file="${downloadCacheFolder}/${srcFolder}/${srcFile}" property="found-in-cache" />
+ <condition property="cacheFile" value="${srcFile}" >
+ <not>
+ <isset property="cacheFile" />
+ </not>
+ </condition>
+ <available file="${downloadCacheFolder}/${srcFolder}/${cacheFile}" property="found-in-cache" />
</target>
<target name="put-in-cache" unless="skipCache">
- <copy tofile="${downloadCacheFolder}/${srcFolder}/${srcFile}" file="${dest}" />
+ <condition property="cacheFile" value="${srcFile}" >
+ <not>
+ <isset property="cacheFile" />
+ </not>
+ </condition>
+ <copy tofile="${downloadCacheFolder}/${srcFolder}/${cacheFile}" file="${dest}" />
</target>
<target name="check-sum" if="md5"