Lines 7-13
Link Here
|
7 |
Bundle-Vendor: %providerName |
7 |
Bundle-Vendor: %providerName |
8 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true |
8 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true |
9 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true |
9 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true |
10 |
Bundle-Version: 1.1.1000.qualifier |
10 |
Bundle-Version: 1.1.1100.qualifier |
11 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" |
11 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" |
12 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) |
12 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) |
13 |
-Bundle-Localization: launcher.gtk.linux.aarch64 |
13 |
-Bundle-Localization: launcher.gtk.linux.aarch64 |
Lines 23-29
Link Here
|
23 |
<groupId>org.eclipse.equinox</groupId> |
23 |
<groupId>org.eclipse.equinox</groupId> |
24 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId> |
24 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId> |
25 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId> |
25 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId> |
26 |
<version>1.1.1000-SNAPSHOT</version> |
26 |
<version>1.1.1100-SNAPSHOT</version> |
27 |
<packaging>eclipse-plugin</packaging> |
27 |
<packaging>eclipse-plugin</packaging> |
28 |
|
28 |
|
29 |
<properties> |
29 |
<properties> |
Lines 31-37
Link Here
|
31 |
+ <os>freebsd</os> |
31 |
+ <os>freebsd</os> |
32 |
<ws>gtk</ws> |
32 |
<ws>gtk</ws> |
33 |
<arch>aarch64</arch> |
33 |
<arch>aarch64</arch> |
34 |
</properties> |
34 |
<skipAPIAnalysis>true</skipAPIAnalysis> |
35 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project |
35 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project |
36 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 |
36 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 |
37 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 |
37 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 |
Lines 52-58
Link Here
|
52 |
Bundle-Vendor: %providerName |
52 |
Bundle-Vendor: %providerName |
53 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true |
53 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true |
54 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true |
54 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true |
55 |
Bundle-Version: 1.1.1000.qualifier |
55 |
Bundle-Version: 1.1.1100.qualifier |
56 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" |
56 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" |
57 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) |
57 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) |
58 |
-Bundle-Localization: launcher.gtk.linux.x86_64 |
58 |
-Bundle-Localization: launcher.gtk.linux.x86_64 |
Lines 72-84
Link Here
|
72 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml |
72 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml |
73 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
73 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
74 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
74 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
75 |
@@ -18,13 +18,13 @@ |
75 |
@@ -18,14 +18,14 @@ |
76 |
<relativePath>../../launcher-binary-parent</relativePath> |
76 |
<relativePath>../../launcher-binary-parent</relativePath> |
77 |
</parent> |
77 |
</parent> |
78 |
<groupId>org.eclipse.equinox</groupId> |
78 |
<groupId>org.eclipse.equinox</groupId> |
79 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId> |
79 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId> |
80 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId> |
80 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId> |
81 |
<version>1.1.1000-SNAPSHOT</version> |
81 |
<version>1.1.1100-SNAPSHOT</version> |
82 |
<packaging>eclipse-plugin</packaging> |
82 |
<packaging>eclipse-plugin</packaging> |
83 |
|
83 |
|
84 |
<properties> |
84 |
<properties> |
Lines 87-176
Link Here
|
87 |
<ws>gtk</ws> |
87 |
<ws>gtk</ws> |
88 |
- <arch>x86_64</arch> |
88 |
- <arch>x86_64</arch> |
89 |
+ <arch>amd64</arch> |
89 |
+ <arch>amd64</arch> |
|
|
90 |
<skipAPIAnalysis>true</skipAPIAnalysis> |
90 |
</properties> |
91 |
</properties> |
91 |
</project> |
92 |
</project> |
92 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF |
|
|
93 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 |
94 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 |
95 |
@@ -2,9 +2,9 @@ |
96 |
Bundle-ManifestVersion: 2 |
97 |
Bundle-Name: %pluginName |
98 |
Bundle-Vendor: %providerName |
99 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.arm;singleton:=true |
100 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.armv7;singleton:=true |
101 |
Bundle-Version: 1.1.1000.qualifier |
102 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" |
103 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm)) |
104 |
-Bundle-Localization: launcher.gtk.linux.arm |
105 |
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=armv7)) |
106 |
+Bundle-Localization: launcher.gtk.freebsd.armv7 |
107 |
Eclipse-BundleShape: dir |
108 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml |
109 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
110 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
111 |
@@ -18,13 +18,13 @@ |
112 |
<relativePath>../../launcher-binary-parent</relativePath> |
113 |
</parent> |
114 |
<groupId>org.eclipse.equinox</groupId> |
115 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.arm</artifactId> |
116 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.armv7</artifactId> |
117 |
<version>1.1.1000-SNAPSHOT</version> |
118 |
<packaging>eclipse-plugin</packaging> |
119 |
|
120 |
<properties> |
121 |
- <os>linux</os> |
122 |
+ <os>freebsd</os> |
123 |
<ws>gtk</ws> |
124 |
- <arch>arm</arch> |
125 |
+ <arch>armv7</arch> |
126 |
</properties> |
127 |
</project> |
128 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF |
129 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 |
130 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 |
131 |
@@ -2,9 +2,9 @@ |
132 |
Bundle-ManifestVersion: 2 |
133 |
Bundle-Name: %pluginName |
134 |
Bundle-Vendor: %providerName |
135 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true |
136 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.i386;singleton:=true |
137 |
Bundle-Version: 1.1.1000.qualifier |
138 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" |
139 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) |
140 |
-Bundle-Localization: launcher.gtk.linux.x86 |
141 |
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386)) |
142 |
+Bundle-Localization: launcher.gtk.freebsd.i386 |
143 |
Eclipse-BundleShape: dir |
144 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties |
145 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties 0000-00-00 00:00:00.000000000 +0000 |
146 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties 0000-00-00 00:00:00.000000000 +0000 |
147 |
@@ -11,5 +11,5 @@ |
148 |
# Contributors: |
149 |
# IBM Corporation - initial API and implementation |
150 |
############################################################################### |
151 |
-pluginName = Equinox Launcher Linux X86 Fragment |
152 |
+pluginName = Equinox Launcher FreeBSD/i386 Fragment |
153 |
providerName = Eclipse.org - Equinox |
154 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml |
155 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
156 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
157 |
@@ -18,13 +18,13 @@ |
158 |
<relativePath>../../launcher-binary-parent</relativePath> |
159 |
</parent> |
160 |
<groupId>org.eclipse.equinox</groupId> |
161 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId> |
162 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.i386</artifactId> |
163 |
<version>1.1.1000-SNAPSHOT</version> |
164 |
<packaging>eclipse-plugin</packaging> |
165 |
|
166 |
<properties> |
167 |
- <os>linux</os> |
168 |
+ <os>freebsd</os> |
169 |
<ws>gtk</ws> |
170 |
- <arch>x86</arch> |
171 |
+ <arch>i386</arch> |
172 |
</properties> |
173 |
</project> |
174 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project |
93 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project |
175 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 |
94 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 |
176 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 |
95 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 |
Lines 191-197
Link Here
|
191 |
Bundle-Vendor: %providerName |
110 |
Bundle-Vendor: %providerName |
192 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true |
111 |
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true |
193 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true |
112 |
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true |
194 |
Bundle-Version: 1.1.1000.qualifier |
113 |
Bundle-Version: 1.1.1100.qualifier |
195 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" |
114 |
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" |
196 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) |
115 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) |
197 |
-Bundle-Localization: launcher.gtk.linux.ppc64le |
116 |
-Bundle-Localization: launcher.gtk.linux.ppc64le |
Lines 201-213
Link Here
|
201 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml |
120 |
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml |
202 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
121 |
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
203 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
122 |
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
204 |
@@ -18,13 +18,13 @@ |
123 |
@@ -18,14 +18,14 @@ |
205 |
<relativePath>../../launcher-binary-parent</relativePath> |
124 |
<relativePath>../../launcher-binary-parent</relativePath> |
206 |
</parent> |
125 |
</parent> |
207 |
<groupId>org.eclipse.equinox</groupId> |
126 |
<groupId>org.eclipse.equinox</groupId> |
208 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId> |
127 |
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId> |
209 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId> |
128 |
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId> |
210 |
<version>1.1.1000-SNAPSHOT</version> |
129 |
<version>1.1.1100-SNAPSHOT</version> |
211 |
<packaging>eclipse-plugin</packaging> |
130 |
<packaging>eclipse-plugin</packaging> |
212 |
|
131 |
|
213 |
<properties> |
132 |
<properties> |
Lines 216-280
Link Here
|
216 |
<ws>gtk</ws> |
135 |
<ws>gtk</ws> |
217 |
- <arch>ppc64le</arch> |
136 |
- <arch>ppc64le</arch> |
218 |
+ <arch>powerpc64</arch> |
137 |
+ <arch>powerpc64</arch> |
|
|
138 |
<skipAPIAnalysis>true</skipAPIAnalysis> |
219 |
</properties> |
139 |
</properties> |
220 |
</project> |
140 |
</project> |
221 |
diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java |
|
|
222 |
--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 0000-00-00 00:00:00.000000000 +0000 |
223 |
+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 0000-00-00 00:00:00.000000000 +0000 |
224 |
@@ -78,6 +78,7 @@ |
225 |
// this internally to be Solaris. |
226 |
private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ |
227 |
private static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$ |
228 |
+ private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ |
229 |
private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$ |
230 |
private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$ |
231 |
private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$ |
232 |
@@ -746,7 +747,7 @@ |
233 |
// setup default values for known OSes if nothing was specified |
234 |
if (osName.equals(Constants.OS_WIN32)) |
235 |
return Constants.WS_WIN32; |
236 |
- if (osName.equals(Constants.OS_LINUX)) |
237 |
+ if (osName.equals(Constants.OS_LINUX) || osName.equals(Constants.OS_FREEBSD)) |
238 |
return Constants.WS_GTK; |
239 |
if (osName.equals(Constants.OS_MACOSX)) |
240 |
return Constants.WS_COCOA; |
241 |
@@ -769,6 +770,8 @@ |
242 |
// EXCEPTION: All mappings of SunOS convert to Solaris |
243 |
if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS)) |
244 |
return Constants.OS_SOLARIS; |
245 |
+ if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD)) |
246 |
+ return Constants.OS_FREEBSD; |
247 |
if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX)) |
248 |
return Constants.OS_LINUX; |
249 |
if (osName.equalsIgnoreCase(INTERNAL_OS_QNX)) |
250 |
diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java |
251 |
--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java 0000-00-00 00:00:00.000000000 +0000 |
252 |
+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java 0000-00-00 00:00:00.000000000 +0000 |
253 |
@@ -80,7 +80,7 @@ |
254 |
|
255 |
if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ |
256 |
String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ |
257 |
- if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ |
258 |
+ if (osName.startsWith("freebsd") || osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ |
259 |
IS_PROCESSING_NEEDED = true; |
260 |
} |
261 |
} |
262 |
diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java |
263 |
--- rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 0000-00-00 00:00:00.000000000 +0000 |
264 |
+++ rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 0000-00-00 00:00:00.000000000 +0000 |
265 |
@@ -26,6 +26,12 @@ |
266 |
//TODO These constants need to be aligned with the OSGi ones. See page 64-588 of the spec |
267 |
|
268 |
/** |
269 |
+ * Constant string (value "freebsd") indicating the platform is running on a |
270 |
+ * FreeBSD-based operating system. |
271 |
+ */ |
272 |
+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ |
273 |
+ |
274 |
+ /** |
275 |
* Constant string (value "win32") indicating the platform is running on a |
276 |
* Window 32-bit operating system (e.g., Windows 98, NT, 2000). |
277 |
*/ |
278 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties |
141 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties |
279 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 |
142 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 |
280 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 |
143 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 |
Lines 297-303
Link Here
|
297 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml |
160 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml |
298 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 |
161 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 |
299 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 |
162 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 |
300 |
@@ -32,20 +32,20 @@ |
163 |
@@ -33,20 +33,20 @@ |
301 |
fragment="true"/> |
164 |
fragment="true"/> |
302 |
|
165 |
|
303 |
<plugin |
166 |
<plugin |
Lines 327-333
Link Here
|
327 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh |
190 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh |
328 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 0000-00-00 00:00:00.000000000 +0000 |
191 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 0000-00-00 00:00:00.000000000 +0000 |
329 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 0000-00-00 00:00:00.000000000 +0000 |
192 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 0000-00-00 00:00:00.000000000 +0000 |
330 |
@@ -126,8 +126,13 @@ |
193 |
@@ -112,8 +112,13 @@ |
331 |
;; |
194 |
;; |
332 |
esac |
195 |
esac |
333 |
;; |
196 |
;; |
Lines 342-360
Link Here
|
342 |
;; |
205 |
;; |
343 |
esac |
206 |
esac |
344 |
export CC |
207 |
export CC |
345 |
@@ -149,7 +154,9 @@ |
208 |
@@ -146,19 +151,20 @@ |
346 |
export JAVA_HOME |
|
|
347 |
fi |
348 |
|
209 |
|
349 |
-if [ $defaultOSArch = "ppc64le" ]; then |
|
|
350 |
+if [ $defaultOSArch = "amd64" ]; then |
351 |
+ export M_ARCH=-m64 |
352 |
+elif [ $defaultOSArch = "ppc64le" ]; then |
353 |
M_ARCH=-m64 |
354 |
export M_ARCH |
355 |
elif [ "$defaultOSArch" = "s390" ]; then |
356 |
@@ -169,19 +176,20 @@ |
357 |
|
358 |
LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" |
210 |
LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" |
359 |
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" |
211 |
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" |
360 |
+mkdir -p ${OUTPUT_DIR} |
212 |
+mkdir -p ${OUTPUT_DIR} |
Lines 381-387
Link Here
|
381 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak |
233 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak |
382 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
234 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
383 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
235 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
384 |
@@ -91,10 +91,11 @@ |
236 |
@@ -81,10 +81,11 @@ |
385 |
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \ |
237 |
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \ |
386 |
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \ |
238 |
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \ |
387 |
-DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\"" |
239 |
-DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\"" |
Lines 396-402
Link Here
|
396 |
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ |
248 |
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ |
397 |
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ |
249 |
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ |
398 |
-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \ |
250 |
-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \ |
399 |
@@ -102,7 +103,8 @@ |
251 |
@@ -92,7 +93,8 @@ |
400 |
$(GTK_LIBS) \ |
252 |
$(GTK_LIBS) \ |
401 |
-I. \ |
253 |
-I. \ |
402 |
-I.. \ |
254 |
-I.. \ |
Lines 406-412
Link Here
|
406 |
`pkg-config --cflags gtk+-3.0` |
258 |
`pkg-config --cflags gtk+-3.0` |
407 |
|
259 |
|
408 |
all: $(EXEC) $(DLL) |
260 |
all: $(EXEC) $(DLL) |
409 |
@@ -140,11 +142,11 @@ |
261 |
@@ -130,11 +132,11 @@ |
410 |
|
262 |
|
411 |
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) |
263 |
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) |
412 |
$(info Linking and generating: $(EXEC)) |
264 |
$(info Linking and generating: $(EXEC)) |
Lines 457-485
Link Here
|
457 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml |
309 |
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml |
458 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 |
310 |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 |
459 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 |
311 |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 |
460 |
@@ -118,13 +118,13 @@ |
312 |
@@ -76,29 +76,29 @@ |
461 |
<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" /> |
313 |
<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" /> |
462 |
<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> |
314 |
<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> |
463 |
</target> |
315 |
</target> |
464 |
- <target name="rootFileslinux_gtk_x86"> |
|
|
465 |
- <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}"/> |
466 |
- <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> |
467 |
- <fileset dir="${basedir}/bin/gtk/linux/x86" includes="**" /> |
468 |
+ <target name="rootFilesfreebsd_gtk_i386"> |
469 |
+ <mkdir dir="${feature.base}/freebsd.gtk.i386/${collectingFolder}"/> |
470 |
+ <copy todir="${feature.base}/freebsd.gtk.i386/${collectingFolder}" failonerror="true" overwrite="true"> |
471 |
+ <fileset dir="${basedir}/bin/gtk/freebsd/i386" includes="**" /> |
472 |
<fileset dir="${basedir}/gtk_root" includes="**" /> |
473 |
</copy> |
474 |
- <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="launcher" /> |
475 |
+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.i386/${collectingFolder}" includes="launcher" /> |
476 |
</target> |
477 |
<target name="rootFileslinux_gtk_ppc"> |
478 |
<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> |
479 |
@@ -134,37 +134,37 @@ |
480 |
</copy> |
481 |
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="launcher" /> |
482 |
</target> |
483 |
- <target name="rootFileslinux_gtk_ppc64le"> |
316 |
- <target name="rootFileslinux_gtk_ppc64le"> |
484 |
- <mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/> |
317 |
- <mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/> |
485 |
- <copy todir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" failonerror="true" overwrite="true"> |
318 |
- <copy todir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" failonerror="true" overwrite="true"> |
Lines 493-516
Link Here
|
493 |
- <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" includes="launcher" /> |
326 |
- <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" includes="launcher" /> |
494 |
+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" includes="launcher" /> |
327 |
+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" includes="launcher" /> |
495 |
</target> |
328 |
</target> |
496 |
- <target name="rootFileslinux_gtk_arm"> |
329 |
- <target name="rootFileslinux_gtk_aarch64"> |
497 |
- <mkdir dir="${feature.base}/linux.gtk.arm/${collectingFolder}"/> |
|
|
498 |
- <copy todir="${feature.base}/linux.gtk.arm/${collectingFolder}" failonerror="true" overwrite="true"> |
499 |
- <fileset dir="${basedir}/bin/gtk/linux/arm" includes="**" /> |
500 |
+ <target name="rootFilesfreebsd_gtk_armv7"> |
501 |
+ <mkdir dir="${feature.base}/freebsd.gtk.armv7/${collectingFolder}"/> |
502 |
+ <copy todir="${feature.base}/freebsd.gtk.armv7/${collectingFolder}" failonerror="true" overwrite="true"> |
503 |
+ <fileset dir="${basedir}/bin/gtk/freebsd/armv7" includes="**" /> |
504 |
<fileset dir="${basedir}/gtk_root" includes="**" /> |
505 |
</copy> |
506 |
- <chmod perm="755" dir="${feature.base}/linux.gtk.arm/${collectingFolder}" includes="launcher" /> |
507 |
+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.armv7/${collectingFolder}" includes="launcher" /> |
508 |
</target> |
509 |
- <target name="rootFileslinux_gtk_aarch64"> |
510 |
- <mkdir dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}"/> |
330 |
- <mkdir dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}"/> |
511 |
- <copy todir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> |
331 |
- <copy todir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> |
512 |
- <fileset dir="${basedir}/bin/gtk/linux/aarch64" includes="**" /> |
332 |
- <fileset dir="${basedir}/bin/gtk/linux/aarch64" includes="**" /> |
513 |
+ <target name="rootFilesfreebsd_gtk_aarch64"> |
333 |
+ <target name="rootFilesfreebsd_gtk_aarch64"> |
514 |
+ <mkdir dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}"/> |
334 |
+ <mkdir dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}"/> |
515 |
+ <copy todir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> |
335 |
+ <copy todir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> |
516 |
+ <fileset dir="${basedir}/bin/gtk/freebsd/aarch64" includes="**" /> |
336 |
+ <fileset dir="${basedir}/bin/gtk/freebsd/aarch64" includes="**" /> |
Lines 534-548
Link Here
|
534 |
</target> |
354 |
</target> |
535 |
<target name="rootFileslinux_gtk_ia64"> |
355 |
<target name="rootFileslinux_gtk_ia64"> |
536 |
<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> |
356 |
<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> |
537 |
@@ -212,7 +212,7 @@ |
357 |
@@ -138,8 +138,8 @@ |
538 |
<target name="rootFilesgroup_group_group"> |
358 |
<target name="rootFilesgroup_group_group"> |
539 |
<antcall target="rootFileswin32_win32_x86_64"/> |
359 |
<antcall target="rootFileswin32_win32_x86_64"/> |
540 |
<antcall target="rootFilesmacosx_cocoa_x86_64"/> |
360 |
<antcall target="rootFilesmacosx_cocoa_x86_64"/> |
541 |
- <antcall target="rootFileslinux_gtk_ppc64le"/> |
361 |
- <antcall target="rootFileslinux_gtk_ppc64le"/> |
542 |
+ <antcall target="rootFileslinux_gtk_powerpc64"/> |
362 |
- <antcall target="rootFileslinux_gtk_x86_64"/> |
543 |
<antcall target="rootFileslinux_gtk_x86_64"/> |
363 |
+ <antcall target="rootFilesfreebsd_gtk_powerpc64"/> |
|
|
364 |
+ <antcall target="rootFilesfreebsd_gtk_amd64"/> |
544 |
</target> |
365 |
</target> |
545 |
|
366 |
|
|
|
367 |
<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform.launchers."> |
546 |
diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml |
368 |
diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml |
547 |
--- rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
369 |
--- rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
548 |
+++ rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
370 |
+++ rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 |