flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/3] git commit: [flex-sdk] [refs/heads/develop] - switch over to official release of pixelbender bits
Date Tue, 21 Jan 2014 22:55:15 GMT
Updated Branches:
  refs/heads/develop af2a4bbfc -> 61dd472ca


switch over to official release of pixelbender bits


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/708c359d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/708c359d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/708c359d

Branch: refs/heads/develop
Commit: 708c359d903fa7ebcf6a326f81a8424b6d043ac2
Parents: bf19b8d
Author: Alex Harui <aharui@apache.org>
Authored: Tue Jan 21 14:53:23 2014 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Jan 21 14:55:05 2014 -0800

----------------------------------------------------------------------
 build.properties         |  3 ---
 frameworks/downloads.xml | 55 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/708c359d/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index eaad772..5cf4111 100644
--- a/build.properties
+++ b/build.properties
@@ -36,9 +36,6 @@ locale = en_US
 qa.dir = ${basedir}/../qa
 asc = ${basedir}/bin/asc
 
-# place to get PixelBender pbk and obj files
-pixelbender.url=https://dist.apache.org/repos/dist/dev/flex/pixelbender/rc1/binaries
-
 # TextLayputFormat branch. Location of the textLayout directory in the TLF repo.
 #tlf.branch = 
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/708c359d/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 312d8ac..1baff1b 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -32,9 +32,10 @@
 
     <property name="adobe.flex.dir" value="adobe_flex_sdk_4.6"/>
     <property name="adobe.flex.zip.file" value="flex_sdk_4.6.0.23201B.zip"/>
-    <property name="pixelbender.bin.zip" value="apache-flex-sdk-pixelbender-1.0.0-bin.zip"
/>
-    <property name="pixelbender.url" value="http://www.apache.org/dyn/closer.cgi/flex/pixelbender/1.0.0/binaries"
/>
-        
+    <property name="pixelbender.url" value="http://www.apache.org/dyn/mirrors/mirrors.cgi"
/>
+    <property name="pixelbender.folder" value="flex/pixelbender/1.0/binaries" />
+    <property name="pixelbender.bin.zip" value="apache-flex-sdk-pixel-bender-1.0.0-bin.zip"
/>
+    
     <property name="adobe.flex.license" value="
         ${line.separator}
         ${line.separator}Adobe Flex SDK License Agreement:
@@ -148,9 +149,12 @@
         description="Downloads PixelBender from flex distribution server">
         
         <mkdir dir="${download.dir}"/>
-        <get src="${pixelbender.url}/${pixelbender.bin.zip}"
-        dest="${download.dir}/${pixelbender.bin.zip}"
-        verbose="false"/>
+        <antcall target="get_from_mirror" >
+            <param name="server" value="${pixelbender.url}" />
+            <param name="folder" value="${pixelbender.folder}" />
+            <param name="file" value="${pixelbender.bin.zip}" />
+            <param name="dest" value="${download.dir}/${pixelbender.bin.zip}" />
+        </antcall>
         
         <unzip src="${download.dir}/${pixelbender.bin.zip}" dest="${FLEX_HOME}">
             <patternset>
@@ -369,5 +373,42 @@
     
     <target name="clean-adobe-flex-sdk">
         <delete dir="${download.dir}/${adobe.flex.dir}"/>
-    </target>    
+    </target>
+    
+    <target name="get_from_mirror">
+        <condition property="usingmirror" value="true">
+            <contains string="${server}" substring="mirrors.cgi" />
+        </condition>
+        <antcall target="download_using_mirror">
+            <param name="server" value="${server}" />
+            <param name="folder" value="${folder}" />
+            <param name="file" value="${file}" />
+            <param name="dest" value="${dest}" />
+        </antcall>
+        <antcall target="download_using_get">
+            <param name="server" value="${server}" />
+            <param name="folder" value="${folder}" />
+            <param name="file" value="${file}" />
+            <param name="dest" value="${dest}" />
+        </antcall>
+    </target>
+    
+    <target name="download_using_mirror" if="usingmirror">
+        <get src="${server}/${folder}/${file}?asjson=true" verbose="true" dest="${basedir}/mirror.json"
/>
+        <replace file="${basedir}/mirror.json">
+            <replacefilter token="&quot;"
+            value="" />
+            <replacefilter token=": "
+            value="=" />
+        </replace>
+        <property file="${basedir}/mirror.json" />
+        <delete file="${basedir}/mirror.json" />
+        <echo>Using mirror: ${preferred}</echo>
+        <get src="${preferred}${folder}/${file}" dest="${dest}" />
+    </target>
+    
+    <target name="download_using_get" unless="usingmirror">
+        <get src="${server}/${folder}/${file}" dest="${dest}" />
+    </target>
+
 </project>


Mime
View raw message