[jboss-svn-commits] JBL Code SVN: r23911 - labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build.

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

Author: mark.proctor at jboss.com
Date: 2008-11-17 23:01:22 -0500 (Mon, 17 Nov 2008)
New Revision: 23911

Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/customTargets.xml
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/setupEclipse.xml
Log:
getting guvnor sync tool working

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/customTargets.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/customTargets.xml	2008-11-18 01:47:59 UTC (rev 23910)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/customTargets.xml	2008-11-18 04:01:22 UTC (rev 23911)
@@ -1,6 +1,6 @@
 <project name="Build specific targets and properties" default="noDefault">
 	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
+	<!-- Run a given ${base} on all elements being built -->
 	<!-- Add on <ant> task for each top level element being built. -->
 	<!-- ===================================================================== -->
 	<property name="allElementsFile" value="${builder}/allElements.xml"/>
@@ -51,21 +51,15 @@
 	<!-- Steps to do before setup -->
 	<!-- ===================================================================== -->
 	<target name="preSetup">
-	  <echo>preSetup</echo>	  
-    <!--cleanup -->
-    <delete failonerror="false" file="${baseLocation}/org.drools.eclipse*.xml" />
-    <delete failonerror="false" dir="${base}/workspace"/>
-    <delete failonerror="false" dir="${base}/test-workspace"/>
-    
-    <delete failonerror="false" includeemptydirs="true">
-      <fileset dir="${base}/eclipse/features/" includes="org.drools.*"/>
-      <fileset dir="${base}/eclipse/features/" includes="org.guvnor.*"/>
-      <fileset dir="${base}/eclipse/features/" includes="org.eclipse.webdav.*"/>
-      
-      <fileset dir="${base}/eclipse/plugins/" includes="org.drools.*"/>
-      <fileset dir="${base}/eclipse/plugins/" includes="org.guvnor.*"/>
-      <fileset dir="${base}/eclipse/plugins/" includes="org.eclipse.webdav.*"/>
-    </delete>           
+	    <echo>preSetup</echo>	  
+        <!--cleanup -->
+        <delete failonerror="false" file="${baseLocation}/org.drools.eclipse*.xml" />
+        <delete failonerror="false" dir="${base}/test-workspace"/>
+        
+        <delete failonerror="false" dir="${baseLocation}/features/org.drools.eclipse.feature_${droolsVersion}" />
+        <delete failonerror="false" dir="${baseLocation}/features/org.drools.eclipse.test.feature_${droolsVersion}" />
+        <delete failonerror="false" dir="${baseLocation}/plugins/org.drools.eclipse.test_${droolsVersion}" />
+        <delete failonerror="false" file="${baseLocation}/plugins/org.drools.eclipse_${droolsVersion}.jar"/>      
 	</target>
 	
 	<!-- ===================================================================== -->
@@ -110,8 +104,7 @@
 		</copy>          
 	</target>
 
-	<target name="testPostSetup" if="mavenTestPhase">
-		
+	<target name="testPostSetup" if="mavenTestPhase">		
 		<copy todir="${buildDirectory}/features/org.drools.eclipse.test.feature">
 			<fileset dir="${builder}/../org.drools.eclipse.test.feature"/>
 		</copy>           
@@ -199,13 +192,12 @@
 	<!-- Steps to do to test the build results -->
 	<!-- ===================================================================== -->
   <target name="test" if="mavenTestPhase">  
-    <unzip src="${buildDirectory}/${buildLabel}/${org.drools.eclipse.zipFile}"
-           dest="${base}/eclipse"/>
-    <unzip src="${buildDirectory}/${buildLabel}/${org.drools.eclipse.test.ZipFile}" 
-           dest="${base}/eclipse"/>    
-
-
-    <ant antfile="${base}/eclipse/plugins/org.drools.eclipse.test_${droolsVersion}/test.xml">        
+      <unzip src="${buildDirectory}/${buildLabel}/${org.drools.eclipse.zipFile}" 
+             dest="${baseLocation}"/> 
+      <unzip src="${buildDirectory}/${buildLabel}/${org.drools.eclipse.test.zipFile}" 
+           dest="${baseLocation}"/>             
+           
+    <ant antfile="${baseLocation}/plugins/org.drools.eclipse.test_${droolsVersion}/test.xml">        
       <property name="os" value="${baseos}" />
       <property name="ws" value="${basews}" />
       <property name="arch" value="${basearch}" />

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/setupEclipse.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/setupEclipse.xml	2008-11-18 01:47:59 UTC (rev 23910)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-build/setupEclipse.xml	2008-11-18 04:01:22 UTC (rev 23911)
@@ -109,7 +109,7 @@
   </target>
   
   <target name="checkEclipseDir">
-    <available file="${base}/eclipse" property="skipUnzipEclipseJars" />
+    <available file="${baseLocation}" property="skipUnzipEclipseJars" />
   </target>
     
   <target name="setupLocalEclipse" depends="checkLocalEclipse" unless="skipSetupLocalEcipse">  
@@ -119,7 +119,7 @@
   </target>	
   
   <target name="checkLocalEclipse">
-      <available type="dir" file="${base}/eclipse" property="skipSetupLocalEcipse" />
+      <available type="dir" file="${baseLocation}" property="skipSetupLocalEcipse" />
   </target>
   
 </project>