Index: build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.529
diff -u -r1.529 build.xml
--- build.xml	19 Jul 2004 09:53:48 -0000	1.529
+++ build.xml	21 Jul 2004 12:50:01 -0000
@@ -81,27 +81,23 @@
     <property name="allmodules" value="${fixedmodules},${modules}"/>
   </target>
 
-  <target name="check-whether-to-pre-unscramble" depends="init-module-list">
-    <property name="moduleconfig-is-${moduleconfig}" value="true"/>
-  </target>
-  <target name="maybe-pre-unscramble" depends="check-whether-to-pre-unscramble" if="moduleconfig-is-stable" unless="netbeans.no.pre.unscramble">
-    <!-- To make things more pleasant for the user, unscramble standard modules now. -->
+  <target name="maybe-pre-unscramble" depends="init-module-list" unless="netbeans.no.pre.unscramble">
+    <!-- To make things more pleasant for the user, unscramble available modules now. -->
     <!-- Otherwise the user would be prompted at intervals and it would get annoying. -->
-    <!-- bootstrap already did nbbuild, xml -->
     <echo>About to unscramble additional third-party files you will probably need.
 If you do not plan to use them and wish to avoid accepting their licenses,
 try building with the flag: -Dnetbeans.no.pre.unscramble=true</echo>
-    <ant dir="../ant/external" target="unscramble"/>
-    <ant dir="../core/external" target="unscramble"/>
-    <ant dir="../httpserver/external" target="unscramble"/>
-    <ant dir="../j2eeserver/external" target="unscramble"/>
-    <ant dir="../java/external" target="unscramble"/>
-    <ant dir="../junit/external" target="unscramble"/>
-    <ant dir="../libs/external" target="unscramble"/>
-    <ant dir="../mdr/external" target="unscramble"/>
-    <ant dir="../tomcatint/external" target="unscramble"/> 
-    <ant dir="../web/external" target="unscramble"/>
-    <ant dir="../xml/external" target="unscramble"/>
+    <subant target="pre-unscramble-one" inheritall="true" genericantfile="build.xml" >
+      <dirset  dir=".." includes="*/external"/>
+    </subant>
+  </target>
+  <!-- this target is needed in order to let the subant task set correctly
+    the basedir to one of the */external directories. Then we can just
+    call the unscramble target and get the ant to run the right build script's
+    target withh the right basedir
+    -->
+  <target name="pre-unscramble-one" >
+     <ant target="unscramble" />
   </target>
 
   <target name="set-buildnumber" unless="buildnumber">