You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/05/24 11:04:54 UTC

[2/3] git commit: [flex-falcon] [refs/heads/develop] - Some minor modifications to the logic and more cleanup.

Some minor modifications to the logic and more cleanup.

Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>


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

Branch: refs/heads/develop
Commit: bed0cdf8d00695f20cdd5996314b880b216e1e9d
Parents: 67f221d
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri May 24 10:52:58 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri May 24 10:52:58 2013 +0200

----------------------------------------------------------------------
 jenkins.xml |   91 ++++++++++++-----------------------------------------
 1 files changed, 21 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bed0cdf8/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index 402d111..ecf26aa 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -19,83 +19,34 @@
 -->
 
 <project name="framework" default="main" basedir=".">
-    <property name="falcon.home" value="${basedir}"/>
-	<property name="falcon.jenkins.home" value="${falcon.home}/jenkins"/>
-	<property name="playerglobal.version" value="11.1"/>
-	
-	<!-- Set plyerglobal.version and locale -->
-	<!--loadproperties srcFile="${falcon.jenkins.home}/build.properties"/-->
 
-    <target name="main" depends="init, thirdparty-downloads"/>
-    
-    <!-- target name="thirdparty-downloads" depends="airsdk-download,playerglobal-download,jflex-download" description="Copies required downloads into place for build" / -->
-    <target name="thirdparty-downloads" depends="jflex-download" description="Copies required downloads into place for build" />
-    
-    <!-- target name="airsdk-check" description="Checks if the Air SDK has been downloaded.">
-        <available file="${falcon.jenkins.home}/air/frameworks/libs/air/airglobal.swc" property="airsdk.present"/>
-    </target -->
+    <property name="falcon.jenkins.home" value="${basedir}/jenkins" />
+    <property name="jflex.temp.filename" value="${falcon.jenkins.home}/temp/JFlex.zip" />
+    <property name="jflex.filename" value="jflex-1.4.3" />
+    <property name="jflex.root" value="${falcon.jenkins.home}/JFlex" />
+    <property name="jflex.home" value="${jflex.root}/${jflex.filename}/lib" />
 
-    <!-- target name="playerglobal-check" description="Checks if the playerglobal.swc has been downloaded.">
-        <available file="${falcon.jenkins.home}/player/${playerglobal.version}/playerglobal.swc" property="playerglobal.swc.present"/>
-    </target -->
-	
-	<target name="jflex-check" description="Checks if the JFlex.jar has been downloaded.">
-        <available file="${falcon.jenkins.home}/JFlex/lib/JFlex.jar" property="jflex.present"/>
-    </target> 	 
-	
-	<target name="init">
-		<mkdir dir="${falcon.jenkins.home}" />
+    <target name="main" depends="init, jflex-download"/>
+
+    <target name="init">
+        <mkdir dir="${falcon.jenkins.home}" />
         <mkdir dir="${falcon.jenkins.home}/temp"/>
-	</target>
-    
-    <!-- Adobe AIR SDK  -->
-    <!-- Because this requires a network connection it is copied only if it doesn't already exist. -->
-    <!-- Regardless of platform use the win kit to get airglobal.swc. --> 
-    <!-- target name="airsdk-download" depends="airsdk-check" unless="airsdk.present" description="Copies Adobe AIR SDK for the windows from the Adobe website">
-        <echo message="Be patient.  This takes a few minutes..." />
-        <mkdir dir="${falcon.jenkins.home}/air"/>
-        <get src="http://airdownload.adobe.com/air/win/download/3.4/AdobeAIRSDK.zip" 
-            dest="${falcon.jenkins.home}/temp/AIR Integration Kit.zip" 
-            verbose="false"/>
-        <unzip dest="${falcon.jenkins.home}/air" src="${falcon.jenkins.home}/temp/AIR Integration Kit.zip" />
-    </target -->
-	
-	<!-- JFlex -->
-    <!-- Because this requires a network connection it is copied only if it doesn't already exist. -->
-    <!-- Regardless of platform use the win kit to get airglobal.swc. --> 
+    </target>
+
     <target name="jflex-download" depends="jflex-check" unless="jflex.present" description="Copies JFlex from JFlex website">
-        <echo message="Be patient.  This takes a few minutes..." />
-        <mkdir dir="${falcon.jenkins.home}/JFlex"/>
-        <get src="http://jflex.de/jflex-1.4.3.zip" 
-            dest="${falcon.jenkins.home}/temp/JFlex.zip" 
-            verbose="false"/>
-        <unzip dest="${falcon.jenkins.home}/JFlex" src="${falcon.jenkins.home}/temp/JFlex.zip" />
+        <echo message="Be patient. This takes a few minutes..." />
+        <mkdir dir="${jflex.root}" />
+        <get src="http://jflex.de/${jflex.filename}.zip" dest="${jflex.temp.filename}" verbose="false" />
+        <unzip dest="${jflex.root}" src="${jflex.temp.filename}" />
     </target>
-	
-    <!-- playerglobal.swc -->
-    <!-- Because this requires a network connection it copies playglobal.swc only if it doesn't already exist. -->	
-	<!-- target name="playerglobal-download" depends="playerglobal-check,playerglobal-settarget,playerglobal11.1-download" description="Copies playerglobal.swc from the Adobe website">
-    </target -->
-	
-	<!-- target name="playerglobal-settarget" unless="playerglobal.swc.present">
-		<condition property="target11.1">
-			<equals arg1="${playerglobal.version}" arg2="11.1" />
-		</condition>
-	 </target -->
-	
-    <!-- target name="playerglobal11.1-download" if="target11.1">
-    	<mkdir dir="${falcon.jenkins.home}/player/${playerglobal.version}"/>
-        <get src="http://download.macromedia.com/pub/flashplayer/updaters/11/playerglobal11_1.swc" 
-            dest="${falcon.jenkins.home}/player/${playerglobal.version}/playerglobal.swc" 
-            verbose="false"/>
-    </target --> 
+
+    <target name="jflex-check" description="Checks if the JFlex.jar has been downloaded.">
+        <available file="${jflex.home}/JFlex.jar" property="jflex.present"/>
+    </target>      
 
     <target name="clean" description="Cleans third party downloaded files.">
-    	<delete dir="${falcon.jenkins.home}/temp" />
-    	<!-- delete dir="${falcon.jenkins.home}/air" / -->
-		<delete dir="${falcon.jenkins.home}/jflex" />
-        <!-- delete dir="${falcon.jenkins.home}/player"/ -->
-        <!-- delete dir="${falcon.jenkins.home}/flex"/ -->
+        <delete dir="${falcon.jenkins.home}/temp" />
+        <delete dir="${jflex.root}" />
      </target>
 
 </project>