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

[utils] / build / header.xml

diff --git a/build/header.xml b/build/header.xml
index 930517a64762688e5e36f92f836a8e5351519345..a06b43311cb72e95759b586d0fce6914db25f98a 100644 (file)
--- 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" />