View | Details | Raw Unified | Return to bug 21863
Collapse All | Expand All

(-)build.xml (-58 / +62 lines)
Lines 40-87 Link Here
40
    <property name="repository" value="http://www.ibiblio.org/maven"/>
40
    <property name="repository" value="http://www.ibiblio.org/maven"/>
41
    <property name="forrest.home" value="${env.FORREST_HOME}"/>
41
    <property name="forrest.home" value="${env.FORREST_HOME}"/>
42
    <property name="main.src" value="src/java"/>
42
    <property name="main.src" location="src/java"/>
43
    <property name="main.src.test" value="src/testcases"/>
43
    <property name="main.src.test" location="src/testcases"/>
44
    <property name="main.documentation" value="src/documentation"/>
44
    <property name="main.documentation" value="src/documentation"/>
45
    <property name="main.output.dir" value="build/classes"/>
45
    <property name="main.output.dir" location="build/classes"/>
46
    <property name="main.output.test.dir" value="build/test-classes"/>
46
    <property name="main.output.test.dir" location="build/test-classes"/>
47
    <property name="main.lib" value="lib"/>
47
    <property name="main.lib" location="lib"/>
48
    <property name="main.reports.test" value="build/test-results"/>
48
    <property name="main.reports.test" location="build/test-results"/>
49
    <property name="main.jar1.dir" value="${main.lib}/commons-logging-1.0.1.jar"/>
49
    <property name="main.jar1.dir" location="${main.lib}/commons-logging-1.0.1.jar"/>
50
    <property name="main.jar1.url" value="${repository}/commons-logging/jars/commons-logging-1.0.1.jar"/>
50
    <property name="main.jar1.url" value="${repository}/commons-logging/jars/commons-logging-1.0.1.jar"/>
51
    <property name="main.jar2.dir" value="${main.lib}/log4j-1.2.8.jar"/>
51
    <property name="main.jar2.dir" location="${main.lib}/log4j-1.2.8.jar"/>
52
    <property name="main.jar2.url" value="${repository}/log4j/jars/log4j-1.2.8.jar"/>
52
    <property name="main.jar2.url" value="${repository}/log4j/jars/log4j-1.2.8.jar"/>
53
    <property name="main.testokfile" value="build/main-testokfile.txt"/>
53
    <property name="main.testokfile" location="build/main-testokfile.txt"/>
54
    <property name="scratchpad.src" value="src/scratchpad/src"/>
54
    <property name="scratchpad.src" location="src/scratchpad/src"/>
55
    <property name="scratchpad.src.test" value="src/scratchpad/testcases"/>
55
    <property name="scratchpad.src.test" location="src/scratchpad/testcases"/>
56
    <property name="scratchpad.lib" value="src/scratchpad/lib"/>
56
    <property name="scratchpad.lib" location="src/scratchpad/lib"/>
57
    <property name="scratchpad.reports.test" value="build/scratchpad-test-results"/>
57
    <property name="scratchpad.reports.test" location="build/scratchpad-test-results"/>
58
    <property name="scratchpad.output.dir" value="build/scratchpad-classes"/>
58
    <property name="scratchpad.output.dir" location="build/scratchpad-classes"/>
59
    <property name="scratchpad.output.test.dir" value="build/scratchpad-test-classes"/>
59
    <property name="scratchpad.output.test.dir" location="build/scratchpad-test-classes"/>
60
    <property name="scratchpad.testokfile" value="build/scratchpad-testokfile.txt"/>
60
    <property name="scratchpad.testokfile" location="build/scratchpad-testokfile.txt"/>
61
    <property name="contrib.src" value="src/contrib/src"/>
61
    <property name="contrib.src" location="src/contrib/src"/>
62
    <property name="contrib.src.test" value="src/contrib/testcases"/>
62
    <property name="contrib.src.test" location="src/contrib/testcases"/>
63
    <property name="contrib.lib" value="src/contrib/lib"/>
63
    <property name="contrib.lib" location="src/contrib/lib"/>
64
    <property name="contrib.reports.test" value="build/contrib-test-results"/>
64
    <property name="contrib.reports.test" location="build/contrib-test-results"/>
65
    <property name="contrib.output.dir" value="build/contrib-classes"/>
65
    <property name="contrib.output.dir" location="build/contrib-classes"/>
66
    <property name="contrib.output.test.dir" value="build/contrib-test-classes"/>
66
    <property name="contrib.output.test.dir" location="build/contrib-test-classes"/>
67
    <property name="contrib.jar1.dir" value="${contrib.lib}/commons-beanutils-1.6.jar"/>
67
    <property name="contrib.jar1.dir" location="${contrib.lib}/commons-beanutils-1.6.jar"/>
68
    <property name="contrib.jar1.url" value="${repository}/commons-beanutils/jars/commons-beanutils-1.6.jar"/>
68
    <property name="contrib.jar1.url" value="${repository}/commons-beanutils/jars/commons-beanutils-1.6.jar"/>
69
    <property name="contrib.jar2.dir" value="${contrib.lib}/commons-collections-2.1.jar"/>
69
    <property name="contrib.jar2.dir" location="${contrib.lib}/commons-collections-2.1.jar"/>
70
    <property name="contrib.jar2.url" value="${repository}/commons-collections/jars/commons-collections-2.1.jar"/>
70
    <property name="contrib.jar2.url" value="${repository}/commons-collections/jars/commons-collections-2.1.jar"/>
71
    <property name="contrib.jar3.dir" value="${contrib.lib}/commons-lang-1.0-b1.jar"/>
71
    <property name="contrib.jar3.dir" location="${contrib.lib}/commons-lang-1.0-b1.jar"/>
72
    <property name="contrib.jar3.url" value="${repository}/commons-lang/jars/commons-lang-1.0-b1.jar"/>
72
    <property name="contrib.jar3.url" value="${repository}/commons-lang/jars/commons-lang-1.0-b1.jar"/>
73
    <property name="contrib.testokfile" value="build/contrib-testokfile.txt"/>
73
    <property name="contrib.testokfile" location="build/contrib-testokfile.txt"/>
74
    <property name="junit.jar1.dir" value="${main.lib}/junit-3.8.1.jar"/>
74
    <property name="junit.jar1.dir" location="${main.lib}/junit-3.8.1.jar"/>
75
    <property name="junit.jar1.url" value="${repository}/junit/jars/junit-3.8.1.jar"/>
75
    <property name="junit.jar1.url" value="${repository}/junit/jars/junit-3.8.1.jar"/>
76
    <property name="build.site" value="build/tmp/site/build/site"/>
76
    <property name="build.site" location="build/tmp/site/build/site"/>
77
    <property name="build.site.src" value="build/tmp/site"/>
77
    <property name="build.site.src" location="build/tmp/site"/>
78
    <property name="junit.report.dir" value="${build.site}/junit"/>
78
    <property name="junit.report.dir" location="${build.site}/junit"/>
79
    <property name="jdepend.report.dir" value="${build.site}/jdepend"/>
79
    <property name="jdepend.report.dir" location="${build.site}/jdepend"/>
80
    <property name="jdepend.report.out.dir" value="${build.site.src}/src/documentation/content/jdepend"/>
80
    <property name="jdepend.report.out.dir" location="${build.site.src}/src/documentation/content/jdepend"/>
81
    <property name="apidocs.report.dir" value="${build.site}/apidocs"/>
81
    <property name="apidocs.report.dir" location="${build.site}/apidocs"/>
82
    <property name="changelog.file" value="${build.site}/changelog.html"/>
82
    <property name="changelog.file" location="${build.site}/changelog.html"/>
83
    <property name="dist.dir" value="build/dist"/>
83
    <property name="dist.dir" location="build/dist"/>
84
    <property name="jar.name" value="poi"/>
84
    <property name="jar.name" value="poi"/>
85
    <property name="version.id" value="2.0-pre2"/>
85
    <property name="version.id" value="2.0-pre2"/>
86
    <property name="halt.on.test.failure" value="true"/>
86
    <property name="halt.on.test.failure" value="true"/>
Lines 228-235 Link Here
228
        <junit printsummary="yes" showoutput="true" filtertrace="no" fork="no"
228
        <junit printsummary="yes" showoutput="true" filtertrace="no" fork="no"
229
            haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed">
229
            haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed">
230
            <classpath refid="test.classpath"/>
230
            <classpath refid="test.classpath"/>
231
            <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
231
            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
232
            <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
232
            <sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
233
            <formatter type="plain"/>
233
            <formatter type="plain"/>
234
            <formatter type="xml"/>
234
            <formatter type="xml"/>
235
            <batchtest todir="${main.reports.test}">
235
            <batchtest todir="${main.reports.test}">
Lines 246-253 Link Here
246
    <target name="single-test" depends="-test-property-check,compile-main">
246
    <target name="single-test" depends="-test-property-check,compile-main">
247
        <junit printsummary="no" showoutput="true" filtertrace="no" haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed">
247
        <junit printsummary="no" showoutput="true" filtertrace="no" haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed">
248
            <classpath refid="test.classpath"/>
248
            <classpath refid="test.classpath"/>
249
            <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
249
            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
250
            <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
250
            <sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
251
            <formatter type="plain" usefile="no"/>
251
            <formatter type="plain" usefile="no"/>
252
            <formatter type="xml"/>
252
            <formatter type="xml"/>
253
            <test name="${testcase}"/>
253
            <test name="${testcase}"/>
Lines 260-267 Link Here
260
            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=5001,server=y,suspend=y"/>
260
            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=5001,server=y,suspend=y"/>
261
            <sysproperty key="java.compiler" value="NONE"/>
261
            <sysproperty key="java.compiler" value="NONE"/>
262
            <classpath refid="test.classpath"/>
262
            <classpath refid="test.classpath"/>
263
            <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
263
            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
264
            <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
264
            <sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
265
            <formatter type="plain" usefile="no"/>
265
            <formatter type="plain" usefile="no"/>
266
            <test name="${testcase}"/>
266
            <test name="${testcase}"/>
267
        </junit>
267
        </junit>
Lines 284-290 Link Here
284
    </target>
284
    </target>
285
    <target name="test-scratchpad" depends="compile-scratchpad,-test-scratchpad-check" unless="scratchpad.test.notRequired">
285
    <target name="test-scratchpad" depends="compile-scratchpad,-test-scratchpad-check" unless="scratchpad.test.notRequired">
286
        <junit printsummary="yes" fork="no" haltonfailure="${halt.on.test.failure}">
286
        <junit printsummary="yes" fork="no" haltonfailure="${halt.on.test.failure}" failureproperty="scratchpad.test.failed">
287
            <classpath>
287
            <classpath>
288
                <path refid="scratchpad.classpath"/>
288
                <path refid="scratchpad.classpath"/>
289
                <pathelement location="${main.output.dir}"/>
289
                <pathelement location="${main.output.dir}"/>
Lines 292-301 Link Here
292
                <pathelement location="${scratchpad.output.test.dir}"/>
292
                <pathelement location="${scratchpad.output.test.dir}"/>
293
                <pathelement location="${junit.jar1.dir}"/>
293
                <pathelement location="${junit.jar1.dir}"/>
294
            </classpath>
294
            </classpath>
295
            <sysproperty key="HSSF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
295
            <sysproperty key="HSSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
296
            <sysproperty key="HPSF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
296
            <sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
297
            <sysproperty key="HDF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hdf/data"/>
297
            <sysproperty key="HDF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdf/data"/>
298
            <sysproperty key="HWPF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
298
            <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
299
            <formatter type="plain"/>
299
            <formatter type="xml"/>
300
            <formatter type="xml"/>
300
            <batchtest todir="${scratchpad.reports.test}">
301
            <batchtest todir="${scratchpad.reports.test}">
301
                <fileset dir="${scratchpad.src.test}">
302
                <fileset dir="${scratchpad.src.test}">
Lines 320-326 Link Here
320
    </target>
321
    </target>
321
    <target name="test-contrib" depends="compile-contrib,-test-contrib-check" unless="contrib.test.notRequired">
322
    <target name="test-contrib" depends="compile-contrib,-test-contrib-check" unless="contrib.test.notRequired">
322
        <junit printsummary="yes" fork="no" haltonfailure="${halt.on.test.failure}">
323
        <junit printsummary="yes" fork="no" haltonfailure="${halt.on.test.failure}" failureproperty="contrib.test.failed">
323
            <classpath>
324
            <classpath>
324
                <path refid="contrib.classpath"/>
325
                <path refid="contrib.classpath"/>
325
                <pathelement location="${main.output.dir}"/>
326
                <pathelement location="${main.output.dir}"/>
Lines 328-335 Link Here
328
                <pathelement location="${contrib.output.test.dir}"/>
329
                <pathelement location="${contrib.output.test.dir}"/>
329
                <pathelement location="${junit.jar1.dir}"/>
330
                <pathelement location="${junit.jar1.dir}"/>
330
            </classpath>
331
            </classpath>
331
            <sysproperty key="HSSF.testdata.path" value="${contrib.src.test}/org/apache/poi/hssf/data"/>
332
            <sysproperty key="HSSF.testdata.path" file="${contrib.src.test}/org/apache/poi/hssf/data"/>
332
            <sysproperty key="HPSF.testdata.path" value="${contrib.src.test}/org/apache/poi/hpsf/data"/>
333
            <sysproperty key="HPSF.testdata.path" file="${contrib.src.test}/org/apache/poi/hpsf/data"/>
334
            <formatter type="plain"/>
333
            <formatter type="xml"/>
335
            <formatter type="xml"/>
334
            <batchtest todir="${contrib.reports.test}">
336
            <batchtest todir="${contrib.reports.test}">
335
                <fileset dir="${contrib.src.test}">
337
                <fileset dir="${contrib.src.test}">
Lines 383-389 Link Here
383
        <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site">
385
        <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site">
384
            <property name="project.home" value="${build.site.src}"/>
386
            <property name="project.home" location="${build.site.src}"/>
385
        </ant>
387
        </ant>
386
        <echo>Broken links:</echo>
388
        <echo>Broken links:</echo>
Lines 502-511 Link Here
502
    <target name="generate-records" depends="init"
513
    <target name="generate-records" depends="init"
503
        description="generate-records">
514
        description="generate-records">
504
        <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
515
        <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
505
            <arg value="src/records/definitions"/>
516
            <arg location="src/records/definitions"/>
506
            <arg value="src/records/styles"/>
517
            <arg location="src/records/styles"/>
507
            <arg value="src/java"/>
518
            <arg location="src/java"/>
508
            <arg value="src/testcases"/>
519
            <arg location="src/testcases"/>
509
            <classpath>
520
            <classpath>
510
                <path refid="scratchpad.classpath">
521
                <path refid="scratchpad.classpath">
511
                </path>
522
                </path>
Lines 524-533 Link Here
524
        description="generate-types">
535
        description="generate-types">
525
        <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
536
        <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
526
            <arg value="src/types/definitions"/>
537
            <arg location="src/types/definitions"/>
527
            <arg value="src/types/styles"/>
538
            <arg location="src/types/styles"/>
528
            <arg value="src/scratchpad/src"/>
539
            <arg location="src/scratchpad/src"/>
529
            <arg value="src/scratchpad/testcases"/>
540
            <arg location="src/scratchpad/testcases"/>
530
            <classpath>
541
            <classpath>
531
                <path refid="scratchpad.classpath">
542
                <path refid="scratchpad.classpath">
532
                </path>
543
                </path>
Lines 590-595 Link Here
590
        <echo>Distribution located in build/dist</echo>
601
        <echo>Distribution located in build/dist</echo>
591
    </target>
602
    </target>
603
604
    <target name="clean-compile" depends="clean,compile"/>
592
    <target name="clean-dist" depends="clean,dist" description="Cleans the build directory then creates a distribution"/>
605
    <target name="clean-dist" depends="clean,dist" description="Cleans the build directory then creates a distribution"/>

Return to bug 21863