making sure that running the build twice - e.g. ant javahelp_nbproject/build.xml release produces the same results

jst · jst · commit fee243a96e60 · 2007-06-11T08:50:45.000Z
svn path=/trunk/; revision=52
diff --git a/JSearchIndexer_nbproject/build.xml b/JSearchIndexer_nbproject/build.xml
@@ -28,12 +28,13 @@ have any questions.
     <import file="nbproject/build-impl.xml"/>
 
     <target name="-post-jar">
-        <echo>
-Creating merged jsearch.jar
-        </echo>
-        <copy todir="${basedir}/build/classes">
+        <echo>Creating merged jsearch.jar</echo>
+        <jar jarfile="${basedir}/dist/jsearch.jar" excludes="${build.classes.excludes}">
+            <fileset dir="${basedir}/build/classes">
+                <include name="**/*"/>
+            </fileset>
             <fileset dir="../JSearchClient_nbproject/build/classes/">
-                <include name="**"/>
+                <include name="**/*"/>
             </fileset>
             <fileset dir="../javahelp_nbproject/build/classes/">
                 <include name="com/sun/java/help/impl/HeaderParser.class"/>
@@ -49,15 +50,11 @@ Creating merged jsearch.jar
                 <include name="javax/help/search/SearchQuery.class"/>
                 <include name="javax/help/search/SearchListener.class"/>
             </fileset>
-        </copy>
-        <jar basedir="${basedir}/build/classes" jarfile="${basedir}/dist/jsearch.jar" 
-            excludes="${build.classes.excludes}"/>
-            <echo>
-Creating jsearch-misc.jar
-            </echo>
+        </jar>
+        <echo>Creating jsearch-misc.jar</echo>
         
         <jar jarfile="${basedir}/dist/jsearch-misc.jar">
-            <fileset dir="${basedir}/build/classes">
+            <fileset dir="../javahelp_nbproject/build/classes/">
                 <include name="com/sun/java/help/impl/HeaderParser.class"/>
                 <include name="javax/help/HelpUtilities*.class"/>
                 <include name="javax/help/event/EventListenerList.class"/>
