[jboss-cvs] JBossAS SVN: r57558 - trunk/tools/etc/cruisecontrol/jbossnative

[jboss-cvs-commits at lists.jboss.org]

Author: rrajesh
Date: 2006-10-10 23:54:22 -0400 (Tue, 10 Oct 2006)
New Revision: 57558

Modified:
   trunk/tools/etc/cruisecontrol/jbossnative/build.xml
   trunk/tools/etc/cruisecontrol/jbossnative/daemon.xml
Log:
Updated jbossnative builds to use the new build scripts

Modified: trunk/tools/etc/cruisecontrol/jbossnative/build.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/jbossnative/build.xml	2006-10-11 03:53:54 UTC (rev 57557)
+++ trunk/tools/etc/cruisecontrol/jbossnative/build.xml	2006-10-11 03:54:22 UTC (rev 57558)
@@ -18,7 +18,6 @@
 	
 	<target name="buildJBossNative">
 		<remoteant machine="${remote.address}" port="${remote.port}">
-		    <sendfile file="${jbossnative.tarball.src}" todir="tarballs"/>
 			<runtarget target="startJBossNative">
 				<property name="jbossnative.version" value="${jbossnative.version}"/>
 				<property name="target.os" value="${target.os}"/>

Modified: trunk/tools/etc/cruisecontrol/jbossnative/daemon.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/jbossnative/daemon.xml	2006-10-11 03:53:54 UTC (rev 57557)
+++ trunk/tools/etc/cruisecontrol/jbossnative/daemon.xml	2006-10-11 03:54:22 UTC (rev 57558)
@@ -1,16 +1,22 @@
 <project>
 
+    <path id="project.classpath">
+        <fileset dir="../svnant/lib/">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+            	
+    <taskdef resource="svntask.properties" classpathref="project.classpath"/>
+	
 	<property name="address" value=""/>
 	<property name="port" value="7070"/>
 
 	<property name="work" value="${basedir}/work"/>
 
-    <property name="resource" value="tarballs"/>
 	<property name="target.os" value="unix"/>
 	
 	<property name="jbossnative-builder" value="../work/jbossnative-builder"/>
 	<property name="jbossnative.dist" value="${work}/jboss-native-${jbossnative.version}-${platform}"/>
-	<property name="jbossnative.tarball" value="jboss-native-${jbossnative.version}-${platform}.tar.gz"/>
 
 	<!-- Remote ant -->
 	<taskdef resource="org/jboss/ant/remoteant.properties">
@@ -18,74 +24,38 @@
 			<pathelement location="lib/jboss-remoteant.jar" />
 		</classpath>
 	</taskdef>
-		
-	<pathconvert targetos="${target.os}" property="jbossnative.src.tarball">
-        <path>
-            <fileset dir="${resource}" includes="jboss-native*gz"/>
-        </path>
-    </pathconvert>
-
-    <pathconvert targetos="${target.os}" property="jbossnative.build">
-        <path>
-            <dirset dir="${work}" includes="jboss-native*src"/>
-        </path>
-    </pathconvert>
 	
-	<target name="buildNative" if="buildlib">
+	<target name="buildNative">
 		<delete dir="${work}"/>
 		<mkdir dir="${work}"/>
-        <exec dir="${work}" executable="bash" output="${work}/${platform}-build.log">
-            <arg value="-c"/>
-            <arg value="gunzip -c ${jbossnative.src.tarball} | tar xvf -"/>
-        </exec>
 
-        <exec dir="${jbossnative.build}" executable="bash" output="${work}/${platform}-build.log" append="true">
-			<arg line="buildworld.sh"/>
+        <svn>
+            <checkout url="http://anonsvn.jboss.org/repos/jbossnative/trunk/build/daemon/" destPath="${work}"/>
+        </svn>
+
+        <exec dir="${work}" executable="bash" output="${work}/${platform}-build.log" append="true">
+			<arg line="unixbuild.sh"/>
 		</exec>
 	</target>
 
-    <target name="copyNativeLib" if="buildlib">
 
-		<mkdir dir="${jbossnative.dist}"/>
-    	<mkdir dir="${jbossnative.dist}/bin"/>
-		<mkdir dir="${jbossnative.dist}/bin/native"/>
-    	
-		<copy todir="${jbossnative.dist}/bin/native" flatten="true">
-	        <fileset dir="${jbossnative.build}/dist" includes="**/lib/*.*" excludes="**/lib/*.a,**/lib/*.la,**/lib/*.exp"/>
-	    </copy>
-		<delete>
-			<fileset dir="${resource}" includes="*.*"/>
-		</delete>
-    	
-    </target>
-
 	<target name="daemon">
 		<antserver address="${address}" port="${port}"/>
 	</target>
-
-	<condition property="buildlib">
-	   <not>
-	      <os family="windows"/>
-	   </not>
-	</condition>
 	
-	<target name="startJBossNative" depends="buildNative, copyNativeLib, packageJBossNative">
+	<target name="startJBossNative" depends="buildNative, packageJBossNative">
 		<property name="jbossnative.version" value="${jbossnative.version}"/>
         <property name="target.os" value="${target.os}"/>
         <property name="platform" value="${platform}"/>
 	</target>
 
-
     <target name="packageJBossNative">
-        <tar destfile="${work}/${jbossnative.tarball}"
-                longfile="gnu"
-                compression="gzip">
-            <tarfileset dir="${work}">
-                   <include name="jboss-native-${jbossnative.version}-${platform}/**/*"/>
-            </tarfileset>
-		</tar>
-		<delete file="${jbossnative-builder}/output/${platform}/${jbossnative.tarball}"/>
-		<copy file="${work}/${jbossnative.tarball}" todir="${jbossnative-builder}/output/${platform}"/>
+		<delete dir="${jbossnative-builder}/output/${platform}"/>
+    	<mkdir dir="${jbossnative-builder}/output/${platform}"/>
+
+        <copy todir="${jbossnative-builder}/output/${platform}">
+           <fileset dir="${work}" includes="*.gz"/>
+        </copy> 
     	<copy file="${work}/${platform}-build.log" todir="${jbossnative-builder}/output/${platform}"/>
 	</target>