Index: apisupport/harness/release/build.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/build.xml,v
retrieving revision 1.30
diff -u -r1.30 build.xml
--- apisupport/harness/release/build.xml	1 Nov 2007 17:16:15 -0000	1.30
+++ apisupport/harness/release/build.xml	18 Jan 2008 22:22:02 -0000
@@ -56,32 +56,34 @@
     </target>
 
     <target name="basic-init" depends="projectized-common.basic-init">
+        <property name="build.dir" value="build" />
+    
         <!-- Must be done even without build-init, or clean will not work. -->
-        <condition property="cluster" value="${suite.dir}/build/cluster"> <!-- #59872 -->
+        <condition property="cluster" value="${suite.dir}/${build.dir}/cluster"> <!-- #59872 -->
             <isset property="suite.dir"/>
         </condition>
-        <property name="cluster" location="build/cluster"/>
+        <property name="cluster" location="${build.dir}/cluster"/>
         
-        <condition property="test.dist.dir" value="${suite.dir}/build/testdist">
+        <condition property="test.dist.dir" value="${suite.dir}/${build.dir}/testdist">
             <isset property="suite.dir"/>
         </condition>
-        <property name="test.dist.dir" location="build/testdist"/>
+        <property name="test.dist.dir" location="${build.dir}/testdist"/>
         
     </target>
     
     <target name="init" depends="basic-init,files-init,build-init"/>
 
     <target name="nbm-license-init" unless="license.file">
-        <mkdir dir="build"/>
-        <property name="license.file" location="build/no-license.txt"/>
+        <mkdir dir="${build.dir}"/>
+        <property name="license.file" location="${build.dir}/no-license.txt"/>
         <echo file="${license.file}">[NO LICENSE SPECIFIED]</echo>
     </target>
 
     <target name="build-init" depends="basic-init,nbm-license-init">
-        <condition property="public.package.jar.dir" value="${suite.dir}/build/public-package-jars">
+        <condition property="public.package.jar.dir" value="${suite.dir}/${build.dir}/public-package-jars">
             <isset property="suite.dir"/>
         </condition>
-        <property name="public.package.jar.dir" location="build/public-package-jars"/>
+        <property name="public.package.jar.dir" location="${build.dir}/public-package-jars"/>
         <mkdir dir="${public.package.jar.dir}"/>
         <!-- Similar to projectized.xml but does not try to set NBM homepage/distribution, nor is javahelp.excludes predefined. -->
         <parseprojectxml
@@ -124,7 +126,7 @@
         <property name="build.package.index" value="false"/>
         <property name="manifest.mf" location="manifest.mf"/>
         <property name="src.dir" location="src"/>
-        <property name="build.classes.dir" location="build/classes"/>
+        <property name="build.classes.dir" location="${build.dir}/classes"/>
         <property name="nbm" value="${code.name.base.dashes}.nbm"/>
         <property name="nbm.module.author" value=""/>
         <property name="nbm.release.date" value=""/>
@@ -137,7 +139,7 @@
             <pathelement path="${module.classpath}"/>
             <pathelement path="${cp.extra}"/>
         </path>
-        <property name="build.javahelp.dir" location="build/javahelp"/>
+        <property name="build.javahelp.dir" location="${build.dir}/javahelp"/>
         <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
         <property name="javahelp.search" value="JavaHelpSearch"/>
     </target>
Index: apisupport/harness/release/jnlp.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/jnlp.xml,v
retrieving revision 1.50
diff -u -r1.50 jnlp.xml
--- apisupport/harness/release/jnlp.xml	13 Nov 2007 14:39:29 -0000	1.50
+++ apisupport/harness/release/jnlp.xml	18 Jan 2008 22:22:02 -0000
@@ -49,6 +49,9 @@
     <!-- if not specified, assign all codebases to value suitable for jnlp-servlet.jar -->
     <property name="jnlp.codebase" value="$$$$codebase" />
     <property name="jnlp.codebase.app" value="$$$$codebase" />
+    
+    <property name="build.dir" value="build" />
+    <property name="dist.dir" value="dist" />
 
     <target name="-check-for-master.jnlp">
         <available file="master.jnlp" property="master.jnlp.exists"/>
@@ -101,8 +104,8 @@
     <target name="jnlp-init" depends="jnlp-init-generate-master">
         <fail unless="app.name">Must have set at least an application name ('app.name')</fail>
         
-        <property name="jnlp.dest.dir" location="build/jnlp"/>
-        <property name="jnlp.master.dir" location="build/tmp/master-jnlp"/>
+        <property name="jnlp.dest.dir" location="${build.dir}/jnlp"/>
+        <property name="jnlp.master.dir" location="${build.dir}/tmp/master-jnlp"/>
         <mkdir dir="${jnlp.master.dir}"/>
         
         <property name="disabled.modules" value=""/>
@@ -127,7 +130,7 @@
             </and>
         </fileset>
         <property name="jnlp.sign.jars" value="true"/>
-        <property name="jnlp.signjar.keystore" location="build/default.keystore"/>
+        <property name="jnlp.signjar.keystore" location="${build.dir}/default.keystore"/>
         <property name="jnlp.signjar.alias" value="jnlp"/>
         <property name="jnlp.signjar.password" value="netbeans"/>
         <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}"/>
@@ -209,7 +212,7 @@
             </condition>
         </fail>
         
-        <echo file="build/tmp/web.xml"><![CDATA[
+        <echo file="${build.dir}/tmp/web.xml"><![CDATA[
 <web-app>
  <servlet>
     <servlet-name>JnlpDownloadServlet</servlet-name>
@@ -221,28 +224,28 @@
  </servlet-mapping>
 </web-app>         
 ]]></echo>
-        <mkdir dir="dist"/>
-        <war basedir="${jnlp.dest.dir}" destfile="dist/${app.name}.war" webxml="build/tmp/web.xml">
+        <mkdir dir="${dist.dir}"/>
+        <war basedir="${jnlp.dest.dir}" destfile="${dist.dir}/${app.name}.war" webxml="${build.dir}/tmp/web.xml">
             <zipfileset dir="${jnlp.servlet.jar}/.." file="${jnlp.servlet.jar}" prefix="WEB-INF/lib"/>
         </war>
     </target>
 
     <target name="build-jnlp-local" depends="build-jnlp-nowar">
-        <property name="build.jnlp.local.dir" location="dist/jnlp/local"/>
+        <property name="build.jnlp.local.dir" location="${dist.dir}/jnlp/local"/>
         <mkdir dir="${build.jnlp.local.dir}"/>
         <mkdir dir="${build.jnlp.local.dir}/netbeans/"/>
         <mkdir dir="${build.jnlp.local.dir}/app/"/>
         
         <makeurl property="build.jnlp.local.url" file="${build.jnlp.local.dir}"/>
         <copy todir="${build.jnlp.local.dir}">
-            <fileset dir="build/jnlp">
+            <fileset dir="${build.dir}/jnlp">
                 <include name="*.jnlp"/>
             </fileset>
             <filterchain>
                 <replacestring from="$$$$codebase" to="${build.jnlp.local.url}"/>
             </filterchain>
         </copy>
-        <mkdir dir="build/jnlp/netbeans"/> <!-- else fileset will croak -->
+        <mkdir dir="${build.dir}/jnlp/netbeans"/> <!-- else fileset will croak -->
         <copy todir="${build.jnlp.local.dir}/netbeans/">
             <fileset dir="build/jnlp/netbeans">
                 <include name="**/*.jnlp"/>
@@ -252,7 +255,7 @@
             </filterchain>
         </copy>
         <copy todir="${build.jnlp.local.dir}/app/">
-            <fileset dir="build/jnlp/app">
+            <fileset dir="${build.dir}/jnlp/app">
                 <include name="**/*.jnlp"/>
             </fileset>
             <filterchain>
@@ -260,7 +263,7 @@
             </filterchain>
         </copy>
         <copy todir="${build.jnlp.local.dir}">
-            <fileset dir="build/jnlp">
+            <fileset dir="${build.dir}/jnlp">
                 <exclude name="**/*.jnlp"/>
             </fileset>
         </copy>
Index: apisupport/harness/release/run.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/run.xml,v
retrieving revision 1.26
diff -u -r1.26 run.xml
--- apisupport/harness/release/run.xml	26 Sep 2007 20:24:36 -0000	1.26
+++ apisupport/harness/release/run.xml	18 Jan 2008 22:22:02 -0000
@@ -43,11 +43,13 @@
 <project name="run" basedir=".">
 
     <target name="-init">
+        <property name="build.dir" value="build"/>    
+    
         <property name="run.jdkhome" location="${nbjdk.home}"/>
-        <condition property="test.user.dir" value="${suite.dir}/build/testuserdir">
+        <condition property="test.user.dir" value="${suite.dir}/${build.dir}/testuserdir">
             <isset property="suite.dir"/>
         </condition>
-        <property name="test.user.dir" location="build/testuserdir"/>
+        <property name="test.user.dir" location="${build.dir}/testuserdir"/>
         <property name="install" location="${netbeans.dest.dir}"/>
         <property name="run.args.common" value='--userdir "${test.user.dir}" -J-Dnetbeans.logger.console=true -J-ea'/>
         <!-- In case run from a suite module, to get app.name and/or branding.token: -->
Index: apisupport/harness/release/suite.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/suite.xml,v
retrieving revision 1.40
diff -u -r1.40 suite.xml
--- apisupport/harness/release/suite.xml	12 Oct 2007 18:12:54 -0000	1.40
+++ apisupport/harness/release/suite.xml	18 Jan 2008 22:22:02 -0000
@@ -63,6 +63,8 @@
         <property name="enabled.clusters" value=""/>
         <property name="disabled.clusters" value=""/>
         <property name="app.version" value="0.1"/>
+        <property name="build.dir" location="build"/>
+        <property name="dist.dir" location="dist"/>
         <property name="branding.dir" location="branding"/>
         <condition property="run.branding"> <!-- #84689 -->
             <and>
@@ -115,7 +117,7 @@
     </target>
 
     <target name="nbms" depends="build" description="Build NBMs and an Auto Update site descriptor for all modules in the suite.">
-        <property name="build.updates.dir" location="build/updates"/>
+        <property name="build.updates.dir" location="${build.dir}/updates"/>
         <!-- reads from suite/project.properties first -->
         <condition property="help.target.cluster" value="${nbm.target.cluster}" >
             <isset property="nbm.target.cluster"/>
@@ -189,7 +191,7 @@
             <mapper type="regexp" from="[/\\]([^/\\]+)[/\\]?$" to="\1"/> <!-- #71849 -->
         </pathconvert>
 
-        <property name="build.launcher.dir" location="build/launcher"/>
+        <property name="build.launcher.dir" location="${build.dir}/launcher"/>
         
         <mkdir dir="${build.launcher.dir}/etc"/>
         <mkdir dir="${build.launcher.dir}/bin"/>
@@ -206,8 +208,8 @@
     </target>
     
     <target name="build-zip" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform.">
-        <mkdir dir="dist"/>
-        <zip destfile="dist/${app.name}.zip">
+        <mkdir dir="${dist.dir}"/>
+        <zip destfile="${dist.dir}/${app.name}.zip">
             <zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/>
             <zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/>
             <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${app.name}">
@@ -231,26 +233,26 @@
         </zip>
     </target>
     <target name="create-platform" depends="build-zip" description="Creates an unzipped platform from the suite, launchers, and selected modules from the platform.">
-        <mkdir dir="dist/${app.name}"/>
-        <unzip src="dist/${app.name}.zip" dest="dist/${app.name}">
+        <mkdir dir="${dist.dir}/${app.name}"/>
+        <unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}/${app.name}">
             <globmapper from="${app.name}/*" to="*"/>
         </unzip>
     </target>
     
     <target name="build-mac" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform.">
-        <mkdir dir="dist"/>
-        <mkdir dir="dist/${app.name}.app"/>
-        <mkdir dir="dist/${app.name}.app/Contents"/>
-        <mkdir dir="dist/${app.name}.app/Contents/MacOS"/>
-        <mkdir dir="dist/${app.name}.app/Contents/Resources"/>
-        <copy file="${harness.dir}/etc/applicationIcon.icns" tofile="dist/${app.name}.app/Contents/Resources/${app.name}.icns"/>
-        <copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/bin">
+        <mkdir dir="${dist.dir}"/>
+        <mkdir dir="${dist.dir}/${app.name}.app"/>
+        <mkdir dir="${dist.dir}/${app.name}.app/Contents"/>
+        <mkdir dir="${dist.dir}/${app.name}.app/Contents/MacOS"/>
+        <mkdir dir="${dist.dir}/${app.name}.app/Contents/Resources"/>
+        <copy file="${harness.dir}/etc/applicationIcon.icns" tofile="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}.icns"/>
+        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/bin">
             <fileset dir="${build.launcher.dir}/bin/" />
         </copy>
-        <copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/etc">
+        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/etc">
             <fileset dir="${build.launcher.dir}/etc/" />
         </copy>
-        <copy todir="dist/${app.name}.app/Contents/Resources/${app.name}">
+        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}">
             <fileset dir="${netbeans.dest.dir}">
                 <include name="**/lib/nbexec*"/>
             </fileset>
@@ -264,21 +266,21 @@
                 </and>
             </fileset>
         </copy>
-        <copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/${app.name}">
+        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}">
             
             <fileset dir="${cluster}"/>
         </copy>
         
         <copy verbose="true" failonerror="false" 
-              file="dist/${app.name}.app/Contents/Resources/${app.name}/${app.name}/etc/${app.name}.icns" 
-              tofile="dist/${app.name}.app/Contents/Resources/${app.name}.icns"/>
+              file="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}/etc/${app.name}.icns" 
+              tofile="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}.icns"/>
         
         <delete file="${basedir}/dist/${app.name}.app/Contents/MacOS/${app.name}"/>
         <symlink link="${basedir}/dist/${app.name}.app/Contents/MacOS/${app.name}" resource="../Resources/${app.name}/bin/${app.name}"/>
-        <chmod file="dist/${app.name}.app/Contents/Resources/${app.name}/bin/${app.name}" perm="755"/>
-        <chmod dir="dist" includes="${app.name}.app/Contents/Resources/${app.name}/platform*/lib/nbexec" perm="755"/>
+        <chmod file="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/bin/${app.name}" perm="755"/>
+        <chmod dir="${dist.dir}" includes="${app.name}.app/Contents/Resources/${app.name}/platform*/lib/nbexec" perm="755"/>
         
-        <copy file="${harness.dir}/etc/Info.plist" tofile="dist/${app.name}.app/Contents/Info.plist">
+        <copy file="${harness.dir}/etc/Info.plist" tofile="${dist.dir}/${app.name}.app/Contents/Info.plist">
             <filterchain>
                 <replacestring from="$${app.name}" to="${app.name}"/>
                 <replacestring from="$${app.version}" to="${app.version}"/>
@@ -288,7 +290,7 @@
             </filterchain>
         </copy>
         <!-- zipping in ant doesn't preserve symlinks that seem to be required.
-        zip destfile="dist/${app.name}-MacOS.zip" basedir="dist" includes="${app.name}.app/**" duplicate="preserve"/-->
+        zip destfile="${dist.dir}/${app.name}-MacOS.zip" basedir="${dist.dir}" includes="${app.name}.app/**" duplicate="preserve"/-->
         <echo>
 You MacOS Application bundle was created at dist/${app.name}.app. For final packaging, use hdiutil or other tools to create a .dmg image.
 Alternatively use "zip -yr ${app.name}.app" to create a simple zipped distribution.
@@ -296,7 +298,7 @@
     </target>    
 
     <target name="-testuserdir-delete-init" depends="-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>
@@ -313,12 +315,12 @@
     
     <target name="clean" depends="-init,testuserdir-delete" description="Clean everything.">
         <delete failonerror="false" includeemptydirs="true">
-            <fileset dir="build">
+            <fileset dir="${build.dir}">
                 <exclude name="testuserdir/"/>
             </fileset>
         </delete>
         <subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/>
-        <delete dir="dist"/>
+        <delete dir="${dist.dir}"/>
     </target>
 
     <target name="branding" depends="-init" if="run.branding">