Index: build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.116
diff -c -r1.116 build.xml
*** build.xml	2001/06/25 10:14:26	1.116
--- build.xml	2001/06/27 16:10:05
***************
*** 348,354 ****
      <echo message="Virgin build created; see NetBeans-${buildnum}-virgin.zip."/>
    </target>
  
!   <target name="firststart-merge" depends="init,build-messaging">
      <mkdir dir="${netbeans.dest}"/>
      <nbmerge dest="${netbeans.dest}" topdir=".." modules="openide,core,${modules}" targetprefix="all-">
        <suppress locale="ja" unless="netbeans.japanese"/>
--- 348,360 ----
      <echo message="Virgin build created; see NetBeans-${buildnum}-virgin.zip."/>
    </target>
  
!   <target name="firststart-merge" depends="firststart-delete, merge" />
!   
!   <target name="firststart-delete">
!     <delete dir="${netbeans.dest}" />
!   </target>
!   
!   <target name="merge" depends="init,build-messaging">
      <mkdir dir="${netbeans.dest}"/>
      <nbmerge dest="${netbeans.dest}" topdir=".." modules="openide,core,${modules}" targetprefix="all-">
        <suppress locale="ja" unless="netbeans.japanese"/>
***************
Index: antsrc/org/netbeans/nbbuild/NbMerge.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java,v
retrieving revision 1.12
diff -c -r1.12 NbMerge.java
*** antsrc/org/netbeans/nbbuild/NbMerge.java	2000/12/11 11:11:06	1.12
--- antsrc/org/netbeans/nbbuild/NbMerge.java	2001/06/27 16:10:05
***************
*** 133,145 ****
          }
          project.addTarget (dummy);
          project.executeTarget (dummyName);
!         
          Delete delete = (Delete) project.createTask ("delete");
          delete.setDir (dest);
          delete.init ();
          delete.setLocation (location);
          delete.execute ();
! 
          List suppressedlocales = new LinkedList (); // List<String>
          Iterator it = suppress.iterator ();
          while (it.hasNext ()) {
--- 133,145 ----
          }
          project.addTarget (dummy);
          project.executeTarget (dummyName);
! /* Done in the build.xml directly
          Delete delete = (Delete) project.createTask ("delete");
          delete.setDir (dest);
          delete.init ();
          delete.setLocation (location);
          delete.execute ();
! */
          List suppressedlocales = new LinkedList (); // List<String>
          Iterator it = suppress.iterator ();
          while (it.hasNext ()) {