flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - These scripts were not picking up env.TLF_HOME
Date Sat, 11 May 2013 14:40:44 GMT
Updated Branches:
  refs/heads/develop 1e2abca48 -> cc265a6c0


These scripts were not picking up env.TLF_HOME


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

Branch: refs/heads/develop
Commit: cc265a6c05d33d6319bc16d205b058e4c73af842
Parents: 1e2abca
Author: Alex Harui <aharui@apache.org>
Authored: Sat May 11 07:09:54 2013 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat May 11 07:11:31 2013 -0700

----------------------------------------------------------------------
 frameworks/build.xml                     |   17 ++++++++++++++++-
 frameworks/projects/textLayout/build.xml |   17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc265a6c/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index b68ccd4..68724aa 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -51,12 +51,27 @@
     <property environment="env"/>
     <property file="${FLEX_HOME}/build.properties"/>
  
-    <target name="main" depends="check-compile-env,clean,prepare,compile,javascript" 
+    <target name="main" depends="check-compile-env,check-tlf-home,clean,prepare,compile,javascript"

         description="Clean build of all SWCs"/>
 
     <target name="check-compile-env" description="Check for the required environment variables">
         <ant antfile="${FLEX_HOME}/build.xml" target="check-compile-env" dir="${FLEX_HOME}"/>
     </target>
+
+    <target name="check-tlf-home" unless="TLF_HOME"
+        description="Check TLF_HOME is a directory.">
+        
+        <echo message="TLF_HOME is ${env.TLF_HOME}"/>
+
+        <available file="${env.TLF_HOME}" 
+            type="dir" 
+            property="TLF_HOME"
+            value="${env.TLF_HOME}"/>
+
+        <fail message="TLF_HOME must be set correctly for a release build" 
+            unless="TLF_HOME"/>
+    	
+    </target>
     
     <target name="prepare" depends="local-fonts-snapshot, thirdparty-downloads"/>
     

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc265a6c/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/build.xml b/frameworks/projects/textLayout/build.xml
index ff5b790..1555574 100644
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@ -113,9 +113,24 @@
 	</macrodef>
 		
 				
-	<target name="main" depends="clean,compile,compile.external" description="Clean build
of textLayout.swc">
+	<target name="main" depends="check-tlf-home,clean,compile,compile.external" description="Clean
build of textLayout.swc">
 		<bundle locale="${locale}"/>
 	</target>
+
+    <target name="check-tlf-home" unless="TLF_HOME"
+        description="Check TLF_HOME is a directory.">
+        
+        <echo message="TLF_HOME is ${env.TLF_HOME}"/>
+
+        <available file="${env.TLF_HOME}" 
+            type="dir" 
+            property="TLF_HOME"
+            value="${env.TLF_HOME}"/>
+
+        <fail message="TLF_HOME must be set correctly for a release build" 
+            unless="TLF_HOME"/>
+    	
+    </target>
 	
 	<target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
 	


Mime
View raw message