move default plugin out of samples into modules/plugin. b=360955 rs=jst
authorJosh Aas <joshmoz@gmail.com>
Tue, 02 Sep 2008 12:57:44 -0400
changeset 18584 e0ba7e02de21047e104c769d99966e1ccb1952ed
parent 18583 8dccd2cf32d2991c38a9a1d8a493d2ff6cbaa578
child 18585 7cb4260db3966a7d29538f9e862eed0ef0430773
push id1666
push userjosh@mozilla.com
push dateTue, 02 Sep 2008 16:58:07 +0000
treeherdermozilla-central@e0ba7e02de21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs360955
milestone1.9.1b1pre
move default plugin out of samples into modules/plugin. b=360955 rs=jst
modules/plugin/Makefile.in
modules/plugin/default/mac/DefaultPlugin.xcodeproj/project.pbxproj
modules/plugin/default/mac/DefaultPluginPrefix.h
modules/plugin/default/mac/English.lproj/InfoPlist.strings
modules/plugin/default/mac/Info-DefaultPlugin.plist
modules/plugin/default/mac/Makefile.in
modules/plugin/default/mac/NullPlugin.cpp
modules/plugin/default/mac/NullPlugin.rsrc
modules/plugin/default/mac/npmac.cpp
modules/plugin/default/mac/npnul.pkg
modules/plugin/default/os2/Makefile.in
modules/plugin/default/os2/dbg.cpp
modules/plugin/default/os2/dbg.h
modules/plugin/default/os2/dialogs.cpp
modules/plugin/default/os2/dialogs.h
modules/plugin/default/os2/maindll.cpp
modules/plugin/default/os2/npnul.pkg
modules/plugin/default/os2/npnulos2.h
modules/plugin/default/os2/npnulos2.ico
modules/plugin/default/os2/npnulos2.rc
modules/plugin/default/os2/npos2.cpp
modules/plugin/default/os2/npshell.cpp
modules/plugin/default/os2/plugin.cpp
modules/plugin/default/os2/plugin.h
modules/plugin/default/os2/utils.cpp
modules/plugin/default/os2/utils.h
modules/plugin/default/unix/Makefile.in
modules/plugin/default/unix/npnul.pkg
modules/plugin/default/unix/npshell.c
modules/plugin/default/unix/npunix.c
modules/plugin/default/unix/nullplugin.c
modules/plugin/default/unix/nullplugin.h
modules/plugin/default/windows/Makefile.in
modules/plugin/default/windows/Npnul32.dsp
modules/plugin/default/windows/dbg.cpp
modules/plugin/default/windows/dbg.h
modules/plugin/default/windows/dialogs.cpp
modules/plugin/default/windows/dialogs.h
modules/plugin/default/windows/maindll.cpp
modules/plugin/default/windows/npnul.pkg
modules/plugin/default/windows/npnul32.def
modules/plugin/default/windows/npnul32.dsw
modules/plugin/default/windows/npnul32.rc
modules/plugin/default/windows/npshell.cpp
modules/plugin/default/windows/npwin.cpp
modules/plugin/default/windows/plugicon.ico
modules/plugin/default/windows/plugin.cpp
modules/plugin/default/windows/plugin.h
modules/plugin/default/windows/resource.h
modules/plugin/default/windows/utils.cpp
modules/plugin/default/windows/utils.h
modules/plugin/samples/default/mac/DefaultPlugin.xcodeproj/project.pbxproj
modules/plugin/samples/default/mac/DefaultPluginPrefix.h
modules/plugin/samples/default/mac/English.lproj/InfoPlist.strings
modules/plugin/samples/default/mac/Info-DefaultPlugin.plist
modules/plugin/samples/default/mac/Makefile.in
modules/plugin/samples/default/mac/NullPlugin.cpp
modules/plugin/samples/default/mac/NullPlugin.rsrc
modules/plugin/samples/default/mac/npmac.cpp
modules/plugin/samples/default/mac/npnul.pkg
modules/plugin/samples/default/os2/Makefile.in
modules/plugin/samples/default/os2/dbg.cpp
modules/plugin/samples/default/os2/dbg.h
modules/plugin/samples/default/os2/dialogs.cpp
modules/plugin/samples/default/os2/dialogs.h
modules/plugin/samples/default/os2/maindll.cpp
modules/plugin/samples/default/os2/npnul.pkg
modules/plugin/samples/default/os2/npnulos2.h
modules/plugin/samples/default/os2/npnulos2.ico
modules/plugin/samples/default/os2/npnulos2.rc
modules/plugin/samples/default/os2/npos2.cpp
modules/plugin/samples/default/os2/npshell.cpp
modules/plugin/samples/default/os2/plugin.cpp
modules/plugin/samples/default/os2/plugin.h
modules/plugin/samples/default/os2/utils.cpp
modules/plugin/samples/default/os2/utils.h
modules/plugin/samples/default/unix/Makefile.in
modules/plugin/samples/default/unix/npnul.pkg
modules/plugin/samples/default/unix/npshell.c
modules/plugin/samples/default/unix/npunix.c
modules/plugin/samples/default/unix/nullplugin.c
modules/plugin/samples/default/unix/nullplugin.h
modules/plugin/samples/default/windows/Makefile.in
modules/plugin/samples/default/windows/Npnul32.dsp
modules/plugin/samples/default/windows/dbg.cpp
modules/plugin/samples/default/windows/dbg.h
modules/plugin/samples/default/windows/dialogs.cpp
modules/plugin/samples/default/windows/dialogs.h
modules/plugin/samples/default/windows/maindll.cpp
modules/plugin/samples/default/windows/npnul.pkg
modules/plugin/samples/default/windows/npnul32.def
modules/plugin/samples/default/windows/npnul32.dsw
modules/plugin/samples/default/windows/npnul32.rc
modules/plugin/samples/default/windows/npshell.cpp
modules/plugin/samples/default/windows/npwin.cpp
modules/plugin/samples/default/windows/plugicon.ico
modules/plugin/samples/default/windows/plugin.cpp
modules/plugin/samples/default/windows/plugin.h
modules/plugin/samples/default/windows/resource.h
modules/plugin/samples/default/windows/utils.cpp
modules/plugin/samples/default/windows/utils.h
toolkit/toolkit-makefiles.sh
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -44,43 +44,43 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
 
 DIRS		= base/public 
 
 ifdef MOZ_PLUGINS
 DIRS		+= base/src 
 
-ifneq (,$(filter gtk2 ,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 TOOL_DIRS += samples/unixprinting
 endif
 
 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds
 
 ifdef MOZ_ENABLE_GTK2
-TOOL_DIRS += samples/default/unix
+TOOL_DIRS += default/unix
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-TOOL_DIRS += samples/default/windows
+TOOL_DIRS += default/windows
 endif
 
 ifeq ($(OS_ARCH),OS2)
-TOOL_DIRS += samples/default/os2
+TOOL_DIRS += default/os2
 ifdef MOZ_OJI
 TOOL_DIRS += os2wrapper
 endif
 ifdef ENABLE_TESTS
 TOOL_DIRS += tools/tester/common tools/tester/os2
 endif
 endif
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-TOOL_DIRS += samples/default/mac
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+TOOL_DIRS += default/mac
 endif
 
 ifdef ENABLE_TESTS
 ifneq (,$(filter WINNT Darwin Linux,$(OS_ARCH)))
 TOOL_DIRS += tools/sdk
 endif
 endif
 
rename from modules/plugin/samples/default/mac/DefaultPlugin.xcodeproj/project.pbxproj
rename to modules/plugin/default/mac/DefaultPlugin.xcodeproj/project.pbxproj
--- a/modules/plugin/samples/default/mac/DefaultPlugin.xcodeproj/project.pbxproj
+++ b/modules/plugin/default/mac/DefaultPlugin.xcodeproj/project.pbxproj
@@ -27,17 +27,17 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
 		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		0F64AF2C0433C8A200A96652 /* DefaultPluginPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultPluginPrefix.h; sourceTree = "<group>"; };
-		4D1684AC0830226300080847 /* Info-DefaultPlugin.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-DefaultPlugin.plist"; sourceTree = "<group>"; };
+		4D1684AC0830226300080847 /* Info-DefaultPlugin.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-DefaultPlugin.plist"; sourceTree = "<group>"; };
 		4D1684AD0830226300080847 /* Default Plugin.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Default Plugin.plugin"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F5A7D3AB036E359F01A96660 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
 		F5E0C34D036A12DF01A96660 /* NullPlugin.rsrc */ = {isa = PBXFileReference; lastKnownFileType = archive.rsrc; path = NullPlugin.rsrc; sourceTree = SOURCE_ROOT; };
 		F5E0C34F036A130901A96660 /* NullPlugin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NullPlugin.cpp; sourceTree = SOURCE_ROOT; };
 		F5E0C351036A130E01A96660 /* npmac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = npmac.cpp; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -209,32 +209,31 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREFIX_HEADER = DefaultPluginPrefix.h;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"XP_MACOSX=1",
 					"NO_X11=1",
 					"USE_SYSTEM_CONSOLE=1",
 				);
 				HEADER_SEARCH_PATHS = (
-					../../../../../dist/sdk/xpcom/include,
-					../../../../../dist/include/caps,
-					../../../../../dist/include/java,
-					../../../../../dist/include/js,
-					../../../../../dist/include/nspr,
-					../../../../../dist/include/nspr/obsolete,
-					../../../../../dist/include/oji,
-					../../../../../dist/include/plugin,
-					../../../../../dist/include/xpcom,
-					../../../../../dist/include/xpconnect,
-					../../../../../dist/include,
+					../../../../dist/sdk/xpcom/include,
+					../../../../dist/include/caps,
+					../../../../dist/include/java,
+					../../../../dist/include/js,
+					../../../../dist/include/nspr,
+					../../../../dist/include/nspr/obsolete,
+					../../../../dist/include/oji,
+					../../../../dist/include/plugin,
+					../../../../dist/include/xpcom,
+					../../../../dist/include/xpconnect,
+					../../../../dist/include,
 					/Developer/Headers/FlatCarbon,
 				);
 				INFOPLIST_FILE = "Info-DefaultPlugin.plist";
 				LIBRARY_SEARCH_PATHS = /usr/lib;
-				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = "Default Plugin";
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
rename from modules/plugin/samples/default/mac/DefaultPluginPrefix.h
rename to modules/plugin/default/mac/DefaultPluginPrefix.h
rename from modules/plugin/samples/default/mac/English.lproj/InfoPlist.strings
rename to modules/plugin/default/mac/English.lproj/InfoPlist.strings
rename from modules/plugin/samples/default/mac/Info-DefaultPlugin.plist
rename to modules/plugin/default/mac/Info-DefaultPlugin.plist
rename from modules/plugin/samples/default/mac/Makefile.in
rename to modules/plugin/default/mac/Makefile.in
--- a/modules/plugin/samples/default/mac/Makefile.in
+++ b/modules/plugin/default/mac/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 MODULE      = plugin
rename from modules/plugin/samples/default/mac/NullPlugin.cpp
rename to modules/plugin/default/mac/NullPlugin.cpp
rename from modules/plugin/samples/default/mac/NullPlugin.rsrc
rename to modules/plugin/default/mac/NullPlugin.rsrc
rename from modules/plugin/samples/default/mac/npmac.cpp
rename to modules/plugin/default/mac/npmac.cpp
rename from modules/plugin/samples/default/mac/npnul.pkg
rename to modules/plugin/default/mac/npnul.pkg
rename from modules/plugin/samples/default/os2/Makefile.in
rename to modules/plugin/default/os2/Makefile.in
--- a/modules/plugin/samples/default/os2/Makefile.in
+++ b/modules/plugin/default/os2/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
 LIBRARY_NAME	= npnulos2
rename from modules/plugin/samples/default/os2/dbg.cpp
rename to modules/plugin/default/os2/dbg.cpp
rename from modules/plugin/samples/default/os2/dbg.h
rename to modules/plugin/default/os2/dbg.h
rename from modules/plugin/samples/default/os2/dialogs.cpp
rename to modules/plugin/default/os2/dialogs.cpp
rename from modules/plugin/samples/default/os2/dialogs.h
rename to modules/plugin/default/os2/dialogs.h
rename from modules/plugin/samples/default/os2/maindll.cpp
rename to modules/plugin/default/os2/maindll.cpp
rename from modules/plugin/samples/default/os2/npnul.pkg
rename to modules/plugin/default/os2/npnul.pkg
rename from modules/plugin/samples/default/os2/npnulos2.h
rename to modules/plugin/default/os2/npnulos2.h
rename from modules/plugin/samples/default/os2/npnulos2.ico
rename to modules/plugin/default/os2/npnulos2.ico
rename from modules/plugin/samples/default/os2/npnulos2.rc
rename to modules/plugin/default/os2/npnulos2.rc
rename from modules/plugin/samples/default/os2/npos2.cpp
rename to modules/plugin/default/os2/npos2.cpp
rename from modules/plugin/samples/default/os2/npshell.cpp
rename to modules/plugin/default/os2/npshell.cpp
rename from modules/plugin/samples/default/os2/plugin.cpp
rename to modules/plugin/default/os2/plugin.cpp
rename from modules/plugin/samples/default/os2/plugin.h
rename to modules/plugin/default/os2/plugin.h
rename from modules/plugin/samples/default/os2/utils.cpp
rename to modules/plugin/default/os2/utils.cpp
rename from modules/plugin/samples/default/os2/utils.h
rename to modules/plugin/default/os2/utils.h
rename from modules/plugin/samples/default/unix/Makefile.in
rename to modules/plugin/default/unix/Makefile.in
--- a/modules/plugin/samples/default/unix/Makefile.in
+++ b/modules/plugin/default/unix/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = plugin
 LIBRARY_NAME = nullplugin
rename from modules/plugin/samples/default/unix/npnul.pkg
rename to modules/plugin/default/unix/npnul.pkg
rename from modules/plugin/samples/default/unix/npshell.c
rename to modules/plugin/default/unix/npshell.c
rename from modules/plugin/samples/default/unix/npunix.c
rename to modules/plugin/default/unix/npunix.c
rename from modules/plugin/samples/default/unix/nullplugin.c
rename to modules/plugin/default/unix/nullplugin.c
rename from modules/plugin/samples/default/unix/nullplugin.h
rename to modules/plugin/default/unix/nullplugin.h
rename from modules/plugin/samples/default/windows/Makefile.in
rename to modules/plugin/default/windows/Makefile.in
--- a/modules/plugin/samples/default/windows/Makefile.in
+++ b/modules/plugin/default/windows/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
 LIBRARY_NAME	= npnul32
rename from modules/plugin/samples/default/windows/Npnul32.dsp
rename to modules/plugin/default/windows/Npnul32.dsp
rename from modules/plugin/samples/default/windows/dbg.cpp
rename to modules/plugin/default/windows/dbg.cpp
rename from modules/plugin/samples/default/windows/dbg.h
rename to modules/plugin/default/windows/dbg.h
rename from modules/plugin/samples/default/windows/dialogs.cpp
rename to modules/plugin/default/windows/dialogs.cpp
rename from modules/plugin/samples/default/windows/dialogs.h
rename to modules/plugin/default/windows/dialogs.h
rename from modules/plugin/samples/default/windows/maindll.cpp
rename to modules/plugin/default/windows/maindll.cpp
rename from modules/plugin/samples/default/windows/npnul.pkg
rename to modules/plugin/default/windows/npnul.pkg
rename from modules/plugin/samples/default/windows/npnul32.def
rename to modules/plugin/default/windows/npnul32.def
rename from modules/plugin/samples/default/windows/npnul32.dsw
rename to modules/plugin/default/windows/npnul32.dsw
rename from modules/plugin/samples/default/windows/npnul32.rc
rename to modules/plugin/default/windows/npnul32.rc
rename from modules/plugin/samples/default/windows/npshell.cpp
rename to modules/plugin/default/windows/npshell.cpp
rename from modules/plugin/samples/default/windows/npwin.cpp
rename to modules/plugin/default/windows/npwin.cpp
rename from modules/plugin/samples/default/windows/plugicon.ico
rename to modules/plugin/default/windows/plugicon.ico
rename from modules/plugin/samples/default/windows/plugin.cpp
rename to modules/plugin/default/windows/plugin.cpp
rename from modules/plugin/samples/default/windows/plugin.h
rename to modules/plugin/default/windows/plugin.h
rename from modules/plugin/samples/default/windows/resource.h
rename to modules/plugin/default/windows/resource.h
rename from modules/plugin/samples/default/windows/utils.cpp
rename to modules/plugin/default/windows/utils.cpp
rename from modules/plugin/samples/default/windows/utils.h
rename to modules/plugin/default/windows/utils.h
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -338,17 +338,17 @@ MAKEFILES_oji="
 "
 
 MAKEFILES_plugin="
   modules/plugin/Makefile
   modules/plugin/base/src/Makefile
   modules/plugin/base/public/Makefile
   modules/plugin/samples/simple/Makefile
   modules/plugin/samples/SanePlugin/Makefile
-  modules/plugin/samples/default/unix/Makefile
+  modules/plugin/default/unix/Makefile
   modules/plugin/tools/sdk/Makefile
   modules/plugin/tools/sdk/samples/Makefile
   modules/plugin/tools/sdk/samples/common/Makefile
   modules/plugin/tools/sdk/samples/basic/windows/Makefile
   modules/plugin/tools/sdk/samples/scriptable/windows/Makefile
   modules/plugin/tools/sdk/samples/simple/Makefile
   modules/plugin/tools/sdk/samples/winless/windows/Makefile
 "