1.1 --- a/sierra/build.pro	Tue Mar 30 17:18:59 2010 +0400
     1.2 +++ b/sierra/build.pro	Tue Mar 30 18:07:49 2010 +0400
     1.3 @@ -54,11 +54,9 @@
     1.4      <property name="netbeans.host" value="http://smetiste.czech.sun.com"/>
     1.5      <property name="netbeans.path" value="builds/netbeans/trunk/daily/2010-03-17_02-01-09/zip"/>
     1.6      <property name="netbeans.user" value=".netbeans/dev"/>
     1.7 +    <property name="netbeans.zip"  value="netbeans-6.9.zip"/>
     1.8  
     1.9      <property name="home" value="../.."/>
    1.10      <property name="cache" value="${home}/../cache"/>
    1.11 -    <property name="sierra.build"  value="main"/>
    1.12 -    <property name="netbeans.zip" value="netbeans-6.9.zip"/>
    1.13 -    <property name="repository" value="http://hg.netbeans.org/main"/>
    1.14 -    <property name="sierra.user"  value=".netbeans/dev"/>
    1.15 +    <property name="build.name"  value="main"/>
    1.16  </project>

     2.1 --- a/sierra/build.xml	Tue Mar 30 17:18:59 2010 +0400
     2.2 +++ b/sierra/build.xml	Tue Mar 30 18:07:49 2010 +0400
     2.3 @@ -39,11 +39,10 @@
     2.4    Version 2 license, then the option applies only if the new code is
     2.5    made subject to such option by the copyright holder.
     2.6  -->
     2.7 -<project name="sierra" basedir="." default="sierra-zip">
     2.8 +<project name="main" basedir="." default="main-zip">
     2.9      <import file="build.pro"/>
    2.10  
    2.11 -    <target name="sierra-zip" depends="init,netbeans,clean,build,zip"/>
    2.12 -    <target name="sierra-nbm" depends="init,netbeans,clean,javadoc,nbm"/>
    2.13 +    <target name="main-zip" depends="init,netbeans,clean,build,unit-test,javadoc,zip"/>
    2.14  
    2.15      <target name="init">
    2.16          <property name="env.BUILD_NUMBER" value=""/>
    2.17 @@ -71,13 +70,6 @@
    2.18          <unzip src="${cache}/netbeans/${netbeans.zip}" dest="${home}/nbbuild"/>
    2.19  
    2.20          <replace file="${home}/nbbuild/netbeans/etc/netbeans.conf" token="${netbeans.user}" value="${sierra.user}"/>
    2.21 -        <property name="env.BUILD_NUMBER" value=""/>
    2.22 -
    2.23 -        <echo file="${build.number}" message="netbeans build: ${netbeans.file}${line.separator}" append="true"/>
    2.24 -        <echo file="${build.number}" message="sierra build: ${time.stamp}${line.separator}" append="true"/>
    2.25 -        <echo file="${build.number}" message="sierra hudson: ${env.BUILD_NUMBER}${line.separator}" append="true"/>
    2.26 -        <echo file="${build.number}" message="repository: ${repository}" append="true"/>
    2.27 -
    2.28          <chmod file="${home}/nbbuild/netbeans/bin/netbeans" perm="ugo+rx"/>
    2.29      </target>
    2.30  
    2.31 @@ -86,7 +78,7 @@
    2.32          <delete dir="${cache}/latest"/>
    2.33          <mkdir dir="${cache}/latest"/>
    2.34  
    2.35 -        <zip destfile="${cache}/latest/${sierra.build}_${env.BUILD_NUMBER}_${time.stamp}.zip">
    2.36 +        <zip destfile="${cache}/latest/${build.name}_${env.BUILD_NUMBER}_${time.stamp}.zip">
    2.37              <zipfileset dir="${home}/nbbuild">
    2.38                  <include name="netbeans/bin/**"/>
    2.39                  <include name="netbeans/enterprise/**"/>
    2.40 @@ -102,7 +94,12 @@
    2.41              </zipfileset>
    2.42          </zip>
    2.43  
    2.44 -        <copy file="${cache}/latest/${sierra.build}_${env.BUILD_NUMBER}_${time.stamp}.zip" tofile="${cache}/latest/${sierra.build}.zip"/>
    2.45 +        <copy file="${cache}/latest/${build.name}_${env.BUILD_NUMBER}_${time.stamp}.zip" tofile="${cache}/latest/${build.name}.zip"/>
    2.46 +    </target>
    2.47 +
    2.48 +    <!-- unit test -->
    2.49 +    <target name="unit-test">
    2.50 +        <ant target="test" dir="${home}/print"/>
    2.51      </target>
    2.52  
    2.53      <!-- javadoc -->
    2.54 @@ -118,33 +115,15 @@
    2.55      <target name="do-module">
    2.56          <echo message="============= ${module} ============="/>
    2.57          <ant dir="${home}/${module}" target="${action}"/>
    2.58 -        <antcall target="run-nbm"/>
    2.59      </target>
    2.60  
    2.61 -    <!-- nbm -->
    2.62 -    <target name="run-nbm" depends="check-nbm,do-nbm"/>
    2.63 -    
    2.64 -    <target name="check-nbm">
    2.65 -        <available property="nbm.available" file="${home}/${module}/build"/>
    2.66 -    </target>
    2.67 -
    2.68 -    <target name="do-nbm" if="nbm.available">
    2.69 -        <copy todir="${cache}/nbm">
    2.70 -            <fileset dir="${home}/${module}/build">
    2.71 -                <include name="**/*.nbm"/>
    2.72 -            </fileset>
    2.73 -        </copy>
    2.74 -    </target>
    2.75 -
    2.76 -    <!-- clean, build, nbm -->
    2.77 +    <!-- clean, build -->
    2.78      <target name="clean" depends="clean-platform, clean-ide, clean-java, clean-xml"/>
    2.79      <target name="build" depends="build-platform, build-ide, build-java, build-xml"/>
    2.80 -    <target name=  "nbm" depends="  nbm-platform,   nbm-ide,   nbm-java,   nbm-xml"/>
    2.81  
    2.82      <!-- platform -->
    2.83      <target name="build-platform"><antcall target="do-platform"><param name="action" value="netbeans"/></antcall></target>
    2.84      <target name="clean-platform"><antcall target="do-platform"><param name="action" value="clean"/></antcall></target>
    2.85 -    <target name=  "nbm-platform"><antcall target="do-platform"><param name="action" value="nbm"/></antcall></target>
    2.86      <target name=   "do-platform">
    2.87          <antcall target="do-module"><param name="module" value="print"/></antcall>
    2.88          <antcall target="do-module"><param name="module" value="print.editor"/></antcall>
    2.89 @@ -153,7 +132,6 @@
    2.90      <!-- ide -->
    2.91      <target name="build-ide"><antcall target="do-ide"><param name="action" value="netbeans"/></antcall></target>
    2.92      <target name="clean-ide"><antcall target="do-ide"><param name="action" value="clean"/></antcall></target>
    2.93 -    <target name=  "nbm-ide"><antcall target="do-ide"><param name="action" value="nbm"/></antcall></target>
    2.94      <target name=   "do-ide">
    2.95          <antcall target="do-module"><param name="module" value="xml"/></antcall>
    2.96          <antcall target="do-module"><param name="module" value="xml.axi"/></antcall>
    2.97 @@ -177,7 +155,6 @@
    2.98      <!-- java -->
    2.99      <target name="build-java"><antcall target="do-java"><param name="action" value="netbeans"/></antcall></target>
   2.100      <target name="clean-java"><antcall target="do-java"><param name="action" value="clean"/></antcall></target>
   2.101 -    <target name=  "nbm-java"><antcall target="do-java"><param name="action" value="nbm"/></antcall></target>
   2.102      <target name=   "do-java">
   2.103          <antcall target="do-module"><param name="module" value="xml.jaxb"/></antcall>
   2.104          <antcall target="do-module"><param name="module" value="xml.tools.java"/></antcall>
   2.105 @@ -186,7 +163,6 @@
   2.106      <!-- xml -->
   2.107      <target name="build-xml"><antcall target="do-xml"><param name="action" value="netbeans"/></antcall></target>
   2.108      <target name="clean-xml"><antcall target="do-xml"><param name="action" value="clean"/></antcall></target>
   2.109 -    <target name=  "nbm-xml"><antcall target="do-xml"><param name="action" value="nbm"/></antcall></target>
   2.110      <target name=   "do-xml">
   2.111          <antcall target="do-module"><param name="module" value="libs.jxpath"/></antcall>
   2.112          <antcall target="do-module"><param name="module" value="visdev.prefuse"/></antcall>