1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
#! /bin/sh -e
##
## 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}"
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch)
patch $patch_opts -p0 < $0;;
-unpatch)
patch $patch_opts -p0 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
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"/>
- <!--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>
@@ -286,6 +288,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">
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.
|
