Package: eclipse / 3.8.1-10

use-distribution-swt.patch Patch series | download
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
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Sat, 14 Jan 2012 21:02:09 +0100
Subject: use-distribution-swt

---
 additionalArchs/rename.sh                          |    3 --
 build.xml                                          |   18 ++++---
 dependencies/dependencies.properties               |    1 +
 .../org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF |   21 ++++++++
 eclipse/features/org.eclipse.rcp/feature.xml       |   55 --------------------
 pdebuild.xml                                       |    7 +--
 6 files changed, 34 insertions(+), 71 deletions(-)
 create mode 100644 dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF

diff --git a/additionalArchs/rename.sh b/additionalArchs/rename.sh
index 1fe2754..4703a4b 100755
--- a/additionalArchs/rename.sh
+++ b/additionalArchs/rename.sh
@@ -25,6 +25,3 @@ cd ..
 cd org.eclipse.core.filesystem.linux.$newArch
     moves
 cd ..
-cd org.eclipse.swt.gtk.linux.$newArch
-    moves
-cd ..
diff --git a/build.xml b/build.xml
index 11cb1ad..578b1e8 100644
--- a/build.xml
+++ b/build.xml
@@ -170,6 +170,11 @@
 			<arg value="eclipse" />
 			<arg value="${buildDirectory}" />
 		</exec>
+		<delete includeemptydirs="true">
+    			<fileset dir="${buildDirectory}/plugins">
+				<include name="**/org.eclipse.swt*/**" />
+			</fileset>
+		</delete>
 	</target>
 
 	<available file="${basedir}/eclipse-build-feature" property="buildFeaturePresent" value="true" />
@@ -219,7 +224,7 @@
 			<fileset dir="${buildDirectory}/plugins" includes="**/ECLIPSEF.RSA" />
 		</delete>
 		
-		<!-- add additional archs for org.eclipse.swt, org.eclipse.equinox.launcher & org.eclipse.core.filesystem -->
+		<!-- add additional archs for org.eclipse.equinox.launcher & org.eclipse.core.filesystem -->
 		<antcall target="generateSecondaryFragments"/>
 		
 		<!-- prepare ecf build tree -->
@@ -269,8 +274,6 @@
 		<attribute name="archBase" />
 		<attribute name="newArch" />
 		<sequential>
-			<copyPlugin pluginName="org.eclipse.swt.gtk.linux"
-			            archBase="@{archBase}" newArch="@{newArch}" />
 			<copyPlugin pluginName="org.eclipse.core.filesystem.linux"
 			            archBase="@{archBase}" newArch="@{newArch}" />
 			<copyPlugin pluginName="org.eclipse.core.net.linux"
@@ -338,10 +341,10 @@
 
 	<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
 		<!-- eclipse-build-only patches -->
-		<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
+		<!--patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" />
+		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" /-->
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" />
+		<!--patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" /-->
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
 		
@@ -378,7 +381,7 @@
 
 		<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
 
-		<patch patchfile="${basedir}/patches/swt-no-api-generation.patch" dir="${buildDirectory}" strip="0" />
+		<!--patch patchfile="${basedir}/patches/swt-no-api-generation.patch" dir="${buildDirectory}" strip="0" /-->
 
 		<patch patchfile="${basedir}/patches/add-plugin-version-of-arm-launcher-fragment.patch" dir="${buildDirectory}" strip="1" />
 
@@ -543,7 +546,6 @@
 				<include name="**/*.so" />
 			</fileset>
 		</delete>
-		<ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
 
 		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
 		<exec dir="${launcherlibs}/library/gtk/" executable="sh" failonerror="true">
diff --git a/dependencies/dependencies.properties b/dependencies/dependencies.properties
index 2d95c60..06de702 100644
--- a/dependencies/dependencies.properties
+++ b/dependencies/dependencies.properties
@@ -22,6 +22,7 @@ org.apache.felix.gogo.shell_0.8.0.v201110170705.jar=/usr/share/java/felix/org.ap
 org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar
 org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
 org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
+org.eclipse.swt_3.7.1.jar=/usr/share/java/swt.jar
 org.eclipse.jetty.util_8.1.0.v20120127.jar=/usr/share/java/jetty/jetty-util.jar
 org.eclipse.jetty.server_8.1.0.v20120127.jar=/usr/share/java/jetty/jetty-server.jar
 org.eclipse.jetty.http_8.1.0.v20120127.jar=/usr/share/java/jetty/jetty-http.jar
diff --git a/dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..272d0e7
--- /dev/null
+++ b/dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.eclipse.swt; singleton:=true
+Bundle-Vendor: Eclipse.org
+DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom
+ 
+Created-By: 0.98
+Bundle-Version: 3.7.1
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-ManifestVersion: 2
+Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclips
+ e.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt
+ .dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.lay
+ out,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.prog
+ ram,org.eclipse.swt.widgets,org.eclipse.swt.internal;x-friends:="org.ecl
+ ipse.ui",org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.sw
+ t.internal.theme; x-internal:=true
+Eclipse-ExtensibleAPI: true
+Bundle-Localization: plugin
+Bundle-Name: Standard Widget Toolkit
+
+
diff --git a/eclipse/features/org.eclipse.rcp/feature.xml b/eclipse/features/org.eclipse.rcp/feature.xml
index 85932ce..ee08dfa 100644
--- a/eclipse/features/org.eclipse.rcp/feature.xml
+++ b/eclipse/features/org.eclipse.rcp/feature.xml
@@ -194,39 +194,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.gtk.linux.x86"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.gtk.linux.s390x"
-         os="linux"
-         ws="gtk"
-         arch="s390x"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.gtk.linux.s390"
-         os="linux"
-         ws="gtk"
-         arch="s390"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.swt.gtk.solaris.sparc"
          os="solaris"
          ws="gtk"
@@ -249,28 +216,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.gtk.linux.ppc64"
-         os="linux"
-         ws="gtk"
-         arch="ppc64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.gtk.linux.x86_64"
-         os="linux"
-         ws="gtk"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.swt.cocoa.macosx"
          os="macosx"
          ws="cocoa"
diff --git a/pdebuild.xml b/pdebuild.xml
index 74648b5..8ac17e2 100644
--- a/pdebuild.xml
+++ b/pdebuild.xml
@@ -83,8 +83,7 @@
 	<filelist id="helpDirs" dir="${sdkSource}/plugins" files="${helpDirsProperty}"/>
 	
 	<property name="depsDirs2Property"
-		value="org.eclipse.swt.gtk.linux.${buildArch}
-		       org.eclipse.core.filesystem
+		value="org.eclipse.core.filesystem
 		       org.eclipse.core.resources
 		       org.eclipse.core.commands
 		       org.eclipse.jface
@@ -107,6 +106,7 @@
 		<include name="org.junit_*/" />
 		<include name="com.ibm.icu_*" />
 		<include name="org.apache.ant_*/**" />
+		<include name="org.eclipse.swt*"/>
 		<include name="org.eclipse.jetty*_3.*" />
 		<include name="org.apache.lucene*" />
 		<include name="org.apache.commons*" />
@@ -302,9 +302,6 @@
 		<copy todir="bootstrap/plugins" flatten="true">
 			<fileset refid="depsZips" />
 		</copy>
-		<copy todir="bootstrap/plugins/org.eclipse.swt">
-			<fileset dir="${sdkSource}/plugins/org.eclipse.swt" />
-		</copy>
 		<unzip dest="bootstrap/plugins">
 			<fileset dir="bootstrap/plugins">
 				<include name="**/*.zip" />