CVS eclipse/debian/patches

[Stephan Michels]

Update of /cvsroot/pkg-java/eclipse/debian/patches
In directory haydn:/tmp/cvs-serv23177/patches

Modified Files:
	eclipse-swttools.dpatch 
Log Message:
debian/patches/eclipse-swttools.dpatch: Rebuild patch to build the swt
tools before org.eclipse.swt.gtk.linux.ia64


--- /cvsroot/pkg-java/eclipse/debian/patches/eclipse-swttools.dpatch	2005/10/15 12:29:56	1.1
+++ /cvsroot/pkg-java/eclipse/debian/patches/eclipse-swttools.dpatch	2005/11/18 16:56:45	1.2
@@ -1,6 +1,7 @@
 #! /bin/sh -e
 ##
-## DP: Debian specific patch, converted from eclipse-swttools.patch
+## DP: Patch build scripts to build the swttools before the
+## DP: build.cfiles target get executed.
 
 [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
@@ -21,14 +22,10 @@
 exit 0
 
 @DPATCH@
-Index: build.xml
-===================================================================
-RCS file: /home/eclipse/org.eclipse.swt.gtk.linux.x86_64/build.xml,v
-retrieving revision 1.3
-diff -u -r1.3 build.xml
---- source-tree/plugins//org.eclipse.swt.gtk.linux.x86_64/build.xml	18 Apr 2005 20:27:37 -0000	1.3
-+++ source-tree/plugins//org.eclipse.swt.gtk.linux.x86_64/build.xml	26 Apr 2005 19:13:30 -0000
-@@ -20,7 +20,6 @@
+diff -r -u source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml
+--- source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml	2005-11-18 15:13:43.000000000 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml	2005-11-18 15:18:05.000000000 +0100
+@@ -21,7 +21,6 @@
  
  	<target name="properties" if="eclipse.running">
  		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
@@ -36,7 +33,7 @@
  	</target>
  
  	<target name="build.update.jar" depends="init">
-@@ -184,8 +183,11 @@
+@@ -190,8 +189,11 @@
  	</target>
  
  	<target name="build.cfiles" depends="build.jars">
@@ -49,7 +46,7 @@
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -278,6 +280,8 @@
+@@ -286,6 +288,8 @@
  		<delete file="${plugin.destination}/${full.name}.jar"/>
  		<delete file="${plugin.destination}/${full.name}.zip"/>
  		<delete dir="${temp.folder}"/>
@@ -58,3 +55,37 @@
  	</target>
  
  	<target name="refresh" depends="init" if="eclipse.running">
+diff -r -u source-tree.orig/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
+--- source-tree.orig/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml	2005-11-18 15:13:30.000000000 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml	2005-11-18 15:14:47.000000000 +0100
+@@ -21,7 +21,6 @@
+ 
+ 	<target name="properties" if="eclipse.running">
+ 		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+-		<!--compile the jar in org.eclipse.swt.tools-->
+ 	</target>
+ 
+ 	<target name="build.update.jar" depends="init">
+@@ -190,8 +189,11 @@
+ 	</target>
+ 
+ 	<target name="build.cfiles" depends="build.jars">
++		<!--compile the jar in org.eclipse.swt.tools-->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
+ 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
+-		<!-- assumes the swt.jar has already been built  -->
++		<!-- assumes the swttools.jar has already been built  -->
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+@@ -291,6 +293,8 @@
+ 		<delete file="${plugin.destination}/${full.name}.jar"/>
+ 		<delete file="${plugin.destination}/${full.name}.zip"/>
+ 		<delete dir="${temp.folder}"/>
++		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
+ 	</target>
+ 
+ 	<target name="refresh" depends="init" if="eclipse.running">
+Nur in source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64: build.xml.orig.