Some build file tweaks.

5085bd8b · iwakeh · 2d67509a · 5085bd8b · 5085bd8b
Commit 5085bd8b authored 8 years ago by iwakeh
--- a/modules/webstats/build.xml
+++ b/modules/webstats/build.xml
 <project default="run" name="webstats" basedir=".">

+  <property name="sources" value="src/main/java"/>
+  <property name="testsources" value="src/test/java"/>
+
  <include file="../../shared/build-base.xml" as="basetask"/>
  <target name="clean" depends="basetask.clean"/>
  <target name="compile" depends="basetask.compile"/>
  <target name="test" depends="basetask.test"/>

-  <property name="sources" value="src/main/java"/>
-  <property name="testsources" value="src/test/java"/>
-
  <path id="classpath">
    <pathelement path="${classes}"/>
    <path refid="base.classpath" />
    <fileset dir="${libs}">
-      <include name="junit4-4.11.jar"/>
-      <include name="hamcrest-core-1.3.jar"/>
      <include name="postgresql-jdbc3-9.2.jar"/>
    </fileset>
  </path>

--- a/shared/build-base.xml
+++ b/shared/build-base.xml
 <project basedir=".">

  <property name="sources" value="src"/>
+  <property name="testsources" value="src/test/java"/>
  <property name="libs" value="../../shared/lib"/>
  <property name="generated" value="generated"/>
  <property name="classes" value="${generated}/classes/"/>
@@ -23,12 +24,20 @@
  </path>

  <path id="base.testclasspath">
-    <pathelement path="${base.classes}"/>
+    <pathelement path="${base.testclasses}"/>
+    <pathelement path="base.classpath"/>
    <fileset dir="${libs}">
+      <include name="hamcrest-core-1.3.jar"/>
      <include name="junit4-4.11.jar"/>
    </fileset>
  </path>

+  <path id="testclasspath">
+    <pathelement path="${testclasses}"/>
+    <path refid="base.testclasspath" />
+    <path refid="base.classpath" />
+  </path>
+
  <target name="clean">
    <delete includeEmptyDirs="true" quiet="true">
      <fileset dir="${generated}" defaultexcludes="false" includes="**" />
@@ -64,13 +73,13 @@
           optimize="false"
           failonerror="true"
           includeantruntime="false">
-      <classpath refid="classpath"/>
+      <classpath refid="testclasspath"/>
    </javac>
  </target>

  <target name="test" depends="testcompile">
    <junit fork="true" haltonfailure="true" printsummary="off">
-      <classpath refid="classpath"/>
+      <classpath refid="testclasspath"/>
      <formatter type="plain" usefile="false"/>
      <batchtest>
        <fileset dir="${testclasses}"