[patch] cruisecontrol-2.1.6-gentoo.patch

cruisecontrol-2.1.6-gentoo.patch (text/plain), 11.22 KB, created by Josh Nichols (RETIRED) on 2005-05-10 11:42:30 UTC

Only in /tmp/cruisecontrol-2.1.6/main: .build.xml.swp
Only in /tmp/cruisecontrol-2.1.6/main: _auxLogs
Only in /tmp/cruisecontrol-2.1.6/main: _testCurrentBuildStatus.txt
Only in /tmp/cruisecontrol-2.1.6/main: build.properties
diff -ru /tmp/portage/cruisecontrol-2.1.6-r1/work/cruisecontrol-2.1.6/main/build.xml /tmp/cruisecontrol-2.1.6/main/build.xml
--- /tmp/portage/cruisecontrol-2.1.6-r1/work/cruisecontrol-2.1.6/main/build.xml	2004-06-23 00:12:02.000000000 -0400
+++ /tmp/cruisecontrol-2.1.6/main/build.xml	2005-05-10 02:25:15.000000000 -0400
@@ -38,6 +38,7 @@
 <project name="CruiseControl" default="clean-all" basedir=".">
     <property environment="env"/>
     <property file="override.properties"/>
+    <property file="${basedir}/build.properties"/>
 
     <property name="docs" value="docs"/>
     <property name="apidocs" value="${docs}/api"/>
@@ -54,33 +55,53 @@
     <property name="xsl" value="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="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}"/>
+    	<pathelement location="${clover.jar}"/>
+    </path>
+    <path id="project.classpath">
+	<!-- ant.jar and option,test-all,checkstyleal.jar are not included-->
+    	<pathelement location="${activation.jar}"/>
+    	<pathelement location="${checkstyle.jar}"/>
+    	<pathelement location="${commons-net.jar}"/>
+    	<pathelement location="${jakarta-oro.jar}"/>
+    	<pathelement location="${jdom.jar}"/>
+    	<pathelement location="${junit.jar}"/>
+    	<pathelement location="${log4j.jar}"/>
+    	<pathelement location="${mail.jar}"/>
+    	<pathelement location="${mx4j-jmx.jar}"/>
+    	<pathelement location="${mx4j-tools.jar}"/>
+    	<pathelement location="${xalan.jar}"/>
+    	<pathelement location="${xerces.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">
-            <exclude name="ant.jar"/>
-            <exclude name="optional.jar"/>
-        </fileset>
-    </path>
 
     <path id="project.runtime.classpath" >
         <path refid="project.classpath" />
         <pathelement location="${classes}" />
         <pathelement location="${test.classes}" />
         <pathelement path="${java.class.path}"/>
-        <path refid="clover.classpath"/>
     </path>
 
     <target name="init" description="Setup build system">
@@ -284,7 +305,9 @@
 
     <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,jar,clean-testresults" description="Performs a build, runs tests, and builds jar" />
+    <target name="all" depends="init,compile,compile-starteam,compile-sametime,jar,check-duplication,test-all,checkstyle" description="Performs a build, runs tests, and builds jar" />
+
+    <target name="test-all" depends="test,test-starteam,test-sametime" description="Perform all tests"/>
 
     <target name="cvs-update" depends="init" if="localCopy">
         <cvs command="update -d -P" cvsroot=":pserver:[e-mail]:/cvsroot/cruisecontrol"
Only in /tmp/cruisecontrol-2.1.6/main: c:
Only in /tmp/cruisecontrol-2.1.6/main: checkstyle.cache
Only in /tmp/cruisecontrol-2.1.6/main: checkstyleResults.txt
Only in /tmp/cruisecontrol-2.1.6/main: classes
Only in /tmp/cruisecontrol-2.1.6/main: clover-results
Only in /tmp/cruisecontrol-2.1.6/main: cruisecontrol.log
Only in /tmp/cruisecontrol-2.1.6/main: dist
Only in /tmp/cruisecontrol-2.1.6/main: log.xml
Only in /tmp/cruisecontrol-2.1.6/main: logs
Only in /tmp/cruisecontrol-2.1.6/main: myproject.ser
Only in /tmp/cruisecontrol-2.1.6/main: test-classes
Only in /tmp/cruisecontrol-2.1.6/main: test-results
Only in /tmp/cruisecontrol-2.1.6/main: testing
Only in /tmp/cruisecontrol-2.1.6/reporting/jsp: .build.xml.swp
diff -ru /tmp/portage/cruisecontrol-2.1.6-r1/work/cruisecontrol-2.1.6/reporting/jsp/build.xml /tmp/cruisecontrol-2.1.6/reporting/jsp/build.xml
--- /tmp/portage/cruisecontrol-2.1.6-r1/work/cruisecontrol-2.1.6/reporting/jsp/build.xml	2005-05-10 02:24:33.000000000 -0400
+++ /tmp/cruisecontrol-2.1.6/reporting/jsp/build.xml	2005-05-10 02:25:15.000000000 -0400
@@ -36,7 +36,8 @@
  ********************************************************************************-->
 <project name="reporting-jsp" default="test" 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="deploy.dir" value="${dist}"/>
@@ -50,7 +51,33 @@
     <property name="tests" value="*Test"/>
 
     <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 location="${servlet.jar}"/>
+	<pathelement location="${xalan.jar}"/>
+	<pathelement location="${cewolf.jar}"/>
+	<pathelement location="${jfreechart.jar}"/>
+    </path>
+    <path id="test.classpath">
+        <pathelement location="${servlet.jar}"/>
+	<pathelement location="${xalan.jar}"/>
+	<pathelement location="${junit.jar}"/>
+    </path>
 
     <target name="clean">
         <delete dir="${dist}"/>
@@ -92,28 +119,17 @@
 
     <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>
 
     <target name="test" depends="compile" description="Executes the unit tests">
         <javac srcdir="${test}" destdir="${classes}">
-            <classpath>
-                <pathelement location="${lib}/servlet.jar"/>
-                <pathelement location="${lib}/xalan.jar"/>
-                <pathelement location="${lib}/junit.jar"/>
-           </classpath>
+            <classpath refid="test.classpath">
         </javac>
         <junit fork="yes" haltonfailure="yes" printsummary="on">
+	    <classpath refid="test.classpath"/>
             <classpath>
-                <pathelement location="${lib}/servlet.jar"/>
-                <pathelement location="${lib}/xalan.jar"/>
-                <pathelement location="${lib}/junit.jar"/>
                 <pathelement location="${classes}"/>
             </classpath>
             <formatter type="brief" usefile="false" />
@@ -166,14 +182,14 @@
                 <exclude name="*.properties"/>
            </fileset>
             <classes dir="${classes}"/>
-            <lib dir="${lib}">
-                <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>
+    	        <filename name="${cewolf.jar}"/>
+	        <filename name="${common-logging.jar}"/>
+	        <filename name="${jfreechart.jar}"/>
+		<filename name="${jcommon.jar}"/>
+		<filename name="${batik-svggen.jar}"/>
+		<filename name="${batik-awt-util.jar}"/>
+		<filename name="${batik-util.jar}"/>
             </lib>
         </war>
     </target>
@@ -190,16 +206,16 @@
                 <exclude name="${classes}/"/>
                 <exclude name="${temp.dir}/"/>
             </fileset>
-            <lib dir="${lib}">
-                <include name="xalan.jar"/>
-                <include name="xerces.jar"/>
-                <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>
+                <filename name="${xalan.jar}"/>
+                <filename name="${xerces.jar}"/>
+    	        <filename name="${cewolf.jar}"/>
+	        <filename name="${common-logging.jar}"/>
+	        <filename name="${jfreechart.jar}"/>
+		<filename name="${jcommon.jar}"/>
+		<filename name="${batik-svggen.jar}"/>
+		<filename name="${batik-awt-util.jar}"/>
+		<filename name="${batik-util.jar}"/>
             </lib>
             <classes dir="${classes}"/>
         </war>
Only in /tmp/cruisecontrol-2.1.6/reporting/jsp: checkstyle.cache
Only in /tmp/cruisecontrol-2.1.6/reporting/jsp: checkstyleResults.txt