commit 06e5813670de63e820e4786034fbcf9b5e8e67fd
author david_williams <david_williams> Fri Aug 22 04:18:22 2008 +0000
committer david_williams <david_williams> Fri Aug 22 04:18:22 2008 +0000
tree 886b8f42218a21dec34b3546016e4ce4a02b47a1
parent 31751413956a8334e5f76e23af8569be279b05d3

244808 new 'create ziips' task appears to have incorrect ant elements

releng.wtpbuilder/distribution/wtp.build/build.xml

diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 923d2a9..66d97f8 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -321,46 +321,46 @@
     	<delete file="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip" failonerror="false"/>
     	
     	<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip">
-    	  <fileset dir="${buildDirectory}/tempforrezipping">
+    	  <zipfileset src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
             <include name="eclipse/features/org.eclipse.wst.common.fproj_*/**"/>
             <include name="eclipse/plugins/org.eclipse.wst.common.project.facet.core_*.jar"/>
             <include name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui_*.jar"/>
-    	  </fileset>
+    	  </zipfileset>
     	</zip>
     	  	
     	<delete file="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip" failonerror="false"/>
     	
     	<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip">
           <zipfileset src="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip"/>
-    	  <fileset dir="${buildDirectory}/tempforrezipping">
+      	  <zipfileset src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
             <include name="eclipse/features/org.eclipse.wst.common.fproj.sdk_*/**"/>
             <include name="eclipse/plugins/org.eclipse.wst.common.fproj.sdk_*.jar"/>
             <include name="eclipse/plugins/org.eclipse.wst.common.project.facet.doc.api_*.jar"/>
             <include name="eclipse/plugins/org.eclipse.wst.common.project.facet.core.source_*.jar"/>
             <include name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui.source_*.jar"/>
-    	  </fileset>
+    	  </zipfileset>
     	</zip>
 
     	<delete file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip" failonerror="false"/>
     	
     	<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip">
-    	  <fileset dir="${buildDirectory}/tempforrezipping">
+      	  <zipfileset src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
             <include name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt_*/**"/>
             <include name="eclipse/plugins/org.eclipse.jst.common.project.facet.core_*.jar"/>
             <include name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui_*.jar"/>
-    	  </fileset>
+    	  </zipfileset>
     	</zip>
 
     	<delete file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip" failonerror="false"/>
     	
     	<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip">
           <zipfileset src="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip"/>
-    	  <fileset dir="${buildDirectory}/tempforrezipping">
+      	  <zipfileset src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
             <include name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*/**"/>
             <include name="eclipse/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*.jar"/>
             <include name="eclipse/plugins/org.eclipse.jst.common.project.facet.core.source_*.jar"/>
             <include name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui.source_*.jar"/>
-    	  </fileset>
+    	  </zipfileset>
     	</zip>
 		
     </target>