Context Navigation

Changeset 313

Timestamp:

02/23/10 20:27:48 (5 months ago)

Author:

martijn

Message:

Various fixes to buildsystem

Location:

trunk

Files:

r308	r313
26	26	</macrodef>
27	27
28		<target name="dist" depends="doc">
	28	<target name="build">
	29	<iterate target="dist"/>
	30	</target>
	31
	32	<target name="dist" depends="doc, build">
29	33	<iterate target="dist"/>
30	34
…	…
59	63	<include name="org.bridgedb/version.props"/>
60	64	<include name="**/build.xml"/>
61		<include name="org.bridgedb.webservice.biomart/src/org/bridgedb/webservice/biomart/filterconversion.txt"/>
	65	<include name="org.bridgedb.webservice.biomart/src/org/bridgedb/webservice/biomart/util/filterconversion.txt"/>
62	66	<include name="resources/*"/>
63	67	<include name="*/.java"/>
…	…
78	82	<target name="clean">
79	83	<iterate target="clean"/>
	84	<delete dir="apidoc"/>
80	85	</target>
81	86
…	…
86	91	<target name="dist-clean">
87	92	<iterate target="dist-clean"/>
	93	<delete dir="apidoc"/>
	94	<delete dir="dist"/>
88	95	</target>
89	96

r308	r313
17	17
18	18	<target name="clean" description="Remove all generated files.">
19		<delete dir="~~${build.dir}~~"/>
	19	<delete dir="build"/>
20	20	</target>
21	21
…	…
42	42	</target>
43	43
44		<target name="dist-clean" description="Remove all generated files.">
	44	<target name="dist-clean" depends="clean" description="Remove all generated files.">
45	45	<delete file="${jar.file}"/>
46	46	</target>

r308	r313
56	56
57	57	<taskdef resource="checkstyletask.properties"
58		classpath="build-lib/checkstyle-all-5.0.jar"/>
	58	classpath="../org.bridgedb/build-lib/checkstyle-all-5.0.jar"/>
59	59
60	60	<target name="test" depends="build">

r308	r313
55	55
56	56	<taskdef resource="checkstyletask.properties"
57		classpath="build-lib/checkstyle-all-5.0.jar"/>
	57	classpath="../org.bridgedb/build-lib/checkstyle-all-5.0.jar"/>
58	58
59	59	<target name="test" depends="build">

r312	r313
61	61	<path refid="class.path"/>
62	62	<pathelement location="build"/>
63		<pathelement location="../~~coreli~~b/build-lib/junit.jar"/>
64		<pathelement location="../~~coreli~~b/build-lib/measure.jar"/>
	63	<pathelement location="../org.bridgedb/build-lib/junit.jar"/>
	64	<pathelement location="../org.bridgedb/build-lib/measure.jar"/>
65	65	</path>
66	66	<javac srcdir="test" debug="true"