flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [1/2] git commit: [flex-asjs] [refs/heads/develop] - A few tweaks to the logic that determines if GOOG_HOME is defined
Date Wed, 05 Aug 2015 02:05:13 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 75e4c27b5 -> af5cab3d8


A few tweaks to the logic that determines if GOOG_HOME is defined


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

Branch: refs/heads/develop
Commit: af5cab3d844766b7b0303bbc31f327d4b875ca40
Parents: 6a17d2c
Author: OmPrakash Muppirala <bigosmallm@gmail.com>
Authored: Tue Aug 4 19:03:29 2015 -0700
Committer: OmPrakash Muppirala <bigosmallm@gmail.com>
Committed: Tue Aug 4 19:04:21 2015 -0700

----------------------------------------------------------------------
 build.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af5cab3d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 11a9164..e91cfdd 100644
--- a/build.xml
+++ b/build.xml
@@ -128,7 +128,7 @@
         description="Packages the source release kit which is the official Apache release."/>
         
     <target name="binary-release" 
-        depends="setup-binary-release,main,sample-themes,checkintests,doc,other.locales,binary-package,additional-packages"

+        depends="setup-binary-release,main,sample-themes,checkintests,doc,other.locales,check-goog-home,binary-package,additional-packages"

         description="Builds and packages the binary kit which is provided as a convenience."/>
   
 
     <target name="binary-release-jenkins" 
@@ -229,9 +229,6 @@
             type="dir" 
             property="GOOG_HOME"
             value="${env.GOOG_HOME}" />
-        
-        <fail message="The environment variable GOOG_HOME must be set to the Google Closure
Library folder containg a 'closure' and 'third_party' folder" 
-            unless="GOOG_HOME"/>
     </target>
     
     <target name="check-flex-home" unless="mxmlc.jar.exists"
@@ -748,25 +745,25 @@
     	
     	<!-- Google Closure Library -->
     	<!-- If GOOG_HOME is set, copy GCL from there, else copy from the downloaded folder
-->
-    	<antcall target="copy-gcl-from-goog-home" if="${GOOG_HOME}" />
-    	<antcall target="copy-gcl-from-downloaded" unless="${GOOG_HOME}" />
+    	<antcall target="copy-gcl-from-goog-home"/>
+    	<antcall target="copy-gcl-from-downloaded"/>
                  
         <antcall target="binary-package-zip"/>        
         <antcall target="binary-package-tgz"/>
         <copy todir="${basedir}/out" file="${basedir}/apache-flex-flexjs-installer-config.xml"
/>
     </target>
 
-	<target name="copy-gcl-from-goog-home">
+	<target name="copy-gcl-from-goog-home" if="GOOG_HOME">
 		<echo message="Copying GCL from ${GOOG_HOME}"></echo>
 		<copy todir="${basedir}/temp/js/lib/google/closure-library">
 			<fileset dir="${GOOG_HOME}" />
 		</copy>
 	</target>
 	
-	<target name="copy-gcl-from-downloaded">
+	<target name="copy-gcl-from-downloaded" unless="GOOG_HOME">
 		<echo message="Copying GCL from ${basedir}/temp/js/lib/google/closure-library"></echo>
 		<copy todir="${basedir}/temp/js/lib/google/closure-library">
-			<fileset dir="${GOOG_HOME}/js/lib/google/closure-library" />
+			<fileset dir="${basedir}/js/lib/google/closure-library" />
 		</copy>
 	</target>
 	


Mime
View raw message