From: Erik Brakkee <erik@brakkee.org>
Date: Sat, 1 Apr 2006 19:08:20 +0000 (+0000)
Subject: build results now in subdir of project dir instead of in subdir of build
X-Git-Tag: wamblee-utils-0.7~1039
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=df6ecb4df32034cbce7f9cd87961ba7e59da089e;p=utils

build results now in subdir of project dir instead of in subdir of build
dir.
---

diff --git a/.classpath b/.classpath
index c4500542..21215708 100644
--- a/.classpath
+++ b/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry output="crawler/basic/bin" kind="src" path="crawler/basic/src"/>
-	<classpathentry output="crawler/basic/testbin" kind="src" path="crawler/basic/test"/>
-	<classpathentry output="crawler/kiss/bin" kind="src" path="crawler/kiss/src"/>
-	<classpathentry output="support/bin" kind="src" path="support/src"/>
-	<classpathentry output="support/testbin" kind="src" path="support/test"/>
+	<classpathentry output="crawler/basic/build/bin" kind="src" path="crawler/basic/src"/>
+	<classpathentry output="crawler/basic/build/testbin" kind="src" path="crawler/basic/test"/>
+	<classpathentry output="crawler/kiss/build/bin" kind="src" path="crawler/kiss/src"/>
+	<classpathentry output="support/build/bin" kind="src" path="support/src"/>
+	<classpathentry output="support/build/testbin" kind="src" path="support/test"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/external/jtidy-4aug2000r7-dev.jar"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/test/dbunit-2.1.jar"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/test/jmock-1.0.1.jar"/>
diff --git a/build/header.xml b/build/header.xml
index 930517a6..a06b4331 100644
--- a/build/header.xml
+++ b/build/header.xml
@@ -322,9 +322,6 @@
     <property name="external.lib.dir" value="lib/external"/>
     <property name="test.lib.dir" value="lib/test"/>
     <property name="special.lib.dir" value="${build.dir}/lib/special"/>
-    <property name="forrest.xdocs.dir" value="${project.home}/site/xdocs"/>
-    <property name="forrest.build.dir" value="${project.home}/site/build"/>
-    <property name="forrest.build.site.dir" value="${forrest.build.dir}/site"/>
     <property name="build.properties.dir" value="${project.home}" />
     <property name="build.properties.name" value="build.properties" />
     
@@ -506,14 +503,12 @@
 	               replace="/"
 	               global="true"
 	               defaultValue="${module.name}"/>
-	<property name="module.build.dir"
-		value="${build.dir}/${module.reldir}" />
-
+	<!-- property name="module.build.dir"
+		value="${build.dir}/${module.reldir}" / -->
+    <property name="module.build.dir" value="build"/>
 	<property name="module.api.forrest.dir" value="${forrest.build.site.dir}/api/${module.name}" />
-	<!-- property name="module.classes.dir"     value="${module.build.dir}/bin"/ -->
-	<!-- property name="module.testclasses.dir" value="${module.build.dir}/testbin"/ -->
-	<property name="module.classes.dir" value="bin" />
-	<property name="module.testclasses.dir" value="testbin" />
+	<property name="module.classes.dir" value="${module.build.dir}/bin" />
+	<property name="module.testclasses.dir" value="${module.build.dir}/testbin" />
 	<!-- Directory where generated SQL will be put by the schema export-->
 	<property name="module.sql.dir" value="${module.build.dir}/sql" />
 
diff --git a/build/trailer.xml b/build/trailer.xml
index a5a86335..6df4e18c 100644
--- a/build/trailer.xml
+++ b/build/trailer.xml
@@ -56,6 +56,7 @@
 	<delete dir="${module.docbase.dir}" />
 	<delete dir="${module.report.dir}" />
 	<delete dir="${module.sql.dir}" />
+	<delete dir="${module.build.dir}"/>
 </target>
 
 <target name="clean-deps" depends="init_directory_properties">
diff --git a/support/test/org/wamblee/io/FileSystemUtils.java b/support/test/org/wamblee/io/FileSystemUtils.java
index cffd0780..34ab13af 100644
--- a/support/test/org/wamblee/io/FileSystemUtils.java
+++ b/support/test/org/wamblee/io/FileSystemUtils.java
@@ -43,7 +43,7 @@ public final class FileSystemUtils {
     /**
      * Test input directory relative to the sub project. 
      */
-    private static final String TEST_INPUT_DIR = "resources/test";
+    private static final String TEST_INPUT_DIR = "../resources/test";
 
     /*
      * Disabled.