flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [44/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration] - eliminate duplicate download
Date Mon, 18 Apr 2016 13:27:07 GMT
eliminate duplicate download


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/667dd46a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/667dd46a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/667dd46a

Branch: refs/heads/feature/maven-migration
Commit: 667dd46ae564a3f4ba2fe53e56d2524c07a6ee1f
Parents: 7e660ea
Author: Alex Harui <aharui@apache.org>
Authored: Tue Apr 12 22:20:47 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Apr 12 23:47:06 2016 -0700

----------------------------------------------------------------------
 build.xml                | 2 ++
 frameworks/build.xml     | 4 +++-
 frameworks/downloads.xml | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 43e0a6a..941b75d 100644
--- a/build.xml
+++ b/build.xml
@@ -179,6 +179,8 @@
         <!-- <ant dir="${basedir}/frameworks/js" target="thirdparty-downloads"/>
-->
         <!-- don't ask again about these since we just did if these weren't already set
-->	    
 	    <property name="build.noprompt" value="set" />
+        <!-- this flag is used by frameworks/build.xml to prevent a second download -->
+        <property name="no.thirdparty-downloads" value="set" />
     </target>
 
     <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,create-config"

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 8d7b174..c6c8a5e 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -157,7 +157,9 @@
         <!-- Delete only if it exists and it is empty.  air and swfobject put dirs here.
-->
         <delete dir="${FLEXJS_HOME}/templates" includeemptydirs="true" failonerror="false">
             <exclude name="swfobject/index.template.html" />
-        </delete> 
+            <exclude name="swfobject/expressInstall.swf" />
+            <exclude name="swfobject/swfobject.js" />
+        </delete>
     </target>
     
     <target name="Binding" description="Clean build of Binding.swc">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index ac9e0fb..7fc12b1 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -79,9 +79,9 @@
         </delete>
     </target>
         
-    <!-- swfobject.js (Version 2.2) -->
-    <!-- Because this requires a network connection it downloads SWFObject only if it
doesn't already exist. -->
-    <target name="flat-ui-check" description="Checks if SWFObject has been downloaded.">
+    <!-- flat ui fonts  -->
+    <!-- Because this requires a network connection it downloads Flat UI fonts only if
it doesn't already exist. -->
+    <target name="flat-ui-check" description="Checks if Flat UI fonts have been downloaded.">
         <available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf" property="flat.donot.ask"/>
         <condition property="flat.donot.ask">
             <isset property="build.noprompt"/>
@@ -118,7 +118,6 @@
         description="Copies FlatUI from github" />
         
     <target name="get-flat-fonts" depends="ask-flat" if="do.flat.install" >
-        
         <mkdir dir="${download.dir}"/>
         <get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"
         dest="${download.dir}/flat-ui_2_2.zip"


Mime
View raw message