Revision: 9597
Author: con...@google.com
Date: Mon Jan 24 04:30:43 2011
Log: Update the mac xpcom plugin for Gecko 2.0 (FF4). This is a platform
switch for
mac: ppc+i386 to i386+x86_64 to mirror Firefox's platform shift.
Also, fixup the linux libxul linkage: we had been getting lucky with
-rdynamic
on linux for the JS symbols which can actually be found in libxul (and are
required for the mac build).
Review at http://gwt-code-reviews.appspot.com/1311802
http://code.google.com/p/google-web-toolkit/source/detail?r=9597
Modified:
/trunk/plugins/config.mk
/trunk/plugins/xpcom/Makefile
/trunk/plugins/xpcom/install-template.rdf
/trunk/plugins/xpcom/prebuilt/extension/chrome.manifest
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff3/libgwt_dev_ff3.dylib
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff35/libgwt_dev_ff35.dylib
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff36/libgwt_dev_ff36.dylib
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3/libgwt_dev_ff3.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3+/libgwt_dev_ff3+.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff35/libgwt_dev_ff35.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff36/libgwt_dev_ff36.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff40/libgwt_dev_ff40.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3/libgwt_dev_ff3.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3+/libgwt_dev_ff3+.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff35/libgwt_dev_ff35.so
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff40/libgwt_dev_ff40.so
/trunk/plugins/xpcom/prebuilt/gwt-dev-plugin.xpi
=======================================
--- /trunk/plugins/config.mk Thu Sep 3 15:22:56 2009
+++ /trunk/plugins/config.mk Mon Jan 24 04:30:43 2011
@@ -69,24 +69,20 @@
MARCH=$(ARCH)
ifeq ($(ARCH),x86)
MARCH=i386
-OMARCH=ppc
endif
-ifeq ($(ARCH),ppc)
-OMARCH=i386
-endif
# Set OS as well as CFLAGS, CXX, and other common make variables
ifeq ($(shell uname),Linux)
OS=linux
BASECFLAGS= -g -O2 -fPIC $(INC) -rdynamic
ARCHCFLAGS=-m$(FLAG32BIT)
-ALLARCHCFLAGS=$(ARCHCFLAGS)
+ALLARCHCFLAGS=
endif
ifeq ($(shell uname),Darwin)
OS=mac
BASECFLAGS= -g -O2 -fPIC $(INC) -D__mac
ARCHCFLAGS=-arch $(MARCH)
-ALLARCHCFLAGS=-arch i386 -arch ppc
+ALLARCHCFLAGS=-arch i386 -arch ppc -arch x86_64
AR=libtool
ARFLAGS=-static -o
endif
=======================================
--- /trunk/plugins/xpcom/Makefile Wed Jan 12 11:43:57 2011
+++ /trunk/plugins/xpcom/Makefile Mon Jan 24 04:30:43 2011
@@ -72,6 +72,9 @@
MOZJS_DLLFLAGS = -lmozjs
MOZALLOC_DLLFLAGS =
+#default ALLARCHFLAGS for pre-FF4
+ALLARCHCFLAGS=-arch i386 -arch ppc
+
ifeq ($(BROWSER),ff3)
GECKO_VERSION = 1.9.0
CFLAGS += -DGECKO_VERSION=1900
@@ -93,8 +96,13 @@
GECKO_VERSION = 2.0.0
CFLAGS += -DGECKO_VERSION=2000
MOZALLOC_DLLFLAGS = -lmozalloc
-#MOZJS is statically linked in FF4
-MOZJS_DLLFLAGS =
+MOZJS_DLLFLAGS = -lxul
+
+#FF4 drops PPC, adds x86_64. Use FLAG32BIT as a switch in the unified
headers.
+ifeq ($(OS),mac)
+ALLARCHCFLAGS = -arch i386 -arch x86_64 -Xarch_i386 -DFLAG32BIT=32
-Xarch_x86_64 -DFLAG32BIT=64
+endif
+
else
$(error Unrecognized BROWSER of $(BROWSER) - options are ff3, ff3+, ff35,
ff36, ff40)
endif
@@ -133,7 +141,6 @@
XPIDL_FLAGS = -I$(GECKO_SDK)/idl
DLLFLAGS += \
- -L$(DEFAULT_FIREFOX_LIBS) \
-L$(GECKO_LIBS) \
-Wl,$(RUN_PATH_FLAG),$(GECKO_LIBS) \
$(GECKO_DLLFLAGS) $(NSPR_DLLFLAGS) \
@@ -212,7 +219,7 @@
[ ! -x $(XPIDL) -o \( -e $(FF_HEADER) -a ! -w $(FF_HEADER) \) ] ||
$(XPIDL) $(XPIDL_FLAGS) -m header -e $@ $<
$(FF_DLL): $(FF_OBJS) $(COMMON)
- $(CXX) -m$(FLAG32BIT) -o $@ $(FF_OBJS) $(COMMON) $(DLLFLAGS)
+ $(CXX) -o $@ $(FF_OBJS) $(COMMON) $(DLLFLAGS)
@mkdir -p $(FF_PLATFORM_DIR)
cp $(FF_DLL) $(FF_PLATFORM_DIR)/
=======================================
--- /trunk/plugins/xpcom/install-template.rdf Wed Jan 12 11:43:57 2011
+++ /trunk/plugins/xpcom/install-template.rdf Mon Jan 24 04:30:43 2011
@@ -26,6 +26,7 @@
<em:targetPlatform>Linux_x86_64-gcc3</em:targetPlatform>
<em:targetPlatform>WINNT_x86-msvc</em:targetPlatform>
<em:targetPlatform>Darwin_x86-gcc3</em:targetPlatform>
+ <em:targetPlatform>Darwin_x86_64-gcc3</em:targetPlatform>
<em:targetPlatform>Darwin_ppc-gcc3</em:targetPlatform>
<em:optionsURL>chrome://gwt-dev-plugin/content/options.xul</em:optionsURL>
=======================================
--- /trunk/plugins/xpcom/prebuilt/extension/chrome.manifest Wed Jan 12
11:43:57 2011
+++ /trunk/plugins/xpcom/prebuilt/extension/chrome.manifest Mon Jan 24
04:30:43 2011
@@ -3,8 +3,10 @@
binary-component lib/Linux_x86_64-gcc3/ff40/libgwt_dev_ff40.so
ABI=Linux_x86_64-gcc3
binary-component lib/Linux_x86-gcc3/ff40/libgwt_dev_ff40.so
ABI=Linux_x86-gcc3
-# Windows and Mac are not yet supported
-# binary-component lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib
ABI=Darwin_x86-gcc3
+binary-component lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib
ABI=Darwin_x86_64-gcc3
+binary-component lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib
ABI=Darwin_x86-gcc3
+
+# Windows is not yet supported
# binary-component lib/WINNT_x86-msvc/ff40/xpGwtDevPlugin.dll
ABI=WINNT_x86-msvc
interfaces components/IOOPHM.xpt
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff3/libgwt_dev_ff3.dylib
Mon Nov 30 17:32:20 2009
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff3/libgwt_dev_ff3.dylib
Mon Jan 24 04:30:43 2011
Binary file, no diff available.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff35/libgwt_dev_ff35.dylib
Mon Nov 30 17:32:20 2009
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff35/libgwt_dev_ff35.dylib
Mon Jan 24 04:30:43 2011
Binary file, no diff available.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff36/libgwt_dev_ff36.dylib
Fri Jan 29 05:47:35 2010
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff36/libgwt_dev_ff36.dylib
Mon Jan 24 04:30:43 2011
Binary file, no diff available.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib
Thu Jun 17 11:57:35 2010
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib
Mon Jan 24 04:30:43 2011
Binary file, no diff available.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3/libgwt_dev_ff3.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3/libgwt_dev_ff3.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3+/libgwt_dev_ff3+.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3+/libgwt_dev_ff3+.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff35/libgwt_dev_ff35.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff35/libgwt_dev_ff35.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff36/libgwt_dev_ff36.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff36/libgwt_dev_ff36.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff40/libgwt_dev_ff40.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff40/libgwt_dev_ff40.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3/libgwt_dev_ff3.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3/libgwt_dev_ff3.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3+/libgwt_dev_ff3+.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3+/libgwt_dev_ff3+.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff35/libgwt_dev_ff35.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff35/libgwt_dev_ff35.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
---
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff40/libgwt_dev_ff40.so
Wed Jan 12 11:43:57 2011
+++
/trunk/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff40/libgwt_dev_ff40.so
Mon Jan 24 04:30:43 2011
File is too large to display a diff.
=======================================
--- /trunk/plugins/xpcom/prebuilt/gwt-dev-plugin.xpi Wed Jan 12 11:43:57
2011
+++ /trunk/plugins/xpcom/prebuilt/gwt-dev-plugin.xpi Mon Jan 24 04:30:43
2011
File is too large to display a diff.
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
