flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - Add google closure library to build/release scripts so that it does not have to be downloaded as a third party download.
Date Mon, 03 Aug 2015 08:04:04 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 8165b5c4d -> 3910da46a


Add google closure library to build/release scripts so that it does not have to be downloaded
as a third party 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/3910da46
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3910da46
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3910da46

Branch: refs/heads/develop
Commit: 3910da46a0b49dc31d4863ae08a9525b825424b0
Parents: 8165b5c
Author: OmPrakash Muppirala <bigosmallm@gmail.com>
Authored: Mon Aug 3 00:57:30 2015 -0700
Committer: OmPrakash Muppirala <bigosmallm@gmail.com>
Committed: Mon Aug 3 00:57:30 2015 -0700

----------------------------------------------------------------------
 apache-flex-flexjs-installer-config.xml | 22 ----------------------
 build.xml                               |  6 ++++++
 frameworks/build.xml                    |  2 +-
 frameworks/downloads.xml                | 24 +++++++++++++++++++++---
 installer.xml                           |  2 +-
 5 files changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3910da46/apache-flex-flexjs-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml
index 81c4f4b..841f32f 100755
--- a/apache-flex-flexjs-installer-config.xml
+++ b/apache-flex-flexjs-installer-config.xml
@@ -193,28 +193,6 @@
 			<license>Apache V2 授權合約</license>
 		</zh_TW>
 	</component>
-	<component id="STEP_REQUIRED_INSTALL_GOOGLE_CLOSURE_LIBRARY" required="true" property="do.goog.install">
-		<el_GR>
-			<label>Google Closure Library (Απαιτούμενο)</label>
-			<message>Για το Google Closure Library ισχύει η συμφωνία χρήσης
του Apache License V2. Θέλετε να εγκαταστήσετε το Google Closure
Library;</message>
-		</el_GR>
-		<en_US>
-			<label>Google Closure Library (Required)</label>
-			<message>The Apache License V2 applies to the Google Closure Library.  Do you want
to install the Google Closure Library?</message>
-			<license>Apache V2 License</license>
-			<licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
-		</en_US>
-		<zh_CN>
-			<label>Google Closure Library (必须的)</label>
-			<message>Apache V2 许可协议适用于 Google Closure Library. 您想要安装
Google Closure Library 吗?</message>
-			<license>Apache V2 许可协议</license>
-		</zh_CN>
-		<zh_TW>
-			<label>Google Closure Library (必須的)</label>
-			<message>Apache V2 授權合約適用於 Google Closure Library. 您想要安裝
Google Closure Library 嗎?</message>
-			<license>Apache V2 授權合約</license>
-		</zh_TW>
-	</component>
 	<component id="STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK" required="true" property="do.air.install">
 		<el_GR>
 			<label>Adobe AIR SDK (Απαιτούμενο)</label>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3910da46/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 564109f..ee3d5af 100644
--- a/build.xml
+++ b/build.xml
@@ -745,6 +745,12 @@
             </fileset>
         </copy>
          -->
+    	
+    	<!-- Google Closure Library -->
+    	<copy todir="${basedir}/temp/js/lib/google/closure-library">
+    	            <fileset dir="${basedir}/js/lib/google/closure-library" />
+		</copy>
+    	
                  
         <antcall target="binary-package-zip"/>        
         <antcall target="binary-package-tgz"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3910da46/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 8a6f621..351dfa6 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -172,7 +172,7 @@
     <target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything
including thirdparty downloads."/>
 	
     <target name="thirdparty-clean" unless="no.thirdparty-clean" description="Removes
all thirdparty downloads.">
-        <!--<ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}"/>-->
+        <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}"/>
     </target>
     
     <target name="clean" description="Cleans all SWCs and their resource bundles">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3910da46/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 0a3ee07..10551e8 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -32,12 +32,12 @@
        clean does not remove these since they don't change often and the downloads take time.
     -->
     <target name="main" 
-        depends="swfobject-download,flat-ui-download"
+        depends="swfobject-download,flat-ui-download,gcl-download"
         description="Copies third-party software into place for build">
         <echo message="Use thirdparty-clean or super-clean to remove these."/> 
     </target>
     
-    <target name="clean" depends="swfobject-clean,flat-ui-clean"
+    <target name="clean" depends="swfobject-clean,flat-ui-clean,gcl-clean"
         description="Cleans thirdparty downloaded files.">
      </target>
     
@@ -63,7 +63,7 @@
         </unzip>
         <mkdir dir="${FLEXJS_HOME}/templates/swfobject/history"/>
         <copy toDir="${FLEXJS_HOME}/templates/swfobject/history" >
-            <fileset dir="${FLEX_HOME}/templates/swfobject/history">
+            <fileset dir="${FLEXJS_HOME}/templates/swfobject/history">
                 <include name="**"/>
             </fileset>
         </copy>
@@ -116,5 +116,23 @@
             </fileset>
         </delete>
     </target>
+	
+	<!-- Google Closure Library -->
+    <target name="gcl-download" description="Downloads Google Closure Library">
+    	<mkdir dir="${download.dir}"/>
+    	<get src="https://github.com/google/closure-library/archive/master.zip"
+    	        dest="${download.dir}/google-closure-library-master.zip"
+    	        verbose="false"/>
+    	
+    	<mkdir dir="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+    	<unzip src="${download.dir}/google-closure-library-master.zip" dest="${FLEXJS_HOME}/js/lib/google/closure-library">
+    		<cutdirsmapper dirs="1" />
+    	</unzip>
+    </target>
+	
+    <target name="gcl-clean" description="Deletes Google Closure Library">
+    	<echo message="Deleting Google Closure Library"/>
+        <delete dir="${FLEXJS_HOME}/js/lib" failonerror="false" />
+    </target>
         
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3910da46/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 2355bef..bfba8a5 100644
--- a/installer.xml
+++ b/installer.xml
@@ -436,7 +436,7 @@
         <property name="skipCache" value="true" />
     </target>
 
-    <target name="get-third-party-files" depends="goog-download,air-download,flash-download,swfobject-download"
/>
+    <target name="get-third-party-files" depends="air-download,flash-download,swfobject-download"
/>
     
     <!-- Because this requires a network connection it downloads artifacts only if it
doesn't already exist. -->
     <target name="goog-check" description="Checks if Google Closure Library has been downloaded.">


Mime
View raw message