commit e3f6466e770b065cca3061f6557450d71beea99f
author david_williams <david_williams> Thu Aug 21 17:23:13 2008 +0000
committer david_williams <david_williams> Thu Aug 21 17:23:13 2008 +0000
tree 5cbc44a0d8a6410467464edae115da39e94c09e0
parent 5408ab00b1ba9fb301242c7b0e10097e9376f190

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 67c242e..923d2a9 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -322,22 +322,22 @@
     	
     	<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip">
     	  <fileset dir="${buildDirectory}/tempforrezipping">
-            <includes name="eclipse/features/org.eclipse.wst.common.fproj_*/**"/>
-            <includes name="eclipse/plugins/org.eclipse.wst.common.project.facet.core_*.jar"/>
-            <includes name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui_*.jar"/>
+            <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>
     	</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"/>
+          <zipfileset src="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip"/>
     	  <fileset dir="${buildDirectory}/tempforrezipping">
-            <includes name="eclipse/features/org.eclipse.wst.common.fproj.sdk_*/**"/>
-            <includes name="eclipse/plugins/org.eclipse.wst.common.fproj.sdk_*.jar"/>
-            <includes name="eclipse/plugins/org.eclipse.wst.common.project.facet.doc.api_*.jar"/>
-            <includes name="eclipse/plugins/org.eclipse.wst.common.project.facet.core.source_*.jar"/>
-            <includes name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui.source_*.jar"/>
+            <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>
     	</zip>
 
@@ -345,21 +345,21 @@
     	
     	<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip">
     	  <fileset dir="${buildDirectory}/tempforrezipping">
-            <includes name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt_*/**"/>
-            <includes name="eclipse/plugins/org.eclipse.jst.common.project.facet.core_*.jar"/>
-            <includes name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui_*.jar"/>
+            <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>
     	</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"/>
+          <zipfileset src="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip"/>
     	  <fileset dir="${buildDirectory}/tempforrezipping">
-            <includes name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*/**"/>
-            <includes name="eclipse/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*.jar"/>
-            <includes name="eclipse/plugins/org.eclipse.jst.common.project.facet.core.source_*.jar"/>
-            <includes name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui.source_*.jar"/>
+            <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>
     	</zip>