Attachment #58675 for bug #50972




<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"/>


    <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" >

        <pathelement location="${classes}" />
        <pathelement location="${test.classes}" />
        <pathelement path="${java.class.path}"/>
        <path refid="clover.classpath"/>
    </path>

    <target name="init" description="Setup build system">

    </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,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:anonymous@cvs.sourceforge.net:/cvsroot/cruisecontrol"

Lines 36-42 Link Here

(-)cruisecontrol-2.2.1-orig/reporting/jsp/build.xml (-37 / +50 lines)
36	********************************************************************************-->	36	********************************************************************************-->
37	<project name="reporting-jsp" default="war" basedir=".">	37	<project name="reporting-jsp" default="war" basedir=".">
38	<property environment="env"/>	38	<property environment="env"/>
39	<property file="override.properties"/>	39	<property file="${basedir}/override.properties"/>
		40	<property file="${basedir}/build.properties"/>
40		41
41	<property name="dist" value="dist"/>	42	<property name="dist" value="dist"/>
42	<property name="target" value="target"/>	43	<property name="target" value="target"/>
Lines 53-66 Link Here
53	<property name="webcontent" value="webcontent"/>	54	<property name="webcontent" value="webcontent"/>
54		55
55	<property name="checkstyle.fail.on.violation" value="true"/>	56	<property name="checkstyle.fail.on.violation" value="true"/>
		57
		58	<property name="ant.jar" value="${lib}/ant.jar"/>
		59	<property name="batik-awt-util.jar" value="${lib}/batik-awt-util.jar"/>
		60	<property name="batik-svggen.jar" value="${lib}/batik-svggen.jar"/>
		61	<property name="batik-util.jar" value="${lib}/batik-util.jar"/>
56	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>	62	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
		63	<property name="cewolf.jar" value="${lib}/cewolf.jar"/>
		64	<property name="commons-logging.jar" value="${lib}/commons-logging.jar"/>
		65	<property name="jcommon.jar" value="${lib}/jcommon-0.8.0.jar"/>
		66	<property name="jfreechart.jar" value="${lib}/jfreechart-0.9.8.jar"/>
		67	<property name="junit.jar" value="${lib}/junit.jar"/>
		68	<property name="optional.jar" value="${lib}/optional.jar"/>
		69	<property name="servlet.jar" value="${lib}/servlet.jar"/>
		70	<property name="xalan.jar" value="${lib}/xalan.jar"/>
		71	<property name="xerces.jar" value="${lib}/xerces.jar"/>
		72
		73	<path id="compile.classpath">
		74	<pathelement path="${servlet.jar}"/>
		75	<pathelement path="${xalan.jar}"/>
		76	<pathelement path="${cewolf.jar}"/>
		77	<pathelement path="${jfreechart.jar}"/>
		78	</path>
57		79
58	<path id="project.runtime.classpath" >	80	<path id="project.runtime.classpath" >
59	<pathelement location="${lib}/servlet.jar"/>	81	<pathelement path="${servlet.jar}"/>
60	<pathelement location="${lib}/xalan.jar"/>	82	<pathelement path="${xalan.jar}"/>
61	<pathelement location="${lib}/junit.jar"/>	83	<pathelement path="${junit.jar}"/>
62	<pathelement location="${classes}"/>	84	<pathelement path="${classes}"/>
63	<pathelement location="${test.classes}"/>	85	<pathelement path="${test.classes}"/>
64	</path>	86	</path>
65		87
66	<target name="clean">	88	<target name="clean">
Lines 83-89 Link Here
83	<!-- Simian is failing even if no duplicated lines? -->	105	<!-- Simian is failing even if no duplicated lines? -->
84	<simian failOnDuplication="false">	106	<simian failOnDuplication="false">
85	<fileset dir="${src}" includes="*/.java"/>	107	<fileset dir="${src}" includes="*/.java"/>
86	</simian>	108	</simian>
87	</target>	109	</target>
88		110
89	<!-- **************************************************** -->	111	<!-- **************************************************** -->
Lines 99-112 Link Here
99	</checkstyle>	121	</checkstyle>
100	</target>	122	</target>
101		123
102	<target name="compile" depends="init,check-duplication,checkstyle">	124	<target name="compile" depends="init,check-duplication">
103	<javac srcdir="${src}" destdir="${classes}" debug="true">	125	<javac srcdir="${src}" destdir="${classes}" debug="true">
104	<classpath>	126	<classpath refid="compile.classpath"/>
105	<pathelement location="${lib}/servlet.jar"/>
106	<pathelement location="${lib}/xalan.jar"/>
107	<pathelement location="${lib}/cewolf.jar"/>
108	<pathelement location="${lib}/jfreechart-0.9.8.jar"/>
109	</classpath>
110	</javac>	127	</javac>
111	</target>	128	</target>
112		129
Lines 119-127 Link Here
119		136
120	<target name="test" depends="compile-test" description="Executes the unit tests">	137	<target name="test" depends="compile-test" description="Executes the unit tests">
121	<junit fork="yes" forkmode="perBatch" haltonfailure="yes" printsummary="on" dir="${target}">	138	<junit fork="yes" forkmode="perBatch" haltonfailure="yes" printsummary="on" dir="${target}">
122	<classpath >	139	<classpath refid="project.runtime.classpath" />
123	<path refid="project.runtime.classpath" />
124	</classpath>
125	<formatter type="brief" usefile="false" />	140	<formatter type="brief" usefile="false" />
126	<formatter type="xml"/>	141	<formatter type="xml"/>
127	<batchtest todir="${test.results}" >	142	<batchtest todir="${test.results}" >
Lines 132-140 Link Here
132		147
133	<target name="test-one" depends="compile-test" description="Executes one unit test" if="testcase">	148	<target name="test-one" depends="compile-test" description="Executes one unit test" if="testcase">
134	<junit fork="yes" haltonfailure="yes" printsummary="on" dir="${target}">	149	<junit fork="yes" haltonfailure="yes" printsummary="on" dir="${target}">
135	<classpath >	150	<classpath refid="project.runtime.classpath" />
136	<path refid="project.runtime.classpath" />
137	</classpath>
138	<formatter type="brief" usefile="false"/>	151	<formatter type="brief" usefile="false"/>
139	<formatter type="xml" />	152	<formatter type="xml" />
140	<test name="${testcase}" todir="${junit.results}" />	153	<test name="${testcase}" todir="${junit.results}" />
Lines 162-184 Link Here
162	<input message="WARNING! Property cruise.build.artifacts.dir not set! Please enter the absolute path to the directory where additional build artifacts are stored:"	175	<input message="WARNING! Property cruise.build.artifacts.dir not set! Please enter the absolute path to the directory where additional build artifacts are stored:"
163	addproperty="cruise.build.artifacts.dir"/>	176	addproperty="cruise.build.artifacts.dir"/>
164	</target>	177	</target>
165		178
166	<target name="war" depends="test, create-web-xml">	179	<target name="war" depends="test, create-web-xml">
167	<war warfile="${deploy.dir}/cruisecontrol.war" webxml="${temp.dir}/web.xml">	180	<war warfile="${deploy.dir}/cruisecontrol.war" webxml="${temp.dir}/web.xml">
168	<fileset dir="${webcontent}" excludes="WEB-INF/web.xml"/>	181	<fileset dir="${webcontent}" excludes="WEB-INF/web.xml"/>
169	<classes dir="${classes}"/>	182	<classes dir="${classes}"/>
170	<lib dir="${lib}">	183	<lib dir="${lib}">
171	<include name="xalan.jar" if="pre1.4"/>	184	<include name="xalan.jar" if="pre1.4"/>
172	<include name="xerces.jar" if="pre1.4"/>	185	<include name="xerces.jar" if="pre1.4"/>
173	<include name="cewolf.jar"/>	186	<include name="cewolf.jar"/>
174	<include name="commons-logging.jar"/>	187	<include name="commons-logging.jar"/>
175	<include name="jfreechart-0.9.8.jar"/>	188	<include name="jfreechart-0.9.8.jar"/>
176	<include name="jcommon-0.8.0.jar"/>	189	<include name="jcommon-0.8.0.jar"/>
177	<include name="batik-svggen.jar"/>	190	<include name="batik-svggen.jar"/>
178	<include name="batik-awt-util.jar"/>	191	<include name="batik-awt-util.jar"/>
179	<include name="batik-util.jar"/>	192	<include name="batik-util.jar"/>
180	</lib>	193	</lib>
181	</war>	194	</war>
182	</target>	195	</target>
183		196
184	</project>	197	</project>

Return to bug 50972

Lines 39-44 Link Here

(-)cruisecontrol-2.2.1-orig/main/build.xml (-7 / +34 lines)
39	<project name="CruiseControl" default="clean-all" basedir=".">	39	<project name="CruiseControl" default="clean-all" basedir=".">
40	<property environment="env"/>	40	<property environment="env"/>
41	<property file="override.properties"/>	41	<property file="override.properties"/>
		42	<property file="${basedir}/build.properties"/>
42		43
43	<property name="version" value="2.2-dev"/>	44	<property name="version" value="2.2-dev"/>
44		45
Lines 57-80 Link Here
57	<property name="xsl" value="${basedir}/xsl"/>	58	<property name="xsl" value="${basedir}/xsl"/>
58		59
59	<property name="checkstyle.fail.on.violation" value="true"/>	60	<property name="checkstyle.fail.on.violation" value="true"/>
60	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
61		61
62	<property name="clover.home" value="${env.CLOVER_HOME}"/>
63	<property name="clover.jar" value="${clover.home}/lib/clover.jar"/>
64	<property name="clover.results" value="${target}/clover-results"/>	62	<property name="clover.results" value="${target}/clover-results"/>
65		63
		64	<property name="activation.jar" value="${lib}/activation.jar"/>
		65	<property name="clover.jar" value="${lib}/clover.jar"/>
		66	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
		67	<property name="commons-net.jar" value="${lib}/commons-net-1.1.0.jar"/>
		68	<property name="jakarta-oro.jar" value="${lib}/jakarta-oro.jar"/>
		69	<property name="jdom.jar" value="${lib}/jdom.jar"/>
		70	<property name="junit.jar" value="${lib}/junit.jar"/>
		71	<property name="log4j.jar" value="${lib}/log4j.jar"/>
		72	<property name="mail.jar" value="${lib}/mail.jar"/>
		73	<property name="mx4j-jmx.jar" value="${lib}/mx4j-jmx.jar"/>
		74	<property name="mx4j-tools.jar" value="${lib}/mx4j-tools.jar"/>
		75	<property name="optional.jar" value="${lib}/optional.jar"/>
		76	<property name="xalan.jar" value="${lib}/xalan.jar"/>
		77	<property name="xerces.jar" value="${lib}/xerces.jar"/>
		78
66	<path id="clover.classpath">	79	<path id="clover.classpath">
67	<pathelement location="${clover.jar}"/>	80	<pathelement location="${clover.jar}"/>
68	</path>	81	</path>
69		82
70	<!-- ****************************************************	83	<!-- ****************************************************
71	Define the project classpath references. Any jar found	84	Define the project classpath references. Any jar found
72	in lib directory will be included in CLASSPATH	85	in lib directory will be included in CLASSPATH
73	**************************************************** -->	86	**************************************************** -->
74	<path id="project.classpath" >	87	<path id="project.classpath" >
75	<fileset dir="${lib}" includes="*.jar"/>	88	<fileset dir="${lib}" includes="*.jar"/>
		89	<pathelement path="${activation.jar}"/>
		90	<pathelement path="${checkstyle.jar}"/>
		91	<pathelement path="${commons-net.jar}"/>
		92	<pathelement path="${jakarta-oro.jar}"/>
		93	<pathelement path="${jdom.jar}"/>
		94	<pathelement path="${junit.jar}"/>
		95	<pathelement path="${log4j.jar}"/>
		96	<pathelement path="${mail.jar}"/>
		97	<pathelement path="${mx4j-jmx.jar}"/>
		98	<pathelement path="${mx4j-tools.jar}"/>
		99	<pathelement path="${xalan.jar}"/>
		100	<pathelement path="${xerces.jar}"/>
76	<!-- ant.jar is also needed to compile the ArtifactsPublisher,	101	<!-- ant.jar is also needed to compile the ArtifactsPublisher,
77	but is added automatically to the javac classpath -->	102	but is added automatically to the javac classpath -->
		103	<!-- ant.jar and option,test-all,checkstyleal.jar are not included-->
78	</path>	104	</path>
79		105
80	<path id="project.runtime.classpath" >	106	<path id="project.runtime.classpath" >
Lines 82-88 Link Here
82	<pathelement location="${classes}" />	108	<pathelement location="${classes}" />
83	<pathelement location="${test.classes}" />	109	<pathelement location="${test.classes}" />
84	<pathelement path="${java.class.path}"/>	110	<pathelement path="${java.class.path}"/>
85	<path refid="clover.classpath"/>
86	</path>	111	</path>
87		112
88	<target name="init" description="Setup build system">	113	<target name="init" description="Setup build system">
Lines 295-302 Link Here
295	</target>	320	</target>
296		321
297	<target name="clean-all" depends="clean, all" description="Performs a clean build, runs tests, and builds jar"/>	322	<target name="clean-all" depends="clean, all" description="Performs a clean build, runs tests, and builds jar"/>
298		323
299	<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" />	324	<target name="all" depends="init,compile,compile-starteam,compile-sametime,check-duplication,test-all,jar" description="Performs a build, runs tests, and builds jar" />
		325
		326	<target name="test-all" depends="test,test-starteam,test-sametime,test-nant" description="Perform all tests"/>
300		327
301	<target name="cvs-update" depends="init" if="localCopy">	328	<target name="cvs-update" depends="init" if="localCopy">
302	<cvs command="update -d -P" cvsroot=":pserver:anonymous@cvs.sourceforge.net:/cvsroot/cruisecontrol"	329	<cvs command="update -d -P" cvsroot=":pserver:anonymous@cvs.sourceforge.net:/cvsroot/cruisecontrol"