Update the npapi plugin to support OSX. Also, adds a proper make crx step.

Review at http://gwt-code-reviews.appspot.com/1036801


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9128 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/plugins/npapi/Makefile b/plugins/npapi/Makefile
index 385f6ae..0a482f0 100644
--- a/plugins/npapi/Makefile
+++ b/plugins/npapi/Makefile
@@ -17,30 +17,27 @@
 ifeq ($(OS),mac)
 RUN_PATH_FLAG = -executable_path
 DLL_SUFFIX = .dylib
-DLLFLAGS = -bundle $(ALLARCHCFLAGS)
-CFLAGS += $(ALLARCHCFLAGS)
-CXXFLAGS += $(ALLARCHCFLAGS)
+DLLFLAGS = -bundle $(ARCHCFLAGS)
+CFLAGS += -DXP_MACOSX $(ARCHCFLAGS)
+CXXFLAGS += -DXP_MACOSX $(ARCHCFLAGS)
 # Mac puts multiple architectures into the same files
 TARGET_PLATFORM = Darwin-gcc3
+CHROME_PATH ?= /Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome
 else
 ifeq ($(OS),linux)
 RUN_PATH_FLAG = -rpath-link
 DLL_SUFFIX = .so
 DLLFLAGS = -shared -m$(FLAG32BIT)
 TARGET_PLATFORM = Linux_$(ARCH)-gcc3
+CHROME_PATH ?= /opt/google/chrome/chrome
 else
-ifeq ($(OS),sun)
-TARGET_PLATFORM = SunOS_$(ARCH)-sunc
-RUN_PATH_FLAG = -rpath-link
-DLLFLAGS=
-endif
 endif
 endif
 
 
 export FLAG32BIT
 
-CFLAGS += -DBROWSER_NPAPI -fshort-wchar
+CFLAGS += -DBROWSER_NPAPI -DXP_UNIX -fshort-wchar
 CXXFLAGS = $(CXXONLYFLAGS) $(CFLAGS)
 DIR = $(shell pwd)
 
@@ -55,11 +52,15 @@
 
 INSTALLER_CRX     = prebuilt/gwt-dev-plugin.crx
 DLL               = $(OBJ_OUTDIR)/libGwtDevPlugin$(DLL_SUFFIX)
+GWTDEV_CRX_PEM   ?= $(CURDIR)/gwt-dev-plugin.pem
+CHROME_COMMAND    = $(CHROME_PATH) --pack-extension=$(CURDIR)/$(EXTENSION_OUTDIR) --no-message-box --user-data-dir=$(CURDIR)/$(OBJ_OUTDIR)/user-data --pack-extension-key=$(GWTDEV_CRX_PEM)
 
 #DLLFLAGS += 
 
-#VERSION ?= 0.9.$(shell ./getversion).$(shell date +%Y%m%d%H%M%S)
-VERSION ?= 0.9.$(shell ./getversion)
+VERSION ?= 1.0.$(shell ./getversion)
+ifeq ($(VERSION), 1.0.)
+$(error You must specify the version if you are not in an svn checkout)
+endif
 
 .PHONY: default all crx lib common clean depend install install-platform \
 	versioned-files
@@ -101,11 +102,8 @@
 $(OBJ_OUTDIR)::
 	@mkdir -p $@
 
-$(INSTALLER_CRX): $(EXTENSION_OUTDIR) versioned-files
-	@mkdir -p $(EXTENSION_OUTDIR)/components
-	#(cd prebuilt/extension; find . \( -name .svn -prune \) -o -print | cpio -pmdua ../../$(EXTENSION_OUTDIR))
-	-rm $(INSTALLER_CRX)
-	(cd $(EXTENSION_OUTDIR) && zip -r -D -9 $(DIR)/$(INSTALLER_CRX) * -x '*/.svn/*' -x 'META-INF/*')
+$(INSTALLER_CRX): $(GWTDEV_CRX_PEM) $(EXTENSION_OUTDIR) versioned-files
+	$(shell $(CHROME_COMMAND))
 
 versioned-files::
 	sed -e s/GWT_DEV_PLUGIN_VERSION/$(VERSION)/ manifest-template.json >prebuilt/gwt-dev-plugin/manifest.json
@@ -125,14 +123,6 @@
 clean:
 	rm -rf build
 
-install-platform:
-	@-mkdir -p $(PLATFORM_DIR)
-	-cp $(DLL) $(PLATFORM_DIR)/
-ifeq ($(OS),mac)
-	@-mkdir -p $(subst $(EXTENSION_OUTDIR),prebuilt/extension-$(BROWSER),$(subst x86,ppc,$(PLATFORM_DIR)))/components
-	-cp $(DLL) $(subst $(EXTENSION_OUTDIR),prebuilt/extension-$(BROWSER),$(subst x86,ppc,$(PLATFORM_DIR)))/components
-endif
-
 depend: $(OBJ_OUTDIR)
 	($(foreach src,$(SRCS),$(DEPEND)) true) >>Makefile
 #	makedepend -- $(CFLAGS) -- $(SRCS)
diff --git a/plugins/npapi/Makefile.mac b/plugins/npapi/Makefile.mac
deleted file mode 100644
index 771d89f..0000000
--- a/plugins/npapi/Makefile.mac
+++ /dev/null
@@ -1,130 +0,0 @@
-INC=-I. -I../common
-FLAG32BIT=$(shell ./get32bitflag arch)
-CFLAGS=-g -O2 -fPIC $(INC) -m$(FLAG32BIT) -D__mac -DXP_MACOSX -DXP_UNIX -DBROWSER_NPAPI
-CXXFLAGS=$(CFLAGS)
-
-INSTDIR := extension/platform/$(shell ./getarch arch)/plugins/oophm.plugin/Contents/MacOS
-RESDIR := extension/platform/$(shell ./getarch arch)/plugins/oophm.plugin/Contents/Resources
-
-HDRS= LocalObjectTable.h NPVariantWrapper.h Plugin.h mozincludes.h \
-	JavaObject.h ScriptableInstance.h
-
-COMMON= ../common/libcommon$(FLAG32BIT).a
-OBJS=	main.o Plugin.o LocalObjectTable.o JavaObject.o npn_bindings.o \
-	ScriptableInstance.o
-
-SRCS=	main.cpp Plugin.cpp LocalObjectTable.cpp JavaObject.cpp \
-	npn_bindings.cc ScriptableInstance.cpp
-
-oophm.xpi: arch extension $(INSTDIR)/liboophm $(RESDIR)/liboophm.rsrc \
-  liboophm extension/install.rdf
-	-rm -f oophm.xpi
-	cd extension; zip -r -D -9 -o ../$@ * -x '*/.svn/*' -x 'META-INF/*'
-
-oophm-signed.xpi: arch $(INSTDIR)/liboophm $(RESDIR)/liboophm.rsrc \
-  extension/install.rdf extension/META-INF/zigbert.sf
-	-rm -f $@
-	cd extension; zip -9 ../$@ META-INF/zigbert.rsa; zip -r -D -9 -o ../$@ * -x '*/.svn/*' -x META-INF/zigbert.rsa
-
-extension: prebuilt/extension
-	-rm -rf extension
-	cp -r $< $@
-
-$(INSTDIR):
-	-mkdir -p $@
-
-extension/META-INF/zigbert.sf: $(INSTDIR)/liboophm
-	signtool -d certdb -k 'GWT Plugin' -x .svn extension/
-
-extension/install.rdf: install-template.rdf version
-	sed s/GWT_OOPHM_VERSION/`cat version`/ install-template.rdf >$@
-
-version: computeversion $(HDRS) $(SRCS) $(COMMON)
-	./computeversion >$@
-
-arch: computearch
-	./computearch arch
-	@echo "Restart make"
-	@exit 1
-
-$(INSTDIR)/liboophm: liboophm
-	cp $< $@
-
-$(RESDIR)/liboophm.rsrc: liboophm.rsrc
-	cp $< $@
-
-liboophm.rsrc: liboophm.r
-	/Developer/Tools/Rez $< -o $@ -useDF
-
-liboophm: $(OBJS) $(COMMON) $(INSTDIR)
-	g++ -m$(FLAG32BIT) -bundle -o $@ $(OBJS) $(COMMON)
-
-$(COMMON): common
-	cd ../common; make -f Makefile.mac
-
-$(OBJS): arch
-
-.PHONY: all realclean clean depend common install install-platform
-
-install: oophm.xpi
-	-cp $< prebuilt
-
-install-platform: liboophm liboophm.rsrc
-	-mkdir -p $(subst extension,prebuilt/extension,$(INSTDIR))
-	-mkdir -p $(subst extension,prebuilt/extension,$(RESDIR))
-	-cp liboophm $(subst extension,prebuilt/extension,$(INSTDIR))
-	-cp liboophm.rsrc $(subst extension,prebuilt/extension,$(RESDIR))
-
-realclean: clean
-	-rm -f arch
-
-clean:
-	-rm -f $(OBJS) liboophm liboophm.rsrc
-	-rm -rf extension
-
-depend:
-	g++ -MM $(CFLAGS) $(SRCS) >>Makefile.mac
-#	makedepend -- $(CFLAGS) -- $(SRCS)
-
-# DO NOT DELETE
-main.o: main.cpp ../common/Debug.h ../common/Platform.h \
-  ../common/DebugLevel.h mozincludes.h npapi/npapi.h npapi/nphostapi.h \
-  npapi/npapi.h npapi/npruntime.h npapi/npruntime.h NPObjectWrapper.h \
-  Plugin.h ScriptableInstance.h ../common/HostChannel.h ../common/Platform.h \
-  ../common/Message.h ../common/ReturnMessage.h ../common/Message.h \
-  ../common/BrowserChannel.h ../common/Value.h ../common/Debug.h \
-  ../common/BrowserChannel.h ../common/Value.h ../common/SessionHandler.h \
-  ../common/LoadModuleMessage.h ../common/Message.h \
-  ../common/BrowserChannel.h ../common/HostChannel.h \
-  ../common/SessionHandler.h LocalObjectTable.h \
-  ../common/scoped_ptr/scoped_ptr.h
-Plugin.o: Plugin.cpp Plugin.h ScriptableInstance.h ../common/Debug.h ../common/Platform.h \
-  ../common/DebugLevel.h mozincludes.h npapi/npapi.h npapi/nphostapi.h \
-  npapi/npapi.h npapi/npruntime.h npapi/npruntime.h NPObjectWrapper.h \
-  ../common/HostChannel.h ../common/Platform.h ../common/Message.h \
-  ../common/ReturnMessage.h ../common/Message.h \
-  ../common/BrowserChannel.h ../common/Value.h ../common/Debug.h \
-  ../common/BrowserChannel.h ../common/Value.h ../common/SessionHandler.h \
-  ../common/LoadModuleMessage.h ../common/Message.h \
-  ../common/BrowserChannel.h ../common/HostChannel.h \
-  ../common/SessionHandler.h LocalObjectTable.h ../common/InvokeMessage.h \
-  ../common/Message.h ../common/BrowserChannel.h ../common/Value.h \
-  ../common/ServerMethods.h ../common/Value.h \
-  ../common/scoped_ptr/scoped_ptr.h NPVariantWrapper.h JavaObject.h
-LocalObjectTable.o: LocalObjectTable.cpp mozincludes.h npapi/npapi.h \
-  npapi/nphostapi.h npapi/npapi.h npapi/npruntime.h npapi/npruntime.h \
-  NPObjectWrapper.h LocalObjectTable.h ../common/Debug.h \
-  ../common/Platform.h ../common/DebugLevel.h
-JavaObject.o: JavaObject.cpp JavaObject.h mozincludes.h npapi/npapi.h \
-  npapi/nphostapi.h npapi/npapi.h npapi/npruntime.h npapi/npruntime.h \
-  NPObjectWrapper.h Plugin.h ScriptableInstance.h ../common/Debug.h ../common/Platform.h \
-  ../common/DebugLevel.h ../common/HostChannel.h ../common/Platform.h \
-  ../common/Message.h ../common/ReturnMessage.h ../common/Message.h \
-  ../common/BrowserChannel.h ../common/Value.h ../common/Debug.h \
-  ../common/BrowserChannel.h ../common/Value.h ../common/SessionHandler.h \
-  ../common/LoadModuleMessage.h ../common/Message.h \
-  ../common/BrowserChannel.h ../common/HostChannel.h \
-  ../common/SessionHandler.h LocalObjectTable.h NPVariantWrapper.h
-npn_bindings.o: npn_bindings.cc mozincludes.h npapi/npapi.h \
-  npapi/nphostapi.h npapi/npapi.h npapi/npruntime.h npapi/npruntime.h \
-  NPObjectWrapper.h
diff --git a/plugins/npapi/Makefile.sun b/plugins/npapi/Makefile.sun
deleted file mode 100644
index 3d11a75..0000000
--- a/plugins/npapi/Makefile.sun
+++ /dev/null
@@ -1,115 +0,0 @@
-INC=-I. -I../common
-FLAG32BIT=$(shell ./get32bitflag arch)
-CFLAGS=-fast -g0 -Kpic -noex -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -xbuiltin=%all -mt $(INC) -m$(FLAG32BIT) -DXP_UNIX -DLINUX -DBROWSER_NPAPI
-CXXFLAGS=$(CFLAGS)
-CXX=CC
-
-INSTDIR := extension/platform/$(shell ./getarch arch)/plugins
-
-HDRS= LocalObjectTable.h NPVariantWrapper.h Plugin.h mozincludes.h \
-	JavaObject.h ScriptableInstance.h
-
-COMMON= ../common/libcommon$(FLAG32BIT).a
-OBJS=	main.o Plugin.o LocalObjectTable.o JavaObject.o npn_bindings.o \
-	ScriptableInstance.o
-
-SRCS=	main.cpp Plugin.cpp LocalObjectTable.cpp JavaObject.cpp \
-	npn_bindings.cc ScriptableInstance.cpp
-
-all:: oophm.xpi
-
-oophm.xpi: arch extension $(INSTDIR)/liboophm.so liboophm.so extension/install.rdf
-	-rm -f oophm.xpi
-	cd extension; zip -r -D -9 -o ../$@ * -x '*/.svn/*' -x 'META-INF/*'
-
-oophm-signed.xpi: arch $(INSTDIR)/liboophm.so extension/install.rdf \
-  extension/META-INF/zigbert.sf
-	-rm -f $@
-	cd extension; zip -9 ../$@ META-INF/zigbert.rsa; zip -r -D -9 -o ../$@ * -x '*/.svn/*' -x META-INF/zigbert.rsa
-
-extension: prebuilt/extension
-	-rm -rf extension
-	cp -r --preserve=mode $< $@
-
-extension/install.rdf: extension install-template.rdf version
-	sed s/GWT_OOPHM_VERSION/`cat version`/ install-template.rdf >$@
-
-$(INSTDIR):
-	-mkdir -p $@
-
-extension/META-INF/zigbert.sf: $(INSTDIR)/liboophm.so
-	signtool -d certdb -k 'GWT Plugin' -x .svn extension/
-
-version: computeversion $(HDRS) $(SRCS) $(COMMON)
-	./computeversion >$@
-
-arch: computearch
-	./computearch arch
-	@echo "Restart make"
-	@exit 1
-
-$(INSTDIR)/liboophm.so: liboophm.so
-	cp $< $@
-
-liboophm.so: $(OBJS) $(COMMON) $(INSTDIR)
-	$(CXX) -m$(FLAG32BIT) -G -o $@ $(OBJS) $(COMMON)
-
-$(COMMON): common
-	cd ../common; make -f Makefile.sun
-
-$(OBJS): arch
-
-.PHONY: all realclean clean depend common install install-platform
-
-install: oophm.xpi
-	-cp --preserve=mode $< prebuilt
-
-install-platform: liboophm.so
-	-mkdir -p $(subst extension,prebuilt/extension,$(INSTDIR))
-	-cp --preserve=mode $< $(subst extension,prebuilt/extension,$(INSTDIR))
-
-realclean: clean
-	-rm -f arch
-
-clean:
-	-rm -f $(OBJS)
-	-rm -f extension/platform/*/plugins/*.{so,dll}
-
-depend:
-	$(CXX) -MM $(CFLAGS) $(SRCS) >>Makefile
-#	makedepend -- $(CFLAGS) -- $(SRCS)
-
-# DO NOT DELETE
-main.o: main.cpp ../common/Debug.h ../common/DebugLevel.h mozincludes.h \
-  npapi/npapi.h npapi/nphostapi.h ./npapi/npapi.h ./npapi/npruntime.h \
-  ./npapi/npapi.h npapi/npruntime.h NPObjectWrapper.h Plugin.h ScriptableInstance.h \
-  ../common/HostChannel.h ../common/Platform.h ../common/Message.h \
-  ../common/ReturnMessage.h ../common/BrowserChannel.h ../common/Value.h \
-  ../common/SessionHandler.h ../common/LoadModuleMessage.h \
-  ../common/HostChannel.h LocalObjectTable.h ../common/SessionHandler.h \
-  ../common/scoped_ptr/scoped_ptr.h
-Plugin.o: Plugin.cpp Plugin.h ScriptableInstance.h ../common/Debug.h ../common/DebugLevel.h \
-  mozincludes.h npapi/npapi.h npapi/nphostapi.h ./npapi/npapi.h \
-  ./npapi/npruntime.h ./npapi/npapi.h npapi/npruntime.h NPObjectWrapper.h \
-  ../common/HostChannel.h ../common/Platform.h ../common/Message.h \
-  ../common/ReturnMessage.h ../common/BrowserChannel.h ../common/Value.h \
-  ../common/SessionHandler.h ../common/LoadModuleMessage.h \
-  ../common/HostChannel.h LocalObjectTable.h ../common/SessionHandler.h \
-  ../common/InvokeMessage.h ../common/ReturnMessage.h \
-  ../common/ServerMethods.h ../common/scoped_ptr/scoped_ptr.h \
-  NPVariantWrapper.h ../common/Platform.h ../common/Value.h JavaObject.h
-LocalObjectTable.o: LocalObjectTable.cpp mozincludes.h npapi/npapi.h \
-  npapi/nphostapi.h ./npapi/npapi.h ./npapi/npruntime.h ./npapi/npapi.h \
-  npapi/npruntime.h NPObjectWrapper.h LocalObjectTable.h
-JavaObject.o: JavaObject.cpp JavaObject.h mozincludes.h npapi/npapi.h \
-  npapi/nphostapi.h ./npapi/npapi.h ./npapi/npruntime.h ./npapi/npapi.h \
-  npapi/npruntime.h NPObjectWrapper.h Plugin.h ScriptableInstance.h ../common/Debug.h \
-  ../common/DebugLevel.h ../common/HostChannel.h ../common/Platform.h \
-  ../common/Message.h ../common/ReturnMessage.h \
-  ../common/BrowserChannel.h ../common/Value.h ../common/SessionHandler.h \
-  ../common/LoadModuleMessage.h ../common/HostChannel.h \
-  LocalObjectTable.h ../common/SessionHandler.h NPVariantWrapper.h \
-  ../common/Platform.h ../common/Value.h
-npn_bindings.o: npn_bindings.cc mozincludes.h npapi/npapi.h \
-  npapi/nphostapi.h ./npapi/npapi.h ./npapi/npruntime.h ./npapi/npapi.h \
-  npapi/npruntime.h NPObjectWrapper.h
diff --git a/plugins/npapi/build.xml b/plugins/npapi/build.xml
deleted file mode 100755
index 0cf01ee..0000000
--- a/plugins/npapi/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project name="firefox" default="build" basedir=".">
-	<property name="plugin.root" value="firefox" />
-	<import file="../common.ant.xml" />
-
-	<target name="build" description="Copy compiled plugin to the output folder">
-		<mkdir dir="${gwt.build.out}/plugins" />
-		<mkdir dir="${gwt.build.out}/plugins/firefox" />
-		<copy todir="${gwt.build.out}/plugins/firefox">
-			<fileset file="prebuilt/oophm.xpi" />
-		</copy>
-	</target>
-
-	<target name="test" description="Run any tests">
-	</target>
-
-	<target name="checkstyle" description="Static style analysis">
-	</target>
-</project>
diff --git a/plugins/npapi/computeversion b/plugins/npapi/computeversion
deleted file mode 100755
index 7cf259c..0000000
--- a/plugins/npapi/computeversion
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-if [ -z "$1" ]
-then
-  F=version
-else
-  F=$1
-fi
-
-V=`svn info 2>/dev/null | fgrep Revision: | awk  '{ print $2; }'`
-if [ $? -gt 0 -o -z "$V" ]
-then
-  V='?'
-fi
-
-TS=`date +%Y%m%d%H%M%S`
-
-echo "0.0.$V.$TS" >$F
-exit 0
diff --git a/plugins/npapi/install-template.rdf b/plugins/npapi/install-template.rdf
deleted file mode 100644
index 8f6120f..0000000
--- a/plugins/npapi/install-template.rdf
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>oophm@gwt.google.com</em:id>
-    <em:name>GWT Hosted Mode Plugin</em:name>
-    <em:version>GWT_OOPHM_VERSION</em:version>
-    <em:type>2</em:type>
-    <em:targetApplication>
-      <Description>
-        <!-- Firefox 1.5-3.0 supported -->
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>3.0.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <!-- Front End MetaData -->
-    <em:name>GWT Hosted Mode Plugin</em:name>
-    <em:description>A plugin to support hosted-mode development of GWT applications</em:description>
-    <em:creator>Google, Inc.</em:creator>
-    <em:homepageURL>http://code.google.com/webtoolkit/</em:homepageURL>
-    <em:iconURL>chrome://gwt-oophm/skin/icon.png</em:iconURL>
-
-    <em:targetPlatform>Linux_x86-gcc3</em:targetPlatform>
-    <em:targetPlatform>Linux_x86_64-gcc3</em:targetPlatform>
-    <em:targetPlatform>WINNT_x86-msvc</em:targetPlatform>
-    <em:targetPlatform>Darwin_x86-gcc3</em:targetPlatform>
-    <em:targetPlatform>SunOS_x86-sunc</em:targetPlatform>
-
-    <!-- TODO
-    # prefs dialog
-
-    # replace default about dialog
-    <em:aboutURL>chrome://gwt-oophm/content/about.xul</em:aboutURL>
-
-    # updates, see http://developer.mozilla.org/en/docs/Extension_Versioning%2C_Update_and_Compatibility#Update_RDF_Format
-    <em:updateURL>https://xxx.google.com/.../update.rdf</em:updateURL>
-
-    # platforms - any others?
-    <em:targetPlatform>Darwin_ppc-gcc3</em:targetPlatform>
-    <em:targetPlatform>SunOS_sparc-sunc</em:targetPlatform>
-    -->
-
-  </Description>
-</RDF>
diff --git a/plugins/npapi/manifest-template.json b/plugins/npapi/manifest-template.json
index d54ddd8..ecf565f 100644
--- a/plugins/npapi/manifest-template.json
+++ b/plugins/npapi/manifest-template.json
@@ -20,6 +20,7 @@
   "plugins": [
     { "path": "WINNT_x86-msvc/npGwtDevPlugin.dll", "public": true },
     { "path": "Linux_x86-gcc3/libGwtDevPlugin.so", "public": true },
-    { "path": "Linux_x86_64-gcc3/libGwtDevPlugin.so", "public": true }
+    { "path": "Linux_x86_64-gcc3/libGwtDevPlugin.so", "public": true },
+    { "path": "Darwin-gcc3/gwtDev.plugin", "public": true }
   ]
 }
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin.crx b/plugins/npapi/prebuilt/gwt-dev-plugin.crx
index cc6c39e..0a33eba 100644
--- a/plugins/npapi/prebuilt/gwt-dev-plugin.crx
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin.crx
Binary files differ
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/gwtDev.plugin/Contents/Info.plist b/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/gwtDev.plugin/Contents/Info.plist
new file mode 100644
index 0000000..4df9097
--- /dev/null
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/gwtDev.plugin/Contents/Info.plist
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>libGwtDevPlugin.dylib</string>
+    <key>CFBundleGetInfoString</key>
+    <string>Copyright 2010 Google, Inc.</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.google.gwt.devmode-npapi-plugin</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>GWT Devmode NPAPI Plugin</string>
+    <key>CFBundlePackageType</key>
+    <string>BRPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1.0</string>
+    <key>CFPlugInDynamicRegisterFunction</key>
+    <string></string>
+    <key>CFPlugInDynamicRegistration</key>
+    <string>NO</string>
+    <key>WebPluginDescription</key>
+    <string>Plugin to allow debugging of GWT applications in DevMode</string>
+    <key>WebPluginMIMETypes</key>
+    <dict>
+      <key>application/x-gwt-hosted-mode</key>
+      <dict>
+        <key>WebPluginTypeDescription</key>
+        <string>GWT DevMode</string>
+      </dict>
+    </dict>
+    <key>WebPluginName</key>
+    <string>GWT DevMode Plugin</string>
+  </dict>
+</plist>
+
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/gwtDev.plugin/Contents/MacOS/libGwtDevPlugin.dylib b/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/gwtDev.plugin/Contents/MacOS/libGwtDevPlugin.dylib
new file mode 100755
index 0000000..6e17d7b
--- /dev/null
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/gwtDev.plugin/Contents/MacOS/libGwtDevPlugin.dylib
Binary files differ
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/libGwtDevPlugin.dylib b/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/libGwtDevPlugin.dylib
new file mode 100755
index 0000000..98f3d3f
--- /dev/null
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/Darwin-gcc3/libGwtDevPlugin.dylib
Binary files differ
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86-gcc3/libGwtDevPlugin.so b/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86-gcc3/libGwtDevPlugin.so
index 6f77d12..2aec960 100755
--- a/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86-gcc3/libGwtDevPlugin.so
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86-gcc3/libGwtDevPlugin.so
Binary files differ
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86_64-gcc3/libGwtDevPlugin.so b/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86_64-gcc3/libGwtDevPlugin.so
index 7fde13d..1f7949b 100755
--- a/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86_64-gcc3/libGwtDevPlugin.so
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/Linux_x86_64-gcc3/libGwtDevPlugin.so
Binary files differ
diff --git a/plugins/npapi/prebuilt/gwt-dev-plugin/manifest.json b/plugins/npapi/prebuilt/gwt-dev-plugin/manifest.json
index 145d70e..0f1cdf0 100644
--- a/plugins/npapi/prebuilt/gwt-dev-plugin/manifest.json
+++ b/plugins/npapi/prebuilt/gwt-dev-plugin/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "GWT Developer Plugin",
-  "version": "1.0.8980",
+  "version": "1.0.9119",
   "description": "A plugin to enable debugging with GWT's Development Mode",
   "update_url": "https://dl-ssl.google.com/gwt/plugins/chrome/updates.xml",
   "icons": {
@@ -20,6 +20,7 @@
   "plugins": [
     { "path": "WINNT_x86-msvc/npGwtDevPlugin.dll", "public": true },
     { "path": "Linux_x86-gcc3/libGwtDevPlugin.so", "public": true },
-    { "path": "Linux_x86_64-gcc3/libGwtDevPlugin.so", "public": true }
+    { "path": "Linux_x86_64-gcc3/libGwtDevPlugin.so", "public": true },
+    { "path": "Darwin-gcc3/gwtDev.plugin", "public": true }
   ]
 }
diff --git a/plugins/npapi/prebuilt/gwtdmp.crx b/plugins/npapi/prebuilt/gwtdmp.crx
deleted file mode 100644
index 8f236b7..0000000
--- a/plugins/npapi/prebuilt/gwtdmp.crx
+++ /dev/null
Binary files differ