From 5085bd8b1b6715c3924cf6aa633835fa713828fe Mon Sep 17 00:00:00 2001
From: iwakeh <iwakeh@torproject.org>
Date: Mon, 23 Jan 2017 15:40:37 +0100
Subject: [PATCH] Some build file tweaks.
---
modules/webstats/build.xml | 8 +++-----
shared/build-base.xml | 15 ++++++++++++---
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/modules/webstats/build.xml b/modules/webstats/build.xml
index 3187c097..bcfe2516 100644
--- a/modules/webstats/build.xml
+++ b/modules/webstats/build.xml
@@ -1,19 +1,17 @@
<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>
diff --git a/shared/build-base.xml b/shared/build-base.xml
index 1284b2b1..759e1d07 100644
--- a/shared/build-base.xml
+++ b/shared/build-base.xml
@@ -1,6 +1,7 @@
<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}"
--
GitLab