put all sample plugins into the npapi sdk. b=360955 rs=jst
authorJosh Aas <joshmoz@gmail.com>
Tue, 02 Sep 2008 14:51:32 -0400
changeset 18592 3edde1d2de9fa6095e90ab05dd53d9bc65c246be
parent 18591 a7d7009ae3bbab36000a398840c4baab6ffcbf3c
child 18593 afbfd319b025b7858e1e7d434075f3ccb4ba72f2
push idunknown
push userunknown
push dateunknown
reviewersjst
bugs360955
milestone1.9.1b1pre
put all sample plugins into the npapi sdk. b=360955 rs=jst
modules/plugin/Makefile.in
modules/plugin/samples/4x-scriptable/acmeIScriptObject.idl
modules/plugin/samples/4x-scriptable/doc.html
modules/plugin/samples/4x-scriptable/makefile.win
modules/plugin/samples/4x-scriptable/np4xscr.def
modules/plugin/samples/4x-scriptable/np4xscr.rc
modules/plugin/samples/4x-scriptable/np_entry.cpp
modules/plugin/samples/4x-scriptable/npmac.cpp
modules/plugin/samples/4x-scriptable/npn_gate.cpp
modules/plugin/samples/4x-scriptable/npp_gate.cpp
modules/plugin/samples/4x-scriptable/nsI4xScriptablePlugin.idl
modules/plugin/samples/4x-scriptable/nsScriptablePeer.cpp
modules/plugin/samples/4x-scriptable/nsScriptablePeer.h
modules/plugin/samples/4x-scriptable/nsScriptablePeer1.cpp
modules/plugin/samples/4x-scriptable/nsScriptablePeer1.h
modules/plugin/samples/4x-scriptable/plugin.cpp
modules/plugin/samples/4x-scriptable/plugin.h
modules/plugin/samples/4x-scriptable/readme.txt
modules/plugin/samples/4x-scriptable/resource.h
modules/plugin/samples/4x-scriptable/script-test.html
modules/plugin/samples/4x-scriptable/test.html
modules/plugin/samples/SanePlugin/Makefile.in
modules/plugin/samples/SanePlugin/README
modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
modules/plugin/samples/SanePlugin/nsSanePlugin.h
modules/plugin/samples/SanePlugin/nsSanePluginControl.idl
modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
modules/plugin/samples/SanePlugin/nsSanePluginFactory.h
modules/plugin/samples/SanePlugin/nsSanePlugin_CID.h
modules/plugin/samples/SanePlugin/test/camera.html
modules/plugin/samples/SanePlugin/test/scanner.html
modules/plugin/samples/npruntime/Makefile.in
modules/plugin/samples/npruntime/np_entry.cpp
modules/plugin/samples/npruntime/npn_gate.cpp
modules/plugin/samples/npruntime/npp_gate.cpp
modules/plugin/samples/npruntime/nprt.def
modules/plugin/samples/npruntime/nprt.rc
modules/plugin/samples/npruntime/plugin.cpp
modules/plugin/samples/npruntime/plugin.h
modules/plugin/samples/npruntime/resource.h
modules/plugin/samples/npruntime/test.html
modules/plugin/samples/npthread/windows/action.cpp
modules/plugin/samples/npthread/windows/action.h
modules/plugin/samples/npthread/windows/dbg.cpp
modules/plugin/samples/npthread/windows/dbg.h
modules/plugin/samples/npthread/windows/np_entry.cpp
modules/plugin/samples/npthread/windows/npn_gate.cpp
modules/plugin/samples/npthread/windows/npp_gate.cpp
modules/plugin/samples/npthread/windows/npthread.def
modules/plugin/samples/npthread/windows/npthread.dsp
modules/plugin/samples/npthread/windows/npthread.dsw
modules/plugin/samples/npthread/windows/npthread.rc
modules/plugin/samples/npthread/windows/plugin.cpp
modules/plugin/samples/npthread/windows/plugin.h
modules/plugin/samples/npthread/windows/plugload.cpp
modules/plugin/samples/npthread/windows/plugload.h
modules/plugin/samples/npthread/windows/readme.txt
modules/plugin/samples/npthread/windows/resource.h
modules/plugin/samples/npthread/windows/thread.cpp
modules/plugin/samples/npthread/windows/thread.h
modules/plugin/samples/testevents/Makefile
modules/plugin/samples/testevents/Makefile.in
modules/plugin/samples/testevents/README.txt
modules/plugin/samples/testevents/SimpleEventsTest.html
modules/plugin/samples/testevents/npevents.cpp
modules/plugin/samples/testevents/nsIEventsPluginInstance.idl
modules/plugin/samples/unixprinting/Makefile.in
modules/plugin/samples/unixprinting/npprint.pkg
modules/plugin/samples/unixprinting/npshell.c
modules/plugin/samples/unixprinting/npunix.c
modules/plugin/samples/unixprinting/printplugin.c
modules/plugin/samples/unixprinting/printplugin.h
modules/plugin/samples/unixprinting/unixprintplugin_test1.html
modules/plugin/samples/unixprinting/unixprintplugin_test2.html
modules/plugin/sdk/samples/4x-scriptable/acmeIScriptObject.idl
modules/plugin/sdk/samples/4x-scriptable/doc.html
modules/plugin/sdk/samples/4x-scriptable/makefile.win
modules/plugin/sdk/samples/4x-scriptable/np4xscr.def
modules/plugin/sdk/samples/4x-scriptable/np4xscr.rc
modules/plugin/sdk/samples/4x-scriptable/np_entry.cpp
modules/plugin/sdk/samples/4x-scriptable/npmac.cpp
modules/plugin/sdk/samples/4x-scriptable/npn_gate.cpp
modules/plugin/sdk/samples/4x-scriptable/npp_gate.cpp
modules/plugin/sdk/samples/4x-scriptable/nsI4xScriptablePlugin.idl
modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer.cpp
modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer.h
modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer1.cpp
modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer1.h
modules/plugin/sdk/samples/4x-scriptable/plugin.cpp
modules/plugin/sdk/samples/4x-scriptable/plugin.h
modules/plugin/sdk/samples/4x-scriptable/readme.txt
modules/plugin/sdk/samples/4x-scriptable/resource.h
modules/plugin/sdk/samples/4x-scriptable/script-test.html
modules/plugin/sdk/samples/4x-scriptable/test.html
modules/plugin/sdk/samples/SanePlugin/Makefile.in
modules/plugin/sdk/samples/SanePlugin/README
modules/plugin/sdk/samples/SanePlugin/nsSanePlugin.cpp
modules/plugin/sdk/samples/SanePlugin/nsSanePlugin.h
modules/plugin/sdk/samples/SanePlugin/nsSanePluginControl.idl
modules/plugin/sdk/samples/SanePlugin/nsSanePluginFactory.cpp
modules/plugin/sdk/samples/SanePlugin/nsSanePluginFactory.h
modules/plugin/sdk/samples/SanePlugin/nsSanePlugin_CID.h
modules/plugin/sdk/samples/SanePlugin/test/camera.html
modules/plugin/sdk/samples/SanePlugin/test/scanner.html
modules/plugin/sdk/samples/npruntime/Makefile.in
modules/plugin/sdk/samples/npruntime/np_entry.cpp
modules/plugin/sdk/samples/npruntime/npn_gate.cpp
modules/plugin/sdk/samples/npruntime/npp_gate.cpp
modules/plugin/sdk/samples/npruntime/nprt.def
modules/plugin/sdk/samples/npruntime/nprt.rc
modules/plugin/sdk/samples/npruntime/plugin.cpp
modules/plugin/sdk/samples/npruntime/plugin.h
modules/plugin/sdk/samples/npruntime/resource.h
modules/plugin/sdk/samples/npruntime/test.html
modules/plugin/sdk/samples/npthread/windows/action.cpp
modules/plugin/sdk/samples/npthread/windows/action.h
modules/plugin/sdk/samples/npthread/windows/dbg.cpp
modules/plugin/sdk/samples/npthread/windows/dbg.h
modules/plugin/sdk/samples/npthread/windows/np_entry.cpp
modules/plugin/sdk/samples/npthread/windows/npn_gate.cpp
modules/plugin/sdk/samples/npthread/windows/npp_gate.cpp
modules/plugin/sdk/samples/npthread/windows/npthread.def
modules/plugin/sdk/samples/npthread/windows/npthread.dsp
modules/plugin/sdk/samples/npthread/windows/npthread.dsw
modules/plugin/sdk/samples/npthread/windows/npthread.rc
modules/plugin/sdk/samples/npthread/windows/plugin.cpp
modules/plugin/sdk/samples/npthread/windows/plugin.h
modules/plugin/sdk/samples/npthread/windows/plugload.cpp
modules/plugin/sdk/samples/npthread/windows/plugload.h
modules/plugin/sdk/samples/npthread/windows/readme.txt
modules/plugin/sdk/samples/npthread/windows/resource.h
modules/plugin/sdk/samples/npthread/windows/thread.cpp
modules/plugin/sdk/samples/npthread/windows/thread.h
modules/plugin/sdk/samples/testevents/Makefile
modules/plugin/sdk/samples/testevents/Makefile.in
modules/plugin/sdk/samples/testevents/README.txt
modules/plugin/sdk/samples/testevents/SimpleEventsTest.html
modules/plugin/sdk/samples/testevents/npevents.cpp
modules/plugin/sdk/samples/testevents/nsIEventsPluginInstance.idl
modules/plugin/sdk/samples/unixprinting/Makefile.in
modules/plugin/sdk/samples/unixprinting/npprint.pkg
modules/plugin/sdk/samples/unixprinting/npshell.c
modules/plugin/sdk/samples/unixprinting/npunix.c
modules/plugin/sdk/samples/unixprinting/printplugin.c
modules/plugin/sdk/samples/unixprinting/printplugin.h
modules/plugin/sdk/samples/unixprinting/unixprintplugin_test1.html
modules/plugin/sdk/samples/unixprinting/unixprintplugin_test2.html
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -45,17 +45,17 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= plugin
 
 DIRS		= base/public 
 
 ifdef MOZ_PLUGINS
 DIRS		+= base/src 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-TOOL_DIRS += samples/unixprinting
+TOOL_DIRS += sdk/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 += default/unix
 endif
rename from modules/plugin/samples/4x-scriptable/acmeIScriptObject.idl
rename to modules/plugin/sdk/samples/4x-scriptable/acmeIScriptObject.idl
rename from modules/plugin/samples/4x-scriptable/doc.html
rename to modules/plugin/sdk/samples/4x-scriptable/doc.html
rename from modules/plugin/samples/4x-scriptable/makefile.win
rename to modules/plugin/sdk/samples/4x-scriptable/makefile.win
rename from modules/plugin/samples/4x-scriptable/np4xscr.def
rename to modules/plugin/sdk/samples/4x-scriptable/np4xscr.def
rename from modules/plugin/samples/4x-scriptable/np4xscr.rc
rename to modules/plugin/sdk/samples/4x-scriptable/np4xscr.rc
rename from modules/plugin/samples/4x-scriptable/np_entry.cpp
rename to modules/plugin/sdk/samples/4x-scriptable/np_entry.cpp
rename from modules/plugin/samples/4x-scriptable/npmac.cpp
rename to modules/plugin/sdk/samples/4x-scriptable/npmac.cpp
rename from modules/plugin/samples/4x-scriptable/npn_gate.cpp
rename to modules/plugin/sdk/samples/4x-scriptable/npn_gate.cpp
rename from modules/plugin/samples/4x-scriptable/npp_gate.cpp
rename to modules/plugin/sdk/samples/4x-scriptable/npp_gate.cpp
rename from modules/plugin/samples/4x-scriptable/nsI4xScriptablePlugin.idl
rename to modules/plugin/sdk/samples/4x-scriptable/nsI4xScriptablePlugin.idl
rename from modules/plugin/samples/4x-scriptable/nsScriptablePeer.cpp
rename to modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer.cpp
rename from modules/plugin/samples/4x-scriptable/nsScriptablePeer.h
rename to modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer.h
rename from modules/plugin/samples/4x-scriptable/nsScriptablePeer1.cpp
rename to modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer1.cpp
rename from modules/plugin/samples/4x-scriptable/nsScriptablePeer1.h
rename to modules/plugin/sdk/samples/4x-scriptable/nsScriptablePeer1.h
rename from modules/plugin/samples/4x-scriptable/plugin.cpp
rename to modules/plugin/sdk/samples/4x-scriptable/plugin.cpp
rename from modules/plugin/samples/4x-scriptable/plugin.h
rename to modules/plugin/sdk/samples/4x-scriptable/plugin.h
rename from modules/plugin/samples/4x-scriptable/readme.txt
rename to modules/plugin/sdk/samples/4x-scriptable/readme.txt
rename from modules/plugin/samples/4x-scriptable/resource.h
rename to modules/plugin/sdk/samples/4x-scriptable/resource.h
rename from modules/plugin/samples/4x-scriptable/script-test.html
rename to modules/plugin/sdk/samples/4x-scriptable/script-test.html
rename from modules/plugin/samples/4x-scriptable/test.html
rename to modules/plugin/sdk/samples/4x-scriptable/test.html
rename from modules/plugin/samples/SanePlugin/Makefile.in
rename to modules/plugin/sdk/samples/SanePlugin/Makefile.in
rename from modules/plugin/samples/SanePlugin/README
rename to modules/plugin/sdk/samples/SanePlugin/README
rename from modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
rename to modules/plugin/sdk/samples/SanePlugin/nsSanePlugin.cpp
rename from modules/plugin/samples/SanePlugin/nsSanePlugin.h
rename to modules/plugin/sdk/samples/SanePlugin/nsSanePlugin.h
rename from modules/plugin/samples/SanePlugin/nsSanePluginControl.idl
rename to modules/plugin/sdk/samples/SanePlugin/nsSanePluginControl.idl
rename from modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
rename to modules/plugin/sdk/samples/SanePlugin/nsSanePluginFactory.cpp
rename from modules/plugin/samples/SanePlugin/nsSanePluginFactory.h
rename to modules/plugin/sdk/samples/SanePlugin/nsSanePluginFactory.h
rename from modules/plugin/samples/SanePlugin/nsSanePlugin_CID.h
rename to modules/plugin/sdk/samples/SanePlugin/nsSanePlugin_CID.h
rename from modules/plugin/samples/SanePlugin/test/camera.html
rename to modules/plugin/sdk/samples/SanePlugin/test/camera.html
rename from modules/plugin/samples/SanePlugin/test/scanner.html
rename to modules/plugin/sdk/samples/SanePlugin/test/scanner.html
rename from modules/plugin/samples/npruntime/Makefile.in
rename to modules/plugin/sdk/samples/npruntime/Makefile.in
--- a/modules/plugin/samples/npruntime/Makefile.in
+++ b/modules/plugin/sdk/samples/npruntime/Makefile.in
@@ -10,17 +10,17 @@
 ## IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
 ## implied. See the License for the specific language governing
 ## rights and limitations under the License.
 ## Contributor(s): 
 ##
 ##   Rusty Lynch <rusty.lynch@intel.com>
 ############################################################################
 
-DEPTH		= ../../../..
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
 LIBRARY_NAME	= nprt
rename from modules/plugin/samples/npruntime/np_entry.cpp
rename to modules/plugin/sdk/samples/npruntime/np_entry.cpp
rename from modules/plugin/samples/npruntime/npn_gate.cpp
rename to modules/plugin/sdk/samples/npruntime/npn_gate.cpp
rename from modules/plugin/samples/npruntime/npp_gate.cpp
rename to modules/plugin/sdk/samples/npruntime/npp_gate.cpp
rename from modules/plugin/samples/npruntime/nprt.def
rename to modules/plugin/sdk/samples/npruntime/nprt.def
rename from modules/plugin/samples/npruntime/nprt.rc
rename to modules/plugin/sdk/samples/npruntime/nprt.rc
rename from modules/plugin/samples/npruntime/plugin.cpp
rename to modules/plugin/sdk/samples/npruntime/plugin.cpp
rename from modules/plugin/samples/npruntime/plugin.h
rename to modules/plugin/sdk/samples/npruntime/plugin.h
rename from modules/plugin/samples/npruntime/resource.h
rename to modules/plugin/sdk/samples/npruntime/resource.h
rename from modules/plugin/samples/npruntime/test.html
rename to modules/plugin/sdk/samples/npruntime/test.html
rename from modules/plugin/samples/npthread/windows/action.cpp
rename to modules/plugin/sdk/samples/npthread/windows/action.cpp
rename from modules/plugin/samples/npthread/windows/action.h
rename to modules/plugin/sdk/samples/npthread/windows/action.h
rename from modules/plugin/samples/npthread/windows/dbg.cpp
rename to modules/plugin/sdk/samples/npthread/windows/dbg.cpp
rename from modules/plugin/samples/npthread/windows/dbg.h
rename to modules/plugin/sdk/samples/npthread/windows/dbg.h
rename from modules/plugin/samples/npthread/windows/np_entry.cpp
rename to modules/plugin/sdk/samples/npthread/windows/np_entry.cpp
rename from modules/plugin/samples/npthread/windows/npn_gate.cpp
rename to modules/plugin/sdk/samples/npthread/windows/npn_gate.cpp
rename from modules/plugin/samples/npthread/windows/npp_gate.cpp
rename to modules/plugin/sdk/samples/npthread/windows/npp_gate.cpp
rename from modules/plugin/samples/npthread/windows/npthread.def
rename to modules/plugin/sdk/samples/npthread/windows/npthread.def
rename from modules/plugin/samples/npthread/windows/npthread.dsp
rename to modules/plugin/sdk/samples/npthread/windows/npthread.dsp
rename from modules/plugin/samples/npthread/windows/npthread.dsw
rename to modules/plugin/sdk/samples/npthread/windows/npthread.dsw
rename from modules/plugin/samples/npthread/windows/npthread.rc
rename to modules/plugin/sdk/samples/npthread/windows/npthread.rc
rename from modules/plugin/samples/npthread/windows/plugin.cpp
rename to modules/plugin/sdk/samples/npthread/windows/plugin.cpp
rename from modules/plugin/samples/npthread/windows/plugin.h
rename to modules/plugin/sdk/samples/npthread/windows/plugin.h
rename from modules/plugin/samples/npthread/windows/plugload.cpp
rename to modules/plugin/sdk/samples/npthread/windows/plugload.cpp
rename from modules/plugin/samples/npthread/windows/plugload.h
rename to modules/plugin/sdk/samples/npthread/windows/plugload.h
rename from modules/plugin/samples/npthread/windows/readme.txt
rename to modules/plugin/sdk/samples/npthread/windows/readme.txt
rename from modules/plugin/samples/npthread/windows/resource.h
rename to modules/plugin/sdk/samples/npthread/windows/resource.h
rename from modules/plugin/samples/npthread/windows/thread.cpp
rename to modules/plugin/sdk/samples/npthread/windows/thread.cpp
rename from modules/plugin/samples/npthread/windows/thread.h
rename to modules/plugin/sdk/samples/npthread/windows/thread.h
rename from modules/plugin/samples/testevents/Makefile
rename to modules/plugin/sdk/samples/testevents/Makefile
rename from modules/plugin/samples/testevents/Makefile.in
rename to modules/plugin/sdk/samples/testevents/Makefile.in
rename from modules/plugin/samples/testevents/README.txt
rename to modules/plugin/sdk/samples/testevents/README.txt
rename from modules/plugin/samples/testevents/SimpleEventsTest.html
rename to modules/plugin/sdk/samples/testevents/SimpleEventsTest.html
rename from modules/plugin/samples/testevents/npevents.cpp
rename to modules/plugin/sdk/samples/testevents/npevents.cpp
rename from modules/plugin/samples/testevents/nsIEventsPluginInstance.idl
rename to modules/plugin/sdk/samples/testevents/nsIEventsPluginInstance.idl
rename from modules/plugin/samples/unixprinting/Makefile.in
rename to modules/plugin/sdk/samples/unixprinting/Makefile.in
--- a/modules/plugin/samples/unixprinting/Makefile.in
+++ b/modules/plugin/sdk/samples/unixprinting/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 = unixprintplugin
rename from modules/plugin/samples/unixprinting/npprint.pkg
rename to modules/plugin/sdk/samples/unixprinting/npprint.pkg
rename from modules/plugin/samples/unixprinting/npshell.c
rename to modules/plugin/sdk/samples/unixprinting/npshell.c
rename from modules/plugin/samples/unixprinting/npunix.c
rename to modules/plugin/sdk/samples/unixprinting/npunix.c
rename from modules/plugin/samples/unixprinting/printplugin.c
rename to modules/plugin/sdk/samples/unixprinting/printplugin.c
rename from modules/plugin/samples/unixprinting/printplugin.h
rename to modules/plugin/sdk/samples/unixprinting/printplugin.h
rename from modules/plugin/samples/unixprinting/unixprintplugin_test1.html
rename to modules/plugin/sdk/samples/unixprinting/unixprintplugin_test1.html
rename from modules/plugin/samples/unixprinting/unixprintplugin_test2.html
rename to modules/plugin/sdk/samples/unixprinting/unixprintplugin_test2.html