[patch] dev-util/cruisecontrol/files/cruisecontrol-2.2.1-gentoo.patch

cruisecontrol-2.2.1-gentoo.patch (text/plain), 10.65 KB, created by Christopher G. Stach II on 2005-05-11 09:29:50 UTC

diff -ur cruisecontrol-2.2.1-orig/main/build.xml cruisecontrol-2.2.1/main/build.xml
--- cruisecontrol-2.2.1-orig/main/build.xml	2005-01-25 10:09:12.000000000 -0600
+++ cruisecontrol-2.2.1/main/build.xml	2005-05-10 18:20:25.000000000 -0500
@@ -39,6 +39,7 @@
 <project name="CruiseControl" default="clean-all" basedir=".">
     <property environment="env"/>
     <property file="override.properties"/>
+    <property file="${basedir}/build.properties"/>
 
     <property name="version" value="2.2-dev"/>
 
@@ -57,24 +58,49 @@
     <property name="xsl" value="${basedir}/xsl"/>
 
     <property name="checkstyle.fail.on.violation" value="true"/>
-    <property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
 
-    <property name="clover.home" value="${env.CLOVER_HOME}"/>
-    <property name="clover.jar" value="${clover.home}/lib/clover.jar"/>
     <property name="clover.results" value="${target}/clover-results"/>
 
+    <property name="activation.jar" value="${lib}/activation.jar"/>
+    <property name="clover.jar" value="${lib}/clover.jar"/>
+    <property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
+    <property name="commons-net.jar" value="${lib}/commons-net-1.1.0.jar"/>
+    <property name="jakarta-oro.jar" value="${lib}/jakarta-oro.jar"/>
+    <property name="jdom.jar" value="${lib}/jdom.jar"/>
+    <property name="junit.jar" value="${lib}/junit.jar"/>
+    <property name="log4j.jar" value="${lib}/log4j.jar"/>
+    <property name="mail.jar" value="${lib}/mail.jar"/>
+    <property name="mx4j-jmx.jar" value="${lib}/mx4j-jmx.jar"/>
+    <property name="mx4j-tools.jar" value="${lib}/mx4j-tools.jar"/>
+    <property name="optional.jar" value="${lib}/optional.jar"/>
+    <property name="xalan.jar" value="${lib}/xalan.jar"/>
+    <property name="xerces.jar" value="${lib}/xerces.jar"/>
+
     <path id="clover.classpath">
         <pathelement location="${clover.jar}"/>
     </path>
-    
+
     <!-- ****************************************************
     Define the project classpath references.  Any jar found
     in lib directory will be included in CLASSPATH
     **************************************************** -->
     <path id="project.classpath" >
         <fileset dir="${lib}" includes="*.jar"/>
+        <pathelement path="${activation.jar}"/>
+        <pathelement path="${checkstyle.jar}"/>
+        <pathelement path="${commons-net.jar}"/>
+        <pathelement path="${jakarta-oro.jar}"/>
+        <pathelement path="${jdom.jar}"/>
+        <pathelement path="${junit.jar}"/>
+        <pathelement path="${log4j.jar}"/>
+        <pathelement path="${mail.jar}"/>
+        <pathelement path="${mx4j-jmx.jar}"/>
+        <pathelement path="${mx4j-tools.jar}"/>
+        <pathelement path="${xalan.jar}"/>
+        <pathelement path="${xerces.jar}"/>
     	<!-- ant.jar is also needed to compile the ArtifactsPublisher,
     	     but is added automatically to the javac classpath -->
+        <!-- ant.jar and option,test-all,checkstyleal.jar are not included-->
     </path>
 
     <path id="project.runtime.classpath" >
@@ -82,7 +108,6 @@
         <pathelement location="${classes}" />
         <pathelement location="${test.classes}" />
         <pathelement path="${java.class.path}"/>
-        <path refid="clover.classpath"/>
     </path>
 
     <target name="init" description="Setup build system">
@@ -295,8 +320,10 @@
     </target>
 
     <target name="clean-all" depends="clean, all" description="Performs a clean build, runs tests, and builds jar"/>
-    
-    <target name="all" depends="init,compile,compile-starteam,compile-sametime,checkstyle,check-duplication,test,test-starteam,test-sametime,test-nant,jar" description="Performs a build, runs tests, and builds jar" />
+
+    <target name="all" depends="init,compile,compile-starteam,compile-sametime,check-duplication,test-all,jar" description="Performs a build, runs tests, and builds jar" />
+
+    <target name="test-all" depends="test,test-starteam,test-sametime,test-nant" description="Perform all tests"/>
 
     <target name="cvs-update" depends="init" if="localCopy">
         <cvs command="update -d -P" cvsroot=":pserver:[e-mail]:/cvsroot/cruisecontrol"
diff -ur cruisecontrol-2.2.1-orig/reporting/jsp/build.xml cruisecontrol-2.2.1/reporting/jsp/build.xml
--- cruisecontrol-2.2.1-orig/reporting/jsp/build.xml	2004-11-03 13:49:22.000000000 -0600
+++ cruisecontrol-2.2.1/reporting/jsp/build.xml	2005-05-10 18:37:24.000000000 -0500
@@ -36,7 +36,8 @@
  ********************************************************************************-->
 <project name="reporting-jsp" default="war" basedir=".">
     <property environment="env"/>
-    <property file="override.properties"/>
+    <property file="${basedir}/override.properties"/>
+    <property file="${basedir}/build.properties"/>
 
     <property name="dist" value="dist"/>
     <property name="target" value="target"/>
@@ -53,14 +54,35 @@
 	<property name="webcontent" value="webcontent"/>
 
     <property name="checkstyle.fail.on.violation" value="true"/>
+
+    <property name="ant.jar" value="${lib}/ant.jar"/>
+    <property name="batik-awt-util.jar" value="${lib}/batik-awt-util.jar"/>
+    <property name="batik-svggen.jar" value="${lib}/batik-svggen.jar"/>
+    <property name="batik-util.jar" value="${lib}/batik-util.jar"/>
     <property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
+    <property name="cewolf.jar" value="${lib}/cewolf.jar"/>
+    <property name="commons-logging.jar" value="${lib}/commons-logging.jar"/>
+    <property name="jcommon.jar" value="${lib}/jcommon-0.8.0.jar"/>
+    <property name="jfreechart.jar" value="${lib}/jfreechart-0.9.8.jar"/>
+    <property name="junit.jar" value="${lib}/junit.jar"/>
+    <property name="optional.jar" value="${lib}/optional.jar"/>
+    <property name="servlet.jar" value="${lib}/servlet.jar"/>
+    <property name="xalan.jar" value="${lib}/xalan.jar"/>
+    <property name="xerces.jar" value="${lib}/xerces.jar"/>
+
+    <path id="compile.classpath">
+       <pathelement path="${servlet.jar}"/>
+       <pathelement path="${xalan.jar}"/>
+       <pathelement path="${cewolf.jar}"/>
+       <pathelement path="${jfreechart.jar}"/>
+    </path>
 
     <path id="project.runtime.classpath" >
-        <pathelement location="${lib}/servlet.jar"/>
-        <pathelement location="${lib}/xalan.jar"/>
-        <pathelement location="${lib}/junit.jar"/>
-        <pathelement location="${classes}"/>
-        <pathelement location="${test.classes}"/>
+        <pathelement path="${servlet.jar}"/>
+        <pathelement path="${xalan.jar}"/>
+        <pathelement path="${junit.jar}"/>
+        <pathelement path="${classes}"/>
+        <pathelement path="${test.classes}"/>
     </path>
 
     <target name="clean">
@@ -83,7 +105,7 @@
         <!-- Simian is failing even if no duplicated lines? -->
         <simian failOnDuplication="false">
             <fileset dir="${src}" includes="**/*.java"/>
-        </simian>        
+        </simian>
     </target>
 
     <!-- **************************************************** -->
@@ -99,14 +121,9 @@
         </checkstyle>
     </target>
 
-    <target name="compile" depends="init,check-duplication,checkstyle">
+    <target name="compile" depends="init,check-duplication">
         <javac srcdir="${src}" destdir="${classes}" debug="true">
-            <classpath>
-                <pathelement location="${lib}/servlet.jar"/>
-                <pathelement location="${lib}/xalan.jar"/>
-                <pathelement location="${lib}/cewolf.jar"/>
-                <pathelement location="${lib}/jfreechart-0.9.8.jar"/>
-            </classpath>
+            <classpath refid="compile.classpath"/>
         </javac>
     </target>
 
@@ -119,9 +136,7 @@
 
     <target name="test" depends="compile-test" description="Executes the unit tests">
         <junit fork="yes" forkmode="perBatch" haltonfailure="yes" printsummary="on" dir="${target}">
-            <classpath >
-                <path refid="project.runtime.classpath" />
-            </classpath>
+            <classpath refid="project.runtime.classpath" />
             <formatter type="brief" usefile="false" />
             <formatter type="xml"/>
             <batchtest todir="${test.results}" >
@@ -132,9 +147,7 @@
 
     <target name="test-one" depends="compile-test" description="Executes one unit test" if="testcase">
         <junit fork="yes" haltonfailure="yes" printsummary="on" dir="${target}">
-            <classpath >
-                <path refid="project.runtime.classpath" />
-            </classpath>
+            <classpath refid="project.runtime.classpath" />
             <formatter type="brief" usefile="false"/>
             <formatter type="xml" />
             <test name="${testcase}" todir="${junit.results}" />
@@ -162,23 +175,23 @@
         <input message="WARNING! Property cruise.build.artifacts.dir not set!  Please enter the absolute path to the directory where additional build artifacts are stored:"
             addproperty="cruise.build.artifacts.dir"/>
     </target>
-    
+
     <target name="war" depends="test, create-web-xml">
-	    <war warfile="${deploy.dir}/cruisecontrol.war" webxml="${temp.dir}/web.xml">
-	        <fileset dir="${webcontent}" excludes="WEB-INF/web.xml"/>
-	        <classes dir="${classes}"/>
-	        <lib dir="${lib}">
-                <include name="xalan.jar"  if="pre1.4"/>
-                <include name="xerces.jar" if="pre1.4"/>
-	            <include name="cewolf.jar"/>
-	            <include name="commons-logging.jar"/>
-	            <include name="jfreechart-0.9.8.jar"/>
-	            <include name="jcommon-0.8.0.jar"/>
-	            <include name="batik-svggen.jar"/>
-	            <include name="batik-awt-util.jar"/>
-	            <include name="batik-util.jar"/>
-	        </lib>
-	    </war>
-   	</target>
+        <war warfile="${deploy.dir}/cruisecontrol.war" webxml="${temp.dir}/web.xml">
+            <fileset dir="${webcontent}" excludes="WEB-INF/web.xml"/>
+            <classes dir="${classes}"/>
+            <lib dir="${lib}">
+                <include name="xalan.jar" if="pre1.4"/>
+                <include name="xerces.jar" if="pre1.4"/>
+                <include name="cewolf.jar"/>
+                <include name="commons-logging.jar"/>
+                <include name="jfreechart-0.9.8.jar"/>
+                <include name="jcommon-0.8.0.jar"/>
+                <include name="batik-svggen.jar"/>
+                <include name="batik-awt-util.jar"/>
+                <include name="batik-util.jar"/>
+            </lib>
+        </war>
+    </target>
 
 </project>