move default plugin out of samples into modules/plugin. b=360955 rs=jst

--HG--
rename : modules/plugin/samples/default/mac/DefaultPlugin.xcodeproj/project.pbxproj => modules/plugin/default/mac/DefaultPlugin.xcodeproj/project.pbxproj
rename : modules/plugin/samples/default/mac/DefaultPluginPrefix.h => modules/plugin/default/mac/DefaultPluginPrefix.h
rename : modules/plugin/samples/default/mac/English.lproj/InfoPlist.strings => modules/plugin/default/mac/English.lproj/InfoPlist.strings
rename : modules/plugin/samples/default/mac/Info-DefaultPlugin.plist => modules/plugin/default/mac/Info-DefaultPlugin.plist
rename : modules/plugin/samples/default/mac/Makefile.in => modules/plugin/default/mac/Makefile.in
rename : modules/plugin/samples/default/mac/NullPlugin.cpp => modules/plugin/default/mac/NullPlugin.cpp
rename : modules/plugin/samples/default/mac/NullPlugin.rsrc => modules/plugin/default/mac/NullPlugin.rsrc
rename : modules/plugin/samples/default/mac/npmac.cpp => modules/plugin/default/mac/npmac.cpp
rename : modules/plugin/samples/default/mac/npnul.pkg => modules/plugin/default/mac/npnul.pkg
rename : modules/plugin/samples/default/os2/Makefile.in => modules/plugin/default/os2/Makefile.in
rename : modules/plugin/samples/default/os2/dbg.cpp => modules/plugin/default/os2/dbg.cpp
rename : modules/plugin/samples/default/os2/dbg.h => modules/plugin/default/os2/dbg.h
rename : modules/plugin/samples/default/os2/dialogs.cpp => modules/plugin/default/os2/dialogs.cpp
rename : modules/plugin/samples/default/os2/dialogs.h => modules/plugin/default/os2/dialogs.h
rename : modules/plugin/samples/default/os2/maindll.cpp => modules/plugin/default/os2/maindll.cpp
rename : modules/plugin/samples/default/os2/npnul.pkg => modules/plugin/default/os2/npnul.pkg
rename : modules/plugin/samples/default/os2/npnulos2.h => modules/plugin/default/os2/npnulos2.h
rename : modules/plugin/samples/default/os2/npnulos2.ico => modules/plugin/default/os2/npnulos2.ico
rename : modules/plugin/samples/default/os2/npnulos2.rc => modules/plugin/default/os2/npnulos2.rc
rename : modules/plugin/samples/default/os2/npos2.cpp => modules/plugin/default/os2/npos2.cpp
rename : modules/plugin/samples/default/os2/npshell.cpp => modules/plugin/default/os2/npshell.cpp
rename : modules/plugin/samples/default/os2/plugin.cpp => modules/plugin/default/os2/plugin.cpp
rename : modules/plugin/samples/default/os2/plugin.h => modules/plugin/default/os2/plugin.h
rename : modules/plugin/samples/default/os2/utils.cpp => modules/plugin/default/os2/utils.cpp
rename : modules/plugin/samples/default/os2/utils.h => modules/plugin/default/os2/utils.h
rename : modules/plugin/samples/default/unix/Makefile.in => modules/plugin/default/unix/Makefile.in
rename : modules/plugin/samples/default/unix/npnul.pkg => modules/plugin/default/unix/npnul.pkg
rename : modules/plugin/samples/default/unix/npshell.c => modules/plugin/default/unix/npshell.c
rename : modules/plugin/samples/default/unix/npunix.c => modules/plugin/default/unix/npunix.c
rename : modules/plugin/samples/default/unix/nullplugin.c => modules/plugin/default/unix/nullplugin.c
rename : modules/plugin/samples/default/unix/nullplugin.h => modules/plugin/default/unix/nullplugin.h
rename : modules/plugin/samples/default/windows/Makefile.in => modules/plugin/default/windows/Makefile.in
rename : modules/plugin/samples/default/windows/Npnul32.dsp => modules/plugin/default/windows/Npnul32.dsp
rename : modules/plugin/samples/default/windows/dbg.cpp => modules/plugin/default/windows/dbg.cpp
rename : modules/plugin/samples/default/windows/dbg.h => modules/plugin/default/windows/dbg.h
rename : modules/plugin/samples/default/windows/dialogs.cpp => modules/plugin/default/windows/dialogs.cpp
rename : modules/plugin/samples/default/windows/dialogs.h => modules/plugin/default/windows/dialogs.h
rename : modules/plugin/samples/default/windows/maindll.cpp => modules/plugin/default/windows/maindll.cpp
rename : modules/plugin/samples/default/windows/npnul.pkg => modules/plugin/default/windows/npnul.pkg
rename : modules/plugin/samples/default/windows/npnul32.def => modules/plugin/default/windows/npnul32.def
rename : modules/plugin/samples/default/windows/npnul32.dsw => modules/plugin/default/windows/npnul32.dsw
rename : modules/plugin/samples/default/windows/npnul32.rc => modules/plugin/default/windows/npnul32.rc
rename : modules/plugin/samples/default/windows/npshell.cpp => modules/plugin/default/windows/npshell.cpp
rename : modules/plugin/samples/default/windows/npwin.cpp => modules/plugin/default/windows/npwin.cpp
rename : modules/plugin/samples/default/windows/plugicon.ico => modules/plugin/default/windows/plugicon.ico
rename : modules/plugin/samples/default/windows/plugin.cpp => modules/plugin/default/windows/plugin.cpp
rename : modules/plugin/samples/default/windows/plugin.h => modules/plugin/default/windows/plugin.h
rename : modules/plugin/samples/default/windows/resource.h => modules/plugin/default/windows/resource.h
rename : modules/plugin/samples/default/windows/utils.cpp => modules/plugin/default/windows/utils.cpp
rename : modules/plugin/samples/default/windows/utils.h => modules/plugin/default/windows/utils.h

modules/plugin/Makefile.in

@@ -49,7 +49,7 @@ 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
 
@@ -57,15 +57,15 @@ endif
 #  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
@@ -74,8 +74,8 @@ 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

modules/plugin/default/mac/DefaultPlugin.xcodeproj/project.pbxproj

@@ -32,7 +32,7 @@
 		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; };
@@ -214,22 +214,21 @@
 					"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 = "";

modules/plugin/default/mac/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

modules/plugin/default/os2/Makefile.in

@@ -36,7 +36,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

modules/plugin/default/unix/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

modules/plugin/default/windows/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

toolkit/toolkit-makefiles.sh

@@ -343,7 +343,7 @@ MAKEFILES_plugin="
   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