Index: build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.365
diff -u -r1.365 build.xml
--- build.xml	9 Oct 2003 11:20:18 -0000	1.365
+++ build.xml	16 Oct 2003 07:25:39 -0000
@@ -905,27 +905,36 @@
   <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
 
   <target name="build-nozip" depends="delete-and-merge" description="Build the IDE but do not create a final ZIP file.">
+    <antcall target="do-module-xml">
+      <param name="cluster" value="${netbeans.dest}/platform-3.6"/>
+    </antcall>  
+    <antcall target="do-module-xml">
+      <param name="cluster" value="${netbeans.dest}/ide-3.6"/>
+    </antcall>  
+  </target>
+  
+  <target name="do-module-xml" >
     <taskdef name="createmodulexml" classname="org.netbeans.nbbuild.CreateModuleXML" classpath="nbantext.jar"/>
-    <mkdir dir="${netbeans.dest}/system/Modules"/>
-    <mkdir dir="${netbeans.dest}/modules/autoload"/>
-    <mkdir dir="${netbeans.dest}/modules/eager"/>
-    <createmodulexml xmldir="${netbeans.dest}/system/Modules">
-      <enabled dir="${netbeans.dest}/modules">
+    <mkdir dir="${cluster}/system/Modules"/>
+    <mkdir dir="${cluster}/modules/autoload"/>
+    <mkdir dir="${cluster}/modules/eager"/>
+    <createmodulexml xmldir="${cluster}/system/Modules">
+      <enabled dir="${cluster}/modules">
         <include name="*.jar"/>
         <!-- Just to test that we can in fact preconfigure some disabled modules: -->
         <exclude name="icebrowser.jar"/>
       </enabled>
-      <disabled dir="${netbeans.dest}/modules">
+      <disabled dir="${cluster}/modules">
         <include name="icebrowser.jar"/>
       </disabled>
-      <autoload dir="${netbeans.dest}/modules/autoload">
+      <autoload dir="${cluster}/modules/autoload">
         <include name="*.jar"/>
       </autoload>
-      <eager dir="${netbeans.dest}/modules/eager">
+      <eager dir="${cluster}/modules/eager">
         <include name="*.jar"/>
       </eager>
     </createmodulexml>
-    <echo file="${netbeans.dest}/build_info">NetBeans dev build
+    <echo file="${cluster}/build_info">NetBeans dev build
 ------------------
 Number:   ${buildnumber}
 Date:     ${TODAY}
Index: antsrc/org/netbeans/nbbuild/NbMerge.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java,v
retrieving revision 1.21
diff -u -r1.21 NbMerge.java
--- antsrc/org/netbeans/nbbuild/NbMerge.java	11 Dec 2002 17:07:18 -0000	1.21
+++ antsrc/org/netbeans/nbbuild/NbMerge.java	16 Oct 2003 07:25:39 -0000
@@ -357,7 +357,14 @@
                     fs.createExclude ().setName ("**/*_" + locale + "/");
                 }
                 copy.addFileset (fs);
-                copy.setTodir (dest);
+                
+                File where;
+                if (fixedmodules.contains (module)) {
+                    where = new File (dest, "platform-3.6");
+                } else {
+                    where = new File (dest, "ide-3.6");
+                }
+                copy.setTodir (where);
                 copy.setIncludeEmptyDirs (true);
                 copy.init ();
                 copy.setLocation (location);