Attachment #58604 for bug #50972

View | Details | Raw Unified | Return to bug 50972 | Differences between

and this patch




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

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


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

Lines 36-42 Link Here

(-)/tmp/portage/cruisecontrol-2.1.6-r1/work/cruisecontrol-2.1.6/reporting/jsp/build.xml (-33 / +49 lines)
36	********************************************************************************-->	36	********************************************************************************-->
37	<project name="reporting-jsp" default="test" basedir=".">	37	<project name="reporting-jsp" default="test" 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="deploy.dir" value="${dist}"/>	43	<property name="deploy.dir" value="${dist}"/>
Lines 50-56 Link Here
50	<property name="tests" value="*Test"/>	51	<property name="tests" value="*Test"/>
51		52
52	<property name="checkstyle.fail.on.violation" value="true"/>	53	<property name="checkstyle.fail.on.violation" value="true"/>
		54
		55	<property name="ant.jar" value="${lib}/ant.jar"/>
		56	<property name="batik-awt-util.jar" value="${lib}/batik-awt-util.jar"/>
		57	<property name="batik-svggen.jar" value="${lib}/batik-svggen.jar"/>
		58	<property name="batik-util.jar" value="${lib}/batik-util.jar"/>
53	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>	59	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
		60	<property name="cewolf.jar" value="${lib}/cewolf.jar"/>
		61	<property name="commons-logging.jar" value="${lib}/commons-logging.jar"/>
		62	<property name="jcommon.jar" value="${lib}/jcommon-0.8.0.jar"/>
		63	<property name="jfreechart.jar" value="${lib}/jfreechart-0.9.8.jar"/>
		64	<property name="junit.jar" value="${lib}/junit.jar"/>
		65	<property name="optional.jar" value="${lib}/optional.jar"/>
		66	<property name="servlet.jar" value="${lib}/servlet.jar"/>
		67	<property name="xalan.jar" value="${lib}/xalan.jar"/>
		68	<property name="xerces.jar" value="${lib}/xerces.jar"/>
		69
		70	<path id="compile.classpath">
		71	<pathelement location="${servlet.jar}"/>
		72	<pathelement location="${xalan.jar}"/>
		73	<pathelement location="${cewolf.jar}"/>
		74	<pathelement location="${jfreechart.jar}"/>
		75	</path>
		76	<path id="test.classpath">
		77	<pathelement location="${servlet.jar}"/>
		78	<pathelement location="${xalan.jar}"/>
		79	<pathelement location="${junit.jar}"/>
		80	</path>
54		81
55	<target name="clean">	82	<target name="clean">
56	<delete dir="${dist}"/>	83	<delete dir="${dist}"/>
Lines 92-119 Link Here
92		119
93	<target name="compile" depends="init,check-duplication">	120	<target name="compile" depends="init,check-duplication">
94	<javac srcdir="${src}" destdir="${classes}" debug="true">	121	<javac srcdir="${src}" destdir="${classes}" debug="true">
95	<classpath>	122	<classpath refid="compile.classpath"/>
96	<pathelement location="${lib}/servlet.jar"/>
97	<pathelement location="${lib}/xalan.jar"/>
98	<pathelement location="${lib}/cewolf.jar"/>
99	<pathelement location="${lib}/jfreechart-0.9.8.jar"/>
100	</classpath>
101	</javac>	123	</javac>
102	</target>	124	</target>
103		125
104	<target name="test" depends="compile" description="Executes the unit tests">	126	<target name="test" depends="compile" description="Executes the unit tests">
105	<javac srcdir="${test}" destdir="${classes}">	127	<javac srcdir="${test}" destdir="${classes}">
106	<classpath>	128	<classpath refid="test.classpath">
107	<pathelement location="${lib}/servlet.jar"/>
108	<pathelement location="${lib}/xalan.jar"/>
109	<pathelement location="${lib}/junit.jar"/>
110	</classpath>
111	</javac>	129	</javac>
112	<junit fork="yes" haltonfailure="yes" printsummary="on">	130	<junit fork="yes" haltonfailure="yes" printsummary="on">
		131	<classpath refid="test.classpath"/>
113	<classpath>	132	<classpath>
114	<pathelement location="${lib}/servlet.jar"/>
115	<pathelement location="${lib}/xalan.jar"/>
116	<pathelement location="${lib}/junit.jar"/>
117	<pathelement location="${classes}"/>	133	<pathelement location="${classes}"/>
118	</classpath>	134	</classpath>
119	<formatter type="brief" usefile="false" />	135	<formatter type="brief" usefile="false" />
Lines 166-179 Link Here
166	<exclude name="*.properties"/>	182	<exclude name="*.properties"/>
167	</fileset>	183	</fileset>
168	<classes dir="${classes}"/>	184	<classes dir="${classes}"/>
169	<lib dir="${lib}">	185	<lib>
170	<include name="cewolf.jar"/>	186	<filename name="${cewolf.jar}"/>
171	<include name="commons-logging.jar"/>	187	<filename name="${common-logging.jar}"/>
172	<include name="jfreechart-0.9.8.jar"/>	188	<filename name="${jfreechart.jar}"/>
173	<include name="jcommon-0.8.0.jar"/>	189	<filename name="${jcommon.jar}"/>
174	<include name="batik-svggen.jar"/>	190	<filename name="${batik-svggen.jar}"/>
175	<include name="batik-awt-util.jar"/>	191	<filename name="${batik-awt-util.jar}"/>
176	<include name="batik-util.jar"/>	192	<filename name="${batik-util.jar}"/>
177	</lib>	193	</lib>
178	</war>	194	</war>
179	</target>	195	</target>
Lines 190-205 Link Here
190	<exclude name="${classes}/"/>	206	<exclude name="${classes}/"/>
191	<exclude name="${temp.dir}/"/>	207	<exclude name="${temp.dir}/"/>
192	</fileset>	208	</fileset>
193	<lib dir="${lib}">	209	<lib>
194	<include name="xalan.jar"/>	210	<filename name="${xalan.jar}"/>
195	<include name="xerces.jar"/>	211	<filename name="${xerces.jar}"/>
196	<include name="cewolf.jar"/>	212	<filename name="${cewolf.jar}"/>
197	<include name="commons-logging.jar"/>	213	<filename name="${common-logging.jar}"/>
198	<include name="jfreechart-0.9.8.jar"/>	214	<filename name="${jfreechart.jar}"/>
199	<include name="jcommon-0.8.0.jar"/>	215	<filename name="${jcommon.jar}"/>
200	<include name="batik-svggen.jar"/>	216	<filename name="${batik-svggen.jar}"/>
201	<include name="batik-awt-util.jar"/>	217	<filename name="${batik-awt-util.jar}"/>
202	<include name="batik-util.jar"/>	218	<filename name="${batik-util.jar}"/>
203	</lib>	219	</lib>
204	<classes dir="${classes}"/>	220	<classes dir="${classes}"/>
205	</war>	221	</war>

Return to bug 50972

Lines 38-43 Link Here

(-)/tmp/portage/cruisecontrol-2.1.6-r1/work/cruisecontrol-2.1.6/main/build.xml (-12 / +35 lines)
38	<project name="CruiseControl" default="clean-all" basedir=".">	38	<project name="CruiseControl" default="clean-all" basedir=".">
39	<property environment="env"/>	39	<property environment="env"/>
40	<property file="override.properties"/>	40	<property file="override.properties"/>
		41	<property file="${basedir}/build.properties"/>
41		42
42	<property name="docs" value="docs"/>	43	<property name="docs" value="docs"/>
43	<property name="apidocs" value="${docs}/api"/>	44	<property name="apidocs" value="${docs}/api"/>
Lines 54-86 Link Here
54	<property name="xsl" value="xsl"/>	55	<property name="xsl" value="xsl"/>
55		56
56	<property name="checkstyle.fail.on.violation" value="true"/>	57	<property name="checkstyle.fail.on.violation" value="true"/>
57	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
58		58
59	<property name="clover.home" value="${env.CLOVER_HOME}"/>
60	<property name="clover.jar" value="${clover.home}/lib/clover.jar"/>
61	<property name="clover.results" value="clover-results"/>	59	<property name="clover.results" value="clover-results"/>
62		60
		61	<property name="activation.jar" value="${lib}/activation.jar"/>
		62	<property name="clover.jar" value="${lib}/clover.jar"/>
		63	<property name="checkstyle.jar" value="${lib}/checkstyle-all-3.1.jar"/>
		64	<property name="commons-net.jar" value="${lib}/commons-net-1.1.0.jar"/>
		65	<property name="jakarta-oro.jar" value="${lib}/jakarta-oro.jar"/>
		66	<property name="jdom.jar" value="${lib}/jdom.jar"/>
		67	<property name="junit.jar" value="${lib}/junit.jar"/>
		68	<property name="log4j.jar" value="${lib}/log4j.jar"/>
		69	<property name="mail.jar" value="${lib}/mail.jar"/>
		70	<property name="mx4j-jmx.jar" value="${lib}/mx4j-jmx.jar"/>
		71	<property name="mx4j-tools.jar" value="${lib}/mx4j-tools.jar"/>
		72	<property name="optional.jar" value="${lib}/optional.jar"/>
		73	<property name="xalan.jar" value="${lib}/xalan.jar"/>
		74	<property name="xerces.jar" value="${lib}/xerces.jar"/>
		75
63	<path id="clover.classpath">	76	<path id="clover.classpath">
64	<pathelement location="${clover.jar}"/>	77	<pathelement location="${clover.jar}"/>
		78	</path>
		79	<path id="project.classpath">
		80	<!-- ant.jar and option,test-all,checkstyleal.jar are not included-->
		81	<pathelement location="${activation.jar}"/>
		82	<pathelement location="${checkstyle.jar}"/>
		83	<pathelement location="${commons-net.jar}"/>
		84	<pathelement location="${jakarta-oro.jar}"/>
		85	<pathelement location="${jdom.jar}"/>
		86	<pathelement location="${junit.jar}"/>
		87	<pathelement location="${log4j.jar}"/>
		88	<pathelement location="${mail.jar}"/>
		89	<pathelement location="${mx4j-jmx.jar}"/>
		90	<pathelement location="${mx4j-tools.jar}"/>
		91	<pathelement location="${xalan.jar}"/>
		92	<pathelement location="${xerces.jar}"/>
65	</path>	93	</path>
66		94
67	<!-- ****************************************************	95	<!-- ****************************************************
68	Define the project classpath references. Any jar found	96	Define the project classpath references. Any jar found
69	in lib directory will be included in CLASSPATH	97	in lib directory will be included in CLASSPATH
70	**************************************************** -->	98	**************************************************** -->
71	<path id="project.classpath" >
72	<fileset dir="lib">
73	<exclude name="ant.jar"/>
74	<exclude name="optional.jar"/>
75	</fileset>
76	</path>
77		99
78	<path id="project.runtime.classpath" >	100	<path id="project.runtime.classpath" >
79	<path refid="project.classpath" />	101	<path refid="project.classpath" />
80	<pathelement location="${classes}" />	102	<pathelement location="${classes}" />
81	<pathelement location="${test.classes}" />	103	<pathelement location="${test.classes}" />
82	<pathelement path="${java.class.path}"/>	104	<pathelement path="${java.class.path}"/>
83	<path refid="clover.classpath"/>
84	</path>	105	</path>
85		106
86	<target name="init" description="Setup build system">	107	<target name="init" description="Setup build system">
Lines 284-290 Link Here
284		305
285	<target name="clean-all" depends="clean, all" description="Performs a clean build, runs tests, and builds jar"/>	306	<target name="clean-all" depends="clean, all" description="Performs a clean build, runs tests, and builds jar"/>
286		307
287	<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" />	308	<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" />
		309
		310	<target name="test-all" depends="test,test-starteam,test-sametime" description="Perform all tests"/>
288		311
289	<target name="cvs-update" depends="init" if="localCopy">	312	<target name="cvs-update" depends="init" if="localCopy">
290	<cvs command="update -d -P" cvsroot=":pserver:anonymous@cvs.sourceforge.net:/cvsroot/cruisecontrol"	313	<cvs command="update -d -P" cvsroot=":pserver:anonymous@cvs.sourceforge.net:/cvsroot/cruisecontrol"