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

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

Author: mark.proctor at jboss.com
Date: 2007-05-01 05:07:14 -0400 (Tue, 01 May 2007)
New Revision: 11539

Modified:
   labs/jbossrules/trunk/drools-eclipse/customTargets.xml
   labs/jbossrules/trunk/drools-eclipse/pom.xml
Log:
JBRULES-761 Automate the Eclipse build
-Eclipse now obeys -Dmaven.test.skip

Modified: labs/jbossrules/trunk/drools-eclipse/customTargets.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/customTargets.xml	2007-05-01 06:27:50 UTC (rev 11538)
+++ labs/jbossrules/trunk/drools-eclipse/customTargets.xml	2007-05-01 09:07:14 UTC (rev 11539)
@@ -163,12 +163,12 @@
 	<target name="postBuild">
 		<antcall target="gatherLogs" />
 		<antcall target="test" />
-	</target>
+	</target>	
 
 	<!-- ===================================================================== -->
 	<!-- Steps to do to test the build results -->
 	<!-- ===================================================================== -->
-  <target name="test" if="runTests">  
+  <target name="test" if="mavenTestPhase">  
     <unzip src="${buildDirectory}/${buildLabel}/jbossrules-eclipse-${jbossRulesVersion}.zip"
            dest="${base}/eclipse"/>
     <unzip src="${buildDirectory}/${buildLabel}/jbossrules-eclipse-test-${jbossRulesVersion}.zip" 

Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-05-01 06:27:50 UTC (rev 11538)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-05-01 09:07:14 UTC (rev 11539)
@@ -127,21 +127,25 @@
                
                <condition property="basearch" value="ppc">
                    <contains string="${os.name}" substring="ppc" />
-               </condition>
+               </condition>                     
                
                <condition property="basearch" value="sparc">
                    <contains string="${os.name}" substring="sparc" />
-               </condition>        
+               </condition>                   
+               
+               <condition property="mavenTestPhase" value="" else="-DmavenTestPhase=true">
+                   <isset property="maven.test.skip" />
+               </condition>                
               
                 <property name="eclipse.home" value="target/eclipse" />                             
                 
-                <echo>-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} -DrunTests=true -DmavenTestPhase=true</echo>
+                <echo>-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} ${mavenTestPhase}</echo>
                  
                 <java jar="${eclipse.home}/startup.jar"
                       fork="true"
                       failonerror="true"
                       maxmemory="128m">
-                     <arg line="-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} -DrunTests=true -DmavenTestPhase=true"/>
+                     <arg line="-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} ${mavenTestPhase}"/>
                 </java>                 
              </tasks>
            </configuration>