View | Details | Raw Unified | Return to bug 77217 | Differences between
and this patch

Collapse All | Expand All

(-)build.xml (+1 lines)
Lines 127-132 Link Here
127
			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}" />
127
			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}" />
128
			<fileset dir="${plugindir}/Eclipse SWT Program/gtk/" includes="${includes}" excludes="${excludes}" />
128
			<fileset dir="${plugindir}/Eclipse SWT Program/gtk/" includes="${includes}" excludes="${excludes}" />
129
			<fileset dir="${plugindir}/Eclipse SWT Theme/gtk/" includes="${includes}" excludes="${excludes}" />
129
			<fileset dir="${plugindir}/Eclipse SWT Theme/gtk/" includes="${includes}" excludes="${excludes}" />
130
			<fileset dir="${plugindir}/components/" includes="${includes}" excludes="${excludes}" />
130
		</copy>
131
		</copy>
131
		<antcall target="copy.translationfiles" />
132
		<antcall target="copy.translationfiles" />
132
133
(-)buildLibraries.csh (-1 / +6 lines)
Lines 5-15 Link Here
5
setenv CCPATH /export/home/SUNWspro/bin
5
setenv CCPATH /export/home/SUNWspro/bin
6
6
7
setenv CC cc
7
setenv CC cc
8
setenv CXX CC
8
setenv CDE_HOME /usr/dt
9
setenv CDE_HOME /usr/dt
9
setenv JAVA_HOME /usr/j2se
10
setenv JAVA_HOME /usr/j2se
10
setenv PATH ${CCPATH}:/usr/ccs/bin:/usr/local/bin:${PATH}
11
setenv PATH ${CCPATH}:/usr/ccs/bin:/usr/local/bin:${PATH}
11
setenv PKG_CONFIG_PATH ${CAIROPATH}
12
setenv PKG_CONFIG_PATH ${CAIROPATH}
12
13
14
setenv MOZILLA_SDK /bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk
15
setenv MOZILLA_INCLUDES "-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include"
16
setenv MOZILLA_LIBS "${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"
17
13
cd ../org.eclipse.swt/bin/library/
18
cd ../org.eclipse.swt/bin/library/
14
sh build.sh clean
19
sh build.sh clean
15
sh build.sh install
20
sh build.sh make_mozilla install
(-)about.html (+31 lines)
Lines 60-65 Link Here
60
governed by the terms and conditions of the LGPL.  Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
60
governed by the terms and conditions of the LGPL.  Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
61
work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
61
work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
62
62
63
<h4>Mozilla Binding</h4>
64
65
<p>The &quot;Mozilla Binding&quot; is a binding to the Mozilla API.  The Content may include any or all of the following files:</p>
66
67
<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
68
<ul>
69
	<li>libswt-mozilla-gtk-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
70
</ul>
71
72
<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
73
<ul>
74
	<li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
75
</ul>
76
77
<p>The Mozilla Binding contains portions of Mozilla (&quot;Mozilla&quot;).  Mozilla is made available by Mozilla.org.  Use of Mozilla is governed by the terms and
78
conditions of the Mozilla Public License Version 1.1 (&quot;MPL&quot;).  A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
79
<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
80
81
<h4>XULRunner 1.9 (subset, derivative work)</h4>
82
83
The library swt-mozilla-gtk-xxxx.dll (where &quot;xxxx&quot; is the version number) contains a small portion of XULRunner 1.9 content (header files)
84
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
85
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL").  A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
86
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
87
<p>The changed files are:
88
<ul>
89
  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h</code>
90
  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h</code>
91
</ul>
92
Changes to the original files were made by SWT on April 7, 2009 and are marked with trailing comment <em>&quot;//SWT-20090407&quot;</em>.
93
63
<h4>Independent JPEG Group's JPEG software release 6b</h4>
94
<h4>Independent JPEG Group's JPEG software release 6b</h4>
64
95
65
<p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b (&quot;LIBJPEG&quot;).
96
<p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b (&quot;LIBJPEG&quot;).
(-)Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java (-2 / +3 lines)
Lines 21-35 Link Here
21
	Listener listener;
21
	Listener listener;
22
	boolean hasFocus;
22
	boolean hasFocus;
23
23
24
	static boolean GtkLoaded, IsLinux;
24
	static boolean GtkLoaded, IsLinux, IsSolaris;
25
	static {
25
	static {
26
		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
26
		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
27
		IsLinux = osName.startsWith ("linux"); //$NON-NLS-1$
27
		IsLinux = osName.startsWith ("linux"); //$NON-NLS-1$
28
		IsSolaris = osName.startsWith ("sunos") || osName.startsWith ("solaris"); //$NON-NLS-1$ //$NON-NLS-2$
28
	}
29
	}
29
30
30
MozillaDelegate (Browser browser) {
31
MozillaDelegate (Browser browser) {
31
	super ();
32
	super ();
32
	if (!IsLinux) {
33
	if (!(IsLinux || IsSolaris)) {
33
		browser.dispose ();
34
		browser.dispose ();
34
		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
35
		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
35
	}
36
	}
(-)Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java (-3 / +20 lines)
Lines 33-38 Link Here
33
	static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
33
	static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
34
	static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
34
	static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
35
	static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
35
	static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
36
37
	static boolean IsSparc;
38
	static {
39
		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
40
		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
41
		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
42
	}
36
	
43
	
37
AppFileLocProvider (String path) {
44
AppFileLocProvider (String path) {
38
	mozillaPath = path + SEPARATOR_OS;
45
	mozillaPath = path + SEPARATOR_OS;
Lines 174-191 Link Here
174
						if (segment.length () > 0) segments.addElement (segment);
181
						if (segment.length () > 0) segments.addElement (segment);
175
					} while (end != -1);
182
					} while (end != -1);
176
					int segmentsSize = segments.size ();
183
					int segmentsSize = segments.size ();
177
					pluginDirs = new String [segmentsSize + 2];
184
					pluginDirs = new String [segmentsSize + (IsSparc ? 1 : 2)];
178
					for (index = 0; index < segmentsSize; index++) {
185
					for (index = 0; index < segmentsSize; index++) {
179
						pluginDirs[index] = (String)segments.elementAt (index);
186
						pluginDirs[index] = (String)segments.elementAt (index);
180
					}
187
					}
181
				}
188
				}
182
			}
189
			}
183
			if (pluginDirs == null) {
190
			if (pluginDirs == null) {
184
				pluginDirs = new String[2];
191
				pluginDirs = new String[IsSparc ? 1 : 2];
185
			}
192
			}
186
193
187
			/* set the next value to the GRE path + "plugins" */
194
			/* set the next value to the GRE path + "plugins" */
188
			pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
195
196
			/*
197
			* Bug on Solaris SPARC.  Attempting to start the java plug-in fails with an
198
			* error indicating that PR_NewMonitor could not be found.  This is a well-
199
			* known problem that many other apps have also encountered, with no
200
			* resolution other than to remove this plug-in.  The Browser workaround is
201
			* to not add the directory containing this plug-in to the plug-in search path. 
202
			*/
203
			if (!IsSparc) {
204
				pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
205
			}
189
206
190
			/* set the next value to the home directory + "/.mozilla/plugins" */
207
			/* set the next value to the home directory + "/.mozilla/plugins" */
191
			pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
208
			pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
(-)Eclipse SWT PI/gtk/library/make_solaris.mak (-25 / +68 lines)
Lines 24-30 Link Here
24
CAIRO_PREFIX = swt-cairo
24
CAIRO_PREFIX = swt-cairo
25
ATK_PREFIX = swt-atk
25
ATK_PREFIX = swt-atk
26
GNOME_PREFIX = swt-gnome
26
GNOME_PREFIX = swt-gnome
27
MOZILLA_PREFIX = swt-mozilla
27
MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
28
XULRUNNER_PREFIX = swt-xulrunner
29
XPCOMINIT_PREFIX = swt-xpcominit
28
GLX_PREFIX = swt-glx
30
GLX_PREFIX = swt-glx
29
31
30
SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
32
SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
Lines 35-40 Link Here
35
ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
37
ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
36
GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
38
GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
37
MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
39
MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
40
XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
41
XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
38
GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
42
GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
39
43
40
CAIROCFLAGS = `pkg-config --cflags cairo`
44
CAIROCFLAGS = `pkg-config --cflags cairo`
Lines 61-86 Link Here
61
#NATIVE_STATS = -DNATIVE_STATS
65
#NATIVE_STATS = -DNATIVE_STATS
62
66
63
MOZILLACFLAGS = -O \
67
MOZILLACFLAGS = -O \
68
	-DSWT_VERSION=$(SWT_VERSION) \
69
	$(NATIVE_STATS) \
64
	-DMOZILLA_STRICT_API=1 \
70
	-DMOZILLA_STRICT_API=1 \
65
	-fno-rtti \
71
	-KPIC \
66
	-fno-exceptions \
72
	+w \
67
	-Wall \
68
	-DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) \
69
	-Wno-non-virtual-dtor \
70
	-fPIC \
71
	-I. \
73
	-I. \
72
	-I$(MOZILLA_SDK)	\
74
	-I$(JAVA_HOME)/include \
73
	-include $(MOZILLA_SDK)/mozilla-config.h \
75
	-I$(JAVA_HOME)/include/solaris \
74
	-I$(MOZILLA_SDK)/nspr/include \
76
	${SWT_PTR_CFLAGS}
75
	-I$(MOZILLA_SDK)/xpcom/include \
77
MOZILLALIBS =  -G
76
	-I$(MOZILLA_SDK)/string/include \
78
MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
77
	-I$(MOZILLA_SDK)/embed_base/include \
79
	-DNO__1XPCOMGlueStartup \
78
	-I$(MOZILLA_SDK)/embedstring/include
80
	-DNO__1XPCOMGlueLoadXULFunctions \
79
MOZILLALIBS = -G -s -Wl,--version-script=mozilla_exports -Bsymbolic \
81
	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
80
	-L$(MOZILLA_SDK)/embedstring/bin -lembedstring \
82
	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
81
	-L$(MOZILLA_SDK)/embed_base/bin -lembed_base_s \
83
	-DNO_nsDynamicFunctionLoad_1sizeof \
82
	-L$(MOZILLA_SDK)/xpcom/bin -lxpcomglue_s -lxpcom \
84
	-DNO__1Call__IIIIII \
83
	-L$(MOZILLA_SDK)/nspr/bin -lnspr4 -lplds4 -lplc4
85
	-DNO__1Call__JJJJJI \
86
	-DNO_nsDynamicFunctionLoad
87
XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
84
88
85
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
89
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
86
CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
90
CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
Lines 90-95 Link Here
90
ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
94
ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
91
GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
95
GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
92
MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
96
MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
97
XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
98
XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
93
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
99
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
94
100
95
CFLAGS = -O \
101
CFLAGS = -O \
Lines 201-222 Link Here
201
#
207
#
202
# Mozilla lib
208
# Mozilla lib
203
#
209
#
204
make_mozilla:#$(MOZILLA_LIB)
210
make_mozilla:$(MOZILLA_LIB)
205
211
206
$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
212
$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
207
	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS)
213
	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
208
214
209
xpcom.o: xpcom.cpp
215
xpcom.o: xpcom.cpp
210
	$(CXX) $(MOZILLACFLAGS) -c xpcom.cpp
216
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
211
217
212
xpcom_structs.o: xpcom_structs.cpp
218
xpcom_structs.o: xpcom_structs.cpp
213
	$(CXX) $(MOZILLACFLAGS) -c xpcom_structs.cpp
219
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
214
	
220
	
215
xpcom_custom.o: xpcom_custom.cpp
221
xpcom_custom.o: xpcom_custom.cpp
216
	$(CXX) $(MOZILLACFLAGS) -c xpcom_custom.cpp
222
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
217
223
218
xpcom_stats.o: xpcom_stats.cpp
224
xpcom_stats.o: xpcom_stats.cpp
219
	$(CXX) $(MOZILLACFLAGS) -c xpcom_stats.cpp	
225
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
226
227
#
228
# XULRunner lib
229
#
230
make_xulrunner:$(XULRUNNER_LIB)
231
232
$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
233
	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
234
235
xpcomxul.o: xpcom.cpp
236
	$(CXX) -o xpcomxul.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
237
238
xpcomxul_structs.o: xpcom_structs.cpp
239
	$(CXX) -o xpcomxul_structs.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
240
	
241
xpcomxul_custom.o: xpcom_custom.cpp
242
	$(CXX) -o xpcomxul_custom.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
243
244
xpcomxul_stats.o: xpcom_stats.cpp
245
	$(CXX) -o xpcomxul_stats.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
246
247
#
248
# XPCOMInit lib
249
#
250
make_xpcominit:$(XPCOMINIT_LIB)
251
252
$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
253
	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
254
255
xpcominit.o: xpcominit.cpp
256
	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
257
258
xpcominit_structs.o: xpcominit_structs.cpp
259
	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
260
	
261
xpcominit_stats.o: xpcominit_stats.cpp
262
	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
220
263
221
#
264
#
222
# GLX lib
265
# GLX lib
(-)Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java (-11 lines)
Lines 26-44 Link Here
26
	static int /*long*/ eventProc;
26
	static int /*long*/ eventProc;
27
	static final int STOP_PROPOGATE = 1;
27
	static final int STOP_PROPOGATE = 1;
28
28
29
	static boolean IsSparc;
30
	static {
31
		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
32
		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
33
		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$
34
	}
35
36
MozillaDelegate (Browser browser) {
29
MozillaDelegate (Browser browser) {
37
	super ();
30
	super ();
38
	if (IsSparc) {
39
		browser.dispose ();
40
		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
41
	}
42
	this.browser = browser;
31
	this.browser = browser;
43
}
32
}
44
33
(-)Eclipse SWT PI/motif/library/make_solaris.mak (-1 / +103 lines)
Lines 44-55 Link Here
44
AWT_OBJS = swt_awt.o
44
AWT_OBJS = swt_awt.o
45
AWT_LIBS = -G -L$(JAVA_HOME)/jre/lib/sparc -ljawt
45
AWT_LIBS = -G -L$(JAVA_HOME)/jre/lib/sparc -ljawt
46
46
47
GTK_PREFIX = swt-gtk
48
GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
49
GTK_OBJS = swt.o gtk.o
50
GTK_CFLAGS = `pkg-config --cflags gtk+-2.0`
51
GTK_LIBS = -G `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0
52
47
CAIRO_PREFIX = swt-cairo
53
CAIRO_PREFIX = swt-cairo
48
CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
54
CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
49
CAIRO_OBJS = swt.o cairo.o cairo_structs.o cairo_stats.o
55
CAIRO_OBJS = swt.o cairo.o cairo_structs.o cairo_stats.o
50
CAIROCFLAGS = `pkg-config --cflags cairo`
56
CAIROCFLAGS = `pkg-config --cflags cairo`
51
CAIRO_LIBS = -G `pkg-config --libs-only-L cairo` -lcairo
57
CAIRO_LIBS = -G `pkg-config --libs-only-L cairo` -lcairo
52
58
59
MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
60
MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
61
MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
62
XULRUNNER_PREFIX = swt-xulrunner
63
XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
64
XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
65
XPCOMINIT_PREFIX = swt-xpcominit
66
XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
67
XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
68
MOZILLACFLAGS = -O \
69
	-DSWT_VERSION=$(SWT_VERSION) \
70
	$(NATIVE_STATS) \
71
	-DMOZILLA_STRICT_API=1 \
72
	-KPIC \
73
	+w \
74
	-I. \
75
	-I$(JAVA_HOME)/include \
76
	-I$(JAVA_HOME)/include/solaris \
77
	${SWT_PTR_CFLAGS}
78
MOZILLALIBS =  -G
79
MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
80
	-DNO__1XPCOMGlueStartup \
81
	-DNO__1XPCOMGlueLoadXULFunctions \
82
	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
83
	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
84
	-DNO_nsDynamicFunctionLoad_1sizeof \
85
	-DNO__1Call__IIIIII \
86
	-DNO__1Call__JJJJJI \
87
	-DNO_nsDynamicFunctionLoad
88
XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
89
53
# Uncomment for Native Stats tool
90
# Uncomment for Native Stats tool
54
#NATIVE_STATS = -DNATIVE_STATS
91
#NATIVE_STATS = -DNATIVE_STATS
55
92
Lines 71-77 Link Here
71
	-I$(MOTIF_HOME)/include \
108
	-I$(MOTIF_HOME)/include \
72
	-I$(CDE_HOME)/include
109
	-I$(CDE_HOME)/include
73
110
74
all: make_swt make_awt make_glx make_cde
111
all: make_swt make_awt make_gtk make_glx make_cde
75
112
76
make_swt: $(SWT_LIB)
113
make_swt: $(SWT_LIB)
77
114
Lines 100-105 Link Here
100
$(AWT_LIB): $(AWT_OBJS)
137
$(AWT_LIB): $(AWT_OBJS)
101
	ld -o $@ $(AWT_OBJS) $(AWT_LIBS)
138
	ld -o $@ $(AWT_OBJS) $(AWT_LIBS)
102
139
140
make_gtk: $(GTK_LIB)
141
142
$(GTK_LIB): $(GTK_OBJS)
143
	ld -o $@ $(GTK_OBJS) $(GTK_LIBS)
144
145
gtk.o: gtk.c
146
	$(CC) $(GTK_CFLAGS) $(CFLAGS) -c gtk.c
147
148
#
149
# Mozilla lib
150
#
151
make_mozilla:$(MOZILLA_LIB)
152
153
$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
154
	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
155
156
xpcom.o: xpcom.cpp
157
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
158
159
xpcom_structs.o: xpcom_structs.cpp
160
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
161
	
162
xpcom_custom.o: xpcom_custom.cpp
163
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
164
165
xpcom_stats.o: xpcom_stats.cpp
166
	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
167
168
#
169
# XULRunner lib
170
#
171
make_xulrunner:$(XULRUNNER_LIB)
172
173
$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
174
	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
175
176
xpcomxul.o: xpcom.cpp
177
	$(CXX) -o xpcomxul.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
178
179
xpcomxul_structs.o: xpcom_structs.cpp
180
	$(CXX) -o xpcomxul_structs.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
181
	
182
xpcomxul_custom.o: xpcom_custom.cpp
183
	$(CXX) -o xpcomxul_custom.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
184
185
xpcomxul_stats.o: xpcom_stats.cpp
186
	$(CXX) -o xpcomxul_stats.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
187
188
#
189
# XPCOMInit lib
190
#
191
make_xpcominit:$(XPCOMINIT_LIB)
192
193
$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
194
	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
195
196
xpcominit.o: xpcominit.cpp
197
	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
198
199
xpcominit_structs.o: xpcominit_structs.cpp
200
	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
201
	
202
xpcominit_stats.o: xpcominit_stats.cpp
203
	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
204
103
make_glx: $(GLX_LIB)
205
make_glx: $(GLX_LIB)
104
206
105
$(GLX_LIB): $(GLX_OBJS)
207
$(GLX_LIB): $(GLX_OBJS)
(-)build.xml (+1 lines)
Lines 143-148 Link Here
143
			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}" />
143
			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}" />
144
			<fileset dir="${plugindir}/Eclipse SWT Program/motif/" includes="${includes}" excludes="${excludes}" />
144
			<fileset dir="${plugindir}/Eclipse SWT Program/motif/" includes="${includes}" excludes="${excludes}" />
145
			<fileset dir="${plugindir}/Eclipse SWT Theme/emulated/" includes="${includes}" excludes="${excludes}" />
145
			<fileset dir="${plugindir}/Eclipse SWT Theme/emulated/" includes="${includes}" excludes="${excludes}" />
146
			<fileset dir="${plugindir}/components/" includes="${includes}" excludes="${excludes}" />
146
		</copy>
147
		</copy>
147
		<antcall target="copy.translationfiles" />
148
		<antcall target="copy.translationfiles" />
148
149
(-)about.html (+31 lines)
Lines 31-36 Link Here
31
for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
31
for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
32
terms and conditions of use.</p>
32
terms and conditions of use.</p>
33
33
34
<h4>Mozilla Binding</h4>
35
36
<p>The &quot;Mozilla Binding&quot; is a binding to the Mozilla API.  The Content may include any or all of the following files:</p>
37
38
<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
39
<ul>
40
	<li>libswt-mozilla-motif-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
41
</ul>
42
43
<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
44
<ul>
45
	<li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
46
</ul>
47
48
<p>The Mozilla Binding contains portions of Mozilla (&quot;Mozilla&quot;).  Mozilla is made available by Mozilla.org.  Use of Mozilla is governed by the terms and
49
conditions of the Mozilla Public License Version 1.1 (&quot;MPL&quot;).  A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
50
<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
51
52
<h4>XULRunner 1.9 (subset, derivative work)</h4>
53
54
The library swt-mozilla-motif-xxxx.dll (where &quot;xxxx&quot; is the version number) contains a small portion of XULRunner 1.9 content (header files)
55
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
56
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL").  A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
57
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
58
<p>The changed files are:
59
<ul>
60
  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h</code>
61
  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h</code>
62
</ul>
63
Changes to the original files were made by SWT on April 7, 2009 and are marked with trailing comment <em>&quot;//SWT-20090407&quot;</em>.
64
34
<h4>Independent JPEG Group's JPEG software release 6b</h4>
65
<h4>Independent JPEG Group's JPEG software release 6b</h4>
35
66
36
<p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b (&quot;LIBJPEG&quot;).
67
<p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b (&quot;LIBJPEG&quot;).
(-)buildLibraries.csh (-1 / +7 lines)
Lines 5-11 Link Here
5
setenv PKG_CONFIG_PATH /usr/local/cairo-1.4.6/lib/pkgconfig/
5
setenv PKG_CONFIG_PATH /usr/local/cairo-1.4.6/lib/pkgconfig/
6
6
7
setenv PATH ${CCPATH}:/usr/ccs/bin:${PATH}
7
setenv PATH ${CCPATH}:/usr/ccs/bin:${PATH}
8
setenv CC cc
9
setenv CXX CC
10
11
setenv MOZILLA_SDK /bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk
12
setenv MOZILLA_INCLUDES "-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include"
13
setenv MOZILLA_LIBS "${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"
8
14
9
cd ../org.eclipse.swt/bin/library/
15
cd ../org.eclipse.swt/bin/library/
10
sh build.sh clean
16
sh build.sh clean
11
sh build.sh install
17
sh build.sh make_mozilla install

Return to bug 77217