Build changes needed to use nbbuild/netbeans as the build output location instead of visualweb/ravebuild/rave.
All the current ant targets remain the same for ravebuild or visualwebsuite build environment at this time.
1.1 --- a/misc/ravebuild/build.properties Fri Mar 23 06:30:47 2007 +0000
1.2 +++ b/misc/ravebuild/build.properties Fri Mar 23 17:05:52 2007 +0000
1.3 @@ -22,6 +22,6 @@
1.4 # Look at the j2ee or j2eeserver modules as examples.
1.5 #netbeans.forked.modules=libs,xml
1.6
1.7 -netbeans.dest.dir=rave
1.8 +netbeans.dest.dir=../../nbbuild/netbeans
1.9 #netbeans.location=../../nbbuild/netbeans
1.10 nojdkCopy=true
2.1 --- a/misc/ravebuild/build.xml Fri Mar 23 06:30:47 2007 +0000
2.2 +++ b/misc/ravebuild/build.xml Fri Mar 23 17:05:52 2007 +0000
2.3 @@ -95,13 +95,12 @@
2.4
2.5 <target name="prepare-netbeans-dest-dir" depends="-check-netbeans-copy, init"
2.6 unless="skip.netbeans.copy">
2.7 - <mkdir dir="${netbeans.dest.dir}"/>
2.8 + <!-- mkdir dir="${netbeans.dest.dir}"/>
2.9 <copy overwrite="true" todir="${netbeans.dest.dir}">
2.10 <fileset dir="${netbeans.dir}" includes="**"/>
2.11 </copy>
2.12 <chmod perm="755" file="${netbeans.dest.dir}/bin/netbeans"/>
2.13 - <property name="cluster.location" location="${netbeans.dest.dir}/visualweb1"/>
2.14 - <echo append="true" file="${netbeans.dest.dir}/etc/netbeans.clusters">visualweb1${line.separator}</echo>
2.15 + -->
2.16 </target>
2.17
2.18 <target name="build-netbeans" depends="-check-netbeans-build,init"
2.19 @@ -204,7 +203,7 @@
2.20
2.21 <target name="build" depends="prepare-netbeans-dest-dir, copy-jdk" description="Build the IDE, run basic validation tests, and start the IDE">
2.22 <ant antfile="../visualwebsuite/build.xml" target="build" inheritall="false"/>
2.23 - <echo file="${basedir}/rave/visualweb1/build-number">${buildnumber}</echo>
2.24 + <echo file="${netbeans.dest.dir}/visualweb1/build-number">${buildnumber}</echo>
2.25 <!-- ant antfile="../idesuite/build.xml" target="build" inheritall="false"/ -->
2.26 <!-- echo file="${basedir}/rave/raveide2.0/build-number">${buildnumber}</echo -->
2.27 </target>
2.28 @@ -218,7 +217,7 @@
2.29 -->
2.30
2.31 <target name="-suite-clean">
2.32 - <available file="${basedir}/rave/harness/suite.xml" property="harness.available"/>
2.33 + <available file="${netbeans.dest.dir}/harness/suite.xml" property="harness.available"/>
2.34 </target>
2.35
2.36 <target name="suite-clean" depends="init, -suite-clean" description="Cleans the module suite only" if="harness.available">
2.37 @@ -227,6 +226,7 @@
2.38 </target>
2.39
2.40 <target name="ravebuild-clean">
2.41 + <delete dir="${netbeans.dest.dir}/visualweb1"/>
2.42 <delete dir="build"/>
2.43 <delete file="raveantext.jar" failonerror="false" deleteonexit="true"/>
2.44 </target>
2.45 @@ -499,6 +499,7 @@
2.46 </target>
2.47
2.48 <target name="copy-jdk" depends="copy-env1" unless="noJdkCopy">
2.49 + <!--
2.50 <copy toDir="${jdkhome}">
2.51 <fileset dir="${shipJdkHome}">
2.52 <include name="COPYRIGHT"/>
2.53 @@ -518,6 +519,7 @@
2.54 <include name="**/bin/*"/>
2.55 </fileset>
2.56 </chmod>
2.57 + -->
2.58 </target>
2.59
2.60 <!-- Helper targets for building individual modules, this replaces the individual scripts -->
2.61 @@ -1066,6 +1068,10 @@
2.62 </target>
2.63
2.64 <target name="-unzip-netbeans-bin" depends="-get-netbeans-bin, init">
2.65 + <echo> nb.bin.base = ${nb.bin.base} </echo>
2.66 + <echo> nb.bin.dir = ${nb.bin.dir} </echo>
2.67 + <echo> nb.src.base = ${nb.src.base} </echo>
2.68 + <echo> nb.src.dir = ${nb.src.dir} </echo>
2.69 <mkdir dir="${nb.bin.base}"/>
2.70 <!-- use exec to avoid the file permission preservation issue in ant -->
2.71 <delete dir="${nb.bin.dir}" failonerror="false"/>
2.72 @@ -1205,7 +1211,7 @@
2.73 <echo> Installer installation dir is: ${myenv.ISMP}</echo>
2.74 <!-- ant dir="${nb_all.dir}/installer/profiler" target="build" -->
2.75 <ant dir="../../installer/nb_installer/creator" target="build">
2.76 - <property name="cluster.dir" location="rave/visualweb1"/>
2.77 + <property name="cluster.dir" location="../../nbbuild/netbeans/visualweb1"/>
2.78 <property name="ismp.home" location="${myenv.ISMP}"/>
2.79 <property name="installer.basename" value="${installer.basename}"/>
2.80 <property name="installer.suffix" value="${installer.suffix}"/>
2.81 @@ -1233,7 +1239,7 @@
2.82 <echo> Installer installation dir is: ${myenv.ISMP}</echo>
2.83 <!-- ant dir="${nb_all.dir}/installer/profiler" target="build" -->
2.84 <ant dir="../../installer/nb_installer/creator" target="build-cn">
2.85 - <property name="cluster.dir" location="rave/visualweb1"/>
2.86 + <property name="cluster.dir" location="netbeans/visualweb1"/>
2.87 <property name="ismp.home" location="${myenv.ISMP}"/>
2.88 <property name="installer.basename" value="${installer.basename}"/>
2.89 <property name="installer.suffix" value="${installer.suffix}"/>
3.1 --- a/misc/ravebuild/default-rave-properties.xml Fri Mar 23 06:30:47 2007 +0000
3.2 +++ b/misc/ravebuild/default-rave-properties.xml Fri Mar 23 17:05:52 2007 +0000
3.3 @@ -22,8 +22,8 @@
3.4
3.5 <dirname property="rave_all" file="${ant.file.default-rave-properties}/.."/>
3.6
3.7 - <property name="netbeans.dest.dir" location="${rave_all}/ravebuild/rave"/>
3.8 - <property name="netbeans.location" location="${rave_all}/ravebuild/netbeans"/>
3.9 + <property name="netbeans.dest.dir" location="${rave_all}/../nbbuild/netbeans"/>
3.10 + <property name="netbeans.location" location="${netbeans.dest.dir}"/>
3.11
3.12 <!-- setting dest and prefix for zip file -->
3.13 <property name="rave.zip.dest" location="${rave_all}/ravebuild"/>
3.14 @@ -61,8 +61,8 @@
3.15 <property name="nb.solx86.ml" value="${ml.nb.name.part1}-bin-${ml.nb.name.part2}-solaris-x86-${ml.nb.name.suffix}-${ml.nb.name.part3}.bin"/>
3.16 <property name="nb.win.ml" value="${ml.nb.name.part1}-bin-${ml.nb.name.part2}-windows-${ml.nb.name.suffix}-${ml.nb.name.part3}.exe"/>
3.17
3.18 - <property name="nb.bin.base" location="${rave_all}/ravebuild"/>
3.19 - <property name="nb.src.base" location="${rave_all}/ravebuild"/>
3.20 + <property name="nb.bin.base" location="${rave_all}/../nbbuild"/>
3.21 + <property name="nb.src.base" location="${rave_all}/../nbbuild"/>
3.22 <property name="nb.bin.dir" location="${nb.bin.base}/netbeans"/>
3.23 <property name="nb.src.dir" location="${nb.src.base}/netbeans-src"/>
3.24 <property name="nb.forked.modules.dir" location="${rave_all}"/>