Index: nbbuild/templates/common.xml
===================================================================
RCS file: /cvs/nbbuild/templates/common.xml,v
retrieving revision 1.75
diff -u -r1.75 common.xml
--- nbbuild/templates/common.xml	15 Jan 2008 12:17:11 -0000	1.75
+++ nbbuild/templates/common.xml	18 Jan 2008 22:21:45 -0000
@@ -50,6 +50,9 @@
         <!-- Synch the following property loads with NbModuleProject.makeEvalDefs: -->
         <property file="nbproject/private/private.properties"/>
         <property file="nbproject/project.properties"/>
+        
+        <property name="build.dir" value="build" />
+        
         <!-- Do not try to set module.classpath here, in particular: -->
         <!-- during a clean, the ${foo/bar.dir} properties may not be set. -->
         <parseprojectxml project="." codenamebasedashesproperty="code.name.base.dashes" codenamebaseslashesproperty="code.name.base.slashes"/>
@@ -109,7 +112,7 @@
 
     <target name="compile" depends="init">
         <mkdir dir="${build.classes.dir}"/>
-        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
+        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="${build.dir}/depcache">
             <classpath refid="cp"/>
         </depend>
         <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}" encoding="UTF-8"
@@ -156,7 +159,7 @@
         <mkdir dir="${build.classes.dir}"/>
         <!-- XXX consider forcing debug=true and deprecation=true -->
         <!-- XXX consider deleting the .class file first to force a rebuild -->
-        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
+        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="${build.dir}/depcache">
             <classpath refid="cp"/>
         </depend>
         <javac srcdir="${src.dir}" destdir="${build.classes.dir}"
@@ -301,10 +304,10 @@
         <input addproperty="storepass" message="Enter password for ${keystore}:"/>
     </target>
     <target name="nbm" depends="init,netbeans,-nbm-prompt-for-storepass" description="Build NBM archive.">
-        <mkdir dir="build"/>
+        <mkdir dir="${build.dir}"/>
         <property name="nbm.target.cluster" value=""/> <!-- fallback -->
         <property name="license.file.override" value="${license.file}"/>
-        <makenbm file="build/${nbm}"
+        <makenbm file="${build.dir}/${nbm}"
                  productdir="${cluster}"
                  module="${module.jar}"
                  homepage="${nbm.homepage}"
@@ -324,13 +327,13 @@
         <property name="test.unit.dir" location="test/unit"/>
         <property name="test.unit.src.dir" location="${test.unit.dir}/src"/>
         <property name="test.unit.data.dir" location="${test.unit.dir}/data"/>
-        <property name="build.test.unit.dir" location="build/test/unit"/>
+        <property name="build.test.unit.dir" location="${build.dir}/test/unit"/>
         <property name="build.test.unit.classes.dir" location="${build.test.unit.dir}/classes"/>
         <property name="build.test.unit.results.dir" location="${build.test.unit.dir}/results"/>
         <property name="build.test.unit.work.dir" location="${build.test.unit.dir}/work"/>
         <property name="extra.test.libs.dir" location="${test.dist.dir}/extralibs"/> 
         <!-- if project.xml doesn't contain test dependencies -->
-        <property name="test.unit.folder" location="build/test/unit/dist"/>
+        <property name="test.unit.folder" location="${build.dir}/test/unit/dist"/>
         <property name="test.unit.out.folder" location="${test.unit.folder}"/>
 
         <property name="test.filter.trace" value="true"/>
@@ -605,8 +608,8 @@
     
     <target name="arch" depends="init" description="Process an arch.xml, creating it if it does not yet exist.">
         <fail unless="javadoc.arch">You must define e.g. javadoc.arch=$${basedir}/arch.xml in project.properties</fail>
-        <mkdir dir="build"/>
-        <property name="arch.output.html" location="build/arch.html"/>
+        <mkdir dir="${build.dir}"/>
+        <property name="arch.output.html" location="${build.dir}/arch.html"/>
         <property name="arch.generate" value="true"/>
         <arch answers="${javadoc.arch}" output="${arch.output.html}"
             project="nbproject/project.xml" 
@@ -626,7 +629,7 @@
     </target>
     
     <target name="-testuserdir-delete-init" depends="files-init">
-        <property name="test.user.dir" location="build/testuserdir"/>
+        <property name="test.user.dir" location="${build.dir}/testuserdir"/>
         <property name="test.user.dir.lock" location="${test.user.dir}/lock"/>
         <available property="app.running" file="${test.user.dir.lock}"/>
     </target>
@@ -641,7 +644,7 @@
     
     <target name="clean" depends="files-init,testuserdir-delete,test-clean">
         <delete failonerror="false" includeemptydirs="true">
-            <fileset dir="build">
+            <fileset dir="${build.dir}">
                 <exclude name="testuserdir/"/>
             </fileset>
         </delete>