updated exportplugin.xml scripts to write source directly into jar (like the PDE exporter)

committed by mkeller

5 files changed, 11 insertions, 41 deletions

diff --git a/org.eclipse.core.filebuffers/scripts/exportplugin.xml b/org.eclipse.core.filebuffers/scripts/exportplugin.xml
index 7aa0a212945..bab09febef7 100644
--- a/org.eclipse.core.filebuffers/scripts/exportplugin.xml
+++ b/org.eclipse.core.filebuffers/scripts/exportplugin.xml
@@ -2,7 +2,6 @@
 	<target name="init">
 		<tstamp/>
 		<property name="destdir" value="../../plugin-export" />
-		<property name="tempdir" value="../../tmp" />
 		<property name="plugin"  value="org.eclipse.core.filebuffers" />
 		<property name="plugin_version"  value="_3.1.0" />
 		<property name="dest"  value="${destdir}/${plugin}${plugin_version}" />
@@ -14,22 +13,17 @@
 	</target>
 
 	<target name="export" depends="build">
-		<delete dir="${tempdir}" />
-		<mkdir dir="${tempdir}" />
 		<mkdir dir="${destdir}" />
 		<delete file="${destjar}" />
-		<zip zipfile="${tempdir}/src.zip">
-		    <fileset dir="src" />
-  		</zip>		
 		<zip zipfile="${destjar}">
 			<fileset dir=".">
 			  <include name="plugin.xml" />
 			  <include name="plugin.properties" />
 			  <include name="META-INF/**" />
+			  <include name="schema/**" />
+			  <include name="src/**" />
 			</fileset>
 			<fileset dir="bin" />
-			<fileset file="${tempdir}/src.zip" />
 		</zip>
-		<delete dir="${tempdir}" />
 	</target>
 </project>
diff --git a/org.eclipse.jface.text/scripts/exportplugin.xml b/org.eclipse.jface.text/scripts/exportplugin.xml
index 390a8e604d8..3d23a5eb8bf 100644
--- a/org.eclipse.jface.text/scripts/exportplugin.xml
+++ b/org.eclipse.jface.text/scripts/exportplugin.xml
@@ -2,7 +2,6 @@
 	<target name="init">
 		<tstamp/>
 		<property name="destdir" value="../../plugin-export" />
-		<property name="tempdir" value="../../tmp" />
 		<property name="plugin"  value="org.eclipse.jface.text" />
 		<property name="plugin_version"  value="_3.1.0" />
 		<property name="dest"  value="${destdir}/${plugin}${plugin_version}" />
@@ -14,23 +13,19 @@
 	</target>
 
 	<target name="export" depends="build">
-		<delete dir="${tempdir}" />
-		<mkdir dir="${tempdir}" />
 		<mkdir dir="${destdir}" />
 		<delete file="${destjar}" />
-		<zip zipfile="${tempdir}/src.zip">
-		    <fileset dir="src" />
-  		</zip>		
 		<zip zipfile="${destjar}">
 			<fileset dir=".">
 			  <include name="plugin.xml" />
 			  <include name="plugin.properties" />
 			  <include name=".options" />
 			  <include name="META-INF/**" />
+			  <include name="schema/**" />
+			  <include name="src/**" />
 			</fileset>
 			<fileset dir="bin" />
-			<fileset file="${tempdir}/src.zip" />
+			<zipfileset dir="projection" prefix="src" />
 		</zip>
-		<delete dir="${tempdir}" />
 	</target>
 </project>
diff --git a/org.eclipse.text/scripts/exportplugin.xml b/org.eclipse.text/scripts/exportplugin.xml
index 2d1b286be1d..20b186dc362 100644
--- a/org.eclipse.text/scripts/exportplugin.xml
+++ b/org.eclipse.text/scripts/exportplugin.xml
@@ -2,7 +2,6 @@
 	<target name="init">
 		<tstamp/>
 		<property name="destdir" value="../../plugin-export" />
-		<property name="tempdir" value="../../tmp" />
 		<property name="plugin"  value="org.eclipse.text" />
 		<property name="plugin_version"  value="_3.1.0" />
 		<property name="dest"  value="${destdir}/${plugin}${plugin_version}" />
@@ -14,23 +13,17 @@
 	</target>
 
 	<target name="export" depends="build">
-		<delete dir="${tempdir}" />
-		<mkdir dir="${tempdir}" />
 		<mkdir dir="${destdir}" />
 		<delete file="${destjar}" />
-		<zip zipfile="${tempdir}/src.zip">
-		    <fileset dir="src" />
-		    <fileset dir="projection" />
-  		</zip>		
 		<zip zipfile="${destjar}">
 			<fileset dir=".">
 			  <include name="plugin.xml" />
 			  <include name="plugin.properties" />
 			  <include name="META-INF/**" />
+			  <include name="src/**" />
 			</fileset>
 			<fileset dir="bin" />
-			<fileset file="${tempdir}/src.zip" />
+			<zipfileset dir="projection" prefix="src" />
 		</zip>
-		<delete dir="${tempdir}" />
 	</target>
 </project>
diff --git a/org.eclipse.ui.editors/scripts/exportplugin.xml b/org.eclipse.ui.editors/scripts/exportplugin.xml
index f614d716600..bfd7f5e1ab1 100644
--- a/org.eclipse.ui.editors/scripts/exportplugin.xml
+++ b/org.eclipse.ui.editors/scripts/exportplugin.xml
@@ -2,7 +2,6 @@
 	<target name="init">
 		<tstamp/>
 		<property name="destdir" value="../../plugin-export" />
-		<property name="tempdir" value="../../tmp" />
 		<property name="plugin"  value="org.eclipse.ui.editors" />
 		<property name="plugin_version"  value="_3.1.0" />
 		<property name="dest"  value="${destdir}/${plugin}${plugin_version}" />
@@ -14,23 +13,18 @@
 	</target>
 
 	<target name="export" depends="build">
-		<delete dir="${tempdir}" />
-		<mkdir dir="${tempdir}" />
 		<mkdir dir="${destdir}" />
 		<delete file="${destjar}" />
-		<zip zipfile="${tempdir}/src.zip">
-		    <fileset dir="src" />
-  		</zip>		
 		<zip zipfile="${destjar}">
 			<fileset dir=".">
 			  <include name="plugin.xml" />
 			  <include name="plugin.properties" />
 			  <include name="META-INF/**" />
 			  <include name="icons/**" />
+			  <include name="schema/**" />
+			  <include name="src/**" />
 			</fileset>
 			<fileset dir="bin" />
-			<fileset file="${tempdir}/src.zip" />
 		</zip>
-		<delete dir="${tempdir}" />
 	</target>
 </project>
diff --git a/org.eclipse.ui.workbench.texteditor/scripts/exportplugin.xml b/org.eclipse.ui.workbench.texteditor/scripts/exportplugin.xml
index 14c9709a110..58a6635a3c4 100644
--- a/org.eclipse.ui.workbench.texteditor/scripts/exportplugin.xml
+++ b/org.eclipse.ui.workbench.texteditor/scripts/exportplugin.xml
@@ -2,7 +2,6 @@
 	<target name="init">
 		<tstamp/>
 		<property name="destdir" value="../../plugin-export" />
-		<property name="tempdir" value="../../tmp" />
 		<property name="plugin"  value="org.eclipse.ui.workbench.texteditor" />
 		<property name="plugin_version"  value="_3.1.0" />
 		<property name="dest"  value="${destdir}/${plugin}${plugin_version}" />
@@ -14,23 +13,18 @@
 	</target>
 
 	<target name="export" depends="build">
-		<delete dir="${tempdir}" />
-		<mkdir dir="${tempdir}" />
 		<mkdir dir="${destdir}" />
 		<delete file="${destjar}" />
-		<zip zipfile="${tempdir}/src.zip">
-		    <fileset dir="src" />
-  		</zip>		
 		<zip zipfile="${destjar}">
 			<fileset dir=".">
 			  <include name="plugin.xml" />
 			  <include name="plugin.properties" />
 			  <include name="META-INF/**" />
 			  <include name="icons/**" />
+			  <include name="schema/**" />
+			  <include name="src/**" />
 			</fileset>
 			<fileset dir="bin" />
-			<fileset file="${tempdir}/src.zip" />
 		</zip>
-		<delete dir="${tempdir}" />
 	</target>
 </project>