move npapi sdk up a directory, b=360955 rs=jst
authorJosh Aas <joshmoz@gmail.com>
Tue, 02 Sep 2008 14:05:34 -0400
changeset 18590 d6547392f44c4dbfef4cb9422baf44cca0af53e1
parent 18589 80f6aef4bb9929813cc68b08ff955310ed5d17c2
child 18591 a7d7009ae3bbab36000a398840c4baab6ffcbf3c
push idunknown
push userunknown
push dateunknown
reviewersjst
bugs360955
milestone1.9.1b1pre
move npapi sdk up a directory, b=360955 rs=jst
modules/plugin/Makefile.in
modules/plugin/sdk/Makefile.in
modules/plugin/sdk/readme.txt
modules/plugin/sdk/samples/Makefile.in
modules/plugin/sdk/samples/basic/mac/Basic Plugin.mcp
modules/plugin/sdk/samples/basic/mac/Basic Plugin.xml
modules/plugin/sdk/samples/basic/mac/Basic.rsrc
modules/plugin/sdk/samples/basic/mac/plugin.cpp
modules/plugin/sdk/samples/basic/mac/plugin.h
modules/plugin/sdk/samples/basic/mac/pluginCarbonPrefix.h
modules/plugin/sdk/samples/basic/mac/pluginPrefix.h
modules/plugin/sdk/samples/basic/test.html
modules/plugin/sdk/samples/basic/unix/Makefile.in
modules/plugin/sdk/samples/basic/unix/plugin.cpp
modules/plugin/sdk/samples/basic/unix/plugin.h
modules/plugin/sdk/samples/basic/windows/Makefile.in
modules/plugin/sdk/samples/basic/windows/basic.def
modules/plugin/sdk/samples/basic/windows/basic.rc
modules/plugin/sdk/samples/basic/windows/npbasic.dsp
modules/plugin/sdk/samples/basic/windows/npbasic.dsw
modules/plugin/sdk/samples/basic/windows/plugin.cpp
modules/plugin/sdk/samples/basic/windows/plugin.h
modules/plugin/sdk/samples/basic/windows/resource.h
modules/plugin/sdk/samples/common/Makefile.in
modules/plugin/sdk/samples/common/np_entry.cpp
modules/plugin/sdk/samples/common/npn_gate.cpp
modules/plugin/sdk/samples/common/npp_gate.cpp
modules/plugin/sdk/samples/include/npplat.h
modules/plugin/sdk/samples/include/pluginbase.h
modules/plugin/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
modules/plugin/sdk/samples/scriptable/mac/Scriptable Plugin.xml
modules/plugin/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
modules/plugin/sdk/samples/scriptable/mac/Scriptable PluginIDL.xml
modules/plugin/sdk/samples/scriptable/mac/Scriptable.rsrc
modules/plugin/sdk/samples/scriptable/mac/nsIScriptablePluginSample.idl
modules/plugin/sdk/samples/scriptable/mac/nsScriptablePeer.cpp
modules/plugin/sdk/samples/scriptable/mac/nsScriptablePeer.h
modules/plugin/sdk/samples/scriptable/mac/plugin.cpp
modules/plugin/sdk/samples/scriptable/mac/plugin.h
modules/plugin/sdk/samples/scriptable/mac/pluginCarbonPrefix.h
modules/plugin/sdk/samples/scriptable/mac/pluginPrefix.h
modules/plugin/sdk/samples/scriptable/test.html
modules/plugin/sdk/samples/scriptable/unix/Makefile.in
modules/plugin/sdk/samples/scriptable/unix/nsIScriptablePluginSample.idl
modules/plugin/sdk/samples/scriptable/unix/nsScriptablePeer.cpp
modules/plugin/sdk/samples/scriptable/unix/nsScriptablePeer.h
modules/plugin/sdk/samples/scriptable/unix/plugin.cpp
modules/plugin/sdk/samples/scriptable/unix/plugin.h
modules/plugin/sdk/samples/scriptable/windows/Makefile.in
modules/plugin/sdk/samples/scriptable/windows/npscriptable.def
modules/plugin/sdk/samples/scriptable/windows/npscriptable.dsp
modules/plugin/sdk/samples/scriptable/windows/npscriptable.dsw
modules/plugin/sdk/samples/scriptable/windows/npscriptable.rc
modules/plugin/sdk/samples/scriptable/windows/nsIScriptablePluginSample.idl
modules/plugin/sdk/samples/scriptable/windows/nsScriptablePeer.cpp
modules/plugin/sdk/samples/scriptable/windows/nsScriptablePeer.h
modules/plugin/sdk/samples/scriptable/windows/plugin.cpp
modules/plugin/sdk/samples/scriptable/windows/plugin.h
modules/plugin/sdk/samples/scriptable/windows/readme.txt
modules/plugin/sdk/samples/scriptable/windows/resource.h
modules/plugin/sdk/samples/simple/Makefile.in
modules/plugin/sdk/samples/simple/npsimple.def
modules/plugin/sdk/samples/simple/npsimple.dsp
modules/plugin/sdk/samples/simple/npsimple.dsw
modules/plugin/sdk/samples/simple/npsimple.rc
modules/plugin/sdk/samples/simple/nsISimplePlugin.idl
modules/plugin/sdk/samples/simple/nsScriptablePeer.cpp
modules/plugin/sdk/samples/simple/nsScriptablePeer.h
modules/plugin/sdk/samples/simple/plugin.cpp
modules/plugin/sdk/samples/simple/plugin.h
modules/plugin/sdk/samples/simple/readme.txt
modules/plugin/sdk/samples/simple/resource.h
modules/plugin/sdk/samples/simple/test.html
modules/plugin/sdk/samples/winless/test.html
modules/plugin/sdk/samples/winless/windows/Makefile.in
modules/plugin/sdk/samples/winless/windows/npwinless.def
modules/plugin/sdk/samples/winless/windows/npwinless.dsp
modules/plugin/sdk/samples/winless/windows/npwinless.dsw
modules/plugin/sdk/samples/winless/windows/npwinless.rc
modules/plugin/sdk/samples/winless/windows/plugin.cpp
modules/plugin/sdk/samples/winless/windows/plugin.h
modules/plugin/sdk/samples/winless/windows/resource.h
modules/plugin/tools/sdk/Makefile.in
modules/plugin/tools/sdk/readme.txt
modules/plugin/tools/sdk/samples/Makefile.in
modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp
modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.xml
modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc
modules/plugin/tools/sdk/samples/basic/mac/plugin.cpp
modules/plugin/tools/sdk/samples/basic/mac/plugin.h
modules/plugin/tools/sdk/samples/basic/mac/pluginCarbonPrefix.h
modules/plugin/tools/sdk/samples/basic/mac/pluginPrefix.h
modules/plugin/tools/sdk/samples/basic/test.html
modules/plugin/tools/sdk/samples/basic/unix/Makefile.in
modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp
modules/plugin/tools/sdk/samples/basic/unix/plugin.h
modules/plugin/tools/sdk/samples/basic/windows/Makefile.in
modules/plugin/tools/sdk/samples/basic/windows/basic.def
modules/plugin/tools/sdk/samples/basic/windows/basic.rc
modules/plugin/tools/sdk/samples/basic/windows/npbasic.dsp
modules/plugin/tools/sdk/samples/basic/windows/npbasic.dsw
modules/plugin/tools/sdk/samples/basic/windows/plugin.cpp
modules/plugin/tools/sdk/samples/basic/windows/plugin.h
modules/plugin/tools/sdk/samples/basic/windows/resource.h
modules/plugin/tools/sdk/samples/common/Makefile.in
modules/plugin/tools/sdk/samples/common/np_entry.cpp
modules/plugin/tools/sdk/samples/common/npn_gate.cpp
modules/plugin/tools/sdk/samples/common/npp_gate.cpp
modules/plugin/tools/sdk/samples/include/npplat.h
modules/plugin/tools/sdk/samples/include/pluginbase.h
modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.xml
modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.xml
modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc
modules/plugin/tools/sdk/samples/scriptable/mac/nsIScriptablePluginSample.idl
modules/plugin/tools/sdk/samples/scriptable/mac/nsScriptablePeer.cpp
modules/plugin/tools/sdk/samples/scriptable/mac/nsScriptablePeer.h
modules/plugin/tools/sdk/samples/scriptable/mac/plugin.cpp
modules/plugin/tools/sdk/samples/scriptable/mac/plugin.h
modules/plugin/tools/sdk/samples/scriptable/mac/pluginCarbonPrefix.h
modules/plugin/tools/sdk/samples/scriptable/mac/pluginPrefix.h
modules/plugin/tools/sdk/samples/scriptable/test.html
modules/plugin/tools/sdk/samples/scriptable/unix/Makefile.in
modules/plugin/tools/sdk/samples/scriptable/unix/nsIScriptablePluginSample.idl
modules/plugin/tools/sdk/samples/scriptable/unix/nsScriptablePeer.cpp
modules/plugin/tools/sdk/samples/scriptable/unix/nsScriptablePeer.h
modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp
modules/plugin/tools/sdk/samples/scriptable/unix/plugin.h
modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in
modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.def
modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.dsp
modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.dsw
modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.rc
modules/plugin/tools/sdk/samples/scriptable/windows/nsIScriptablePluginSample.idl
modules/plugin/tools/sdk/samples/scriptable/windows/nsScriptablePeer.cpp
modules/plugin/tools/sdk/samples/scriptable/windows/nsScriptablePeer.h
modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp
modules/plugin/tools/sdk/samples/scriptable/windows/plugin.h
modules/plugin/tools/sdk/samples/scriptable/windows/readme.txt
modules/plugin/tools/sdk/samples/scriptable/windows/resource.h
modules/plugin/tools/sdk/samples/simple/Makefile.in
modules/plugin/tools/sdk/samples/simple/npsimple.def
modules/plugin/tools/sdk/samples/simple/npsimple.dsp
modules/plugin/tools/sdk/samples/simple/npsimple.dsw
modules/plugin/tools/sdk/samples/simple/npsimple.rc
modules/plugin/tools/sdk/samples/simple/nsISimplePlugin.idl
modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.cpp
modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.h
modules/plugin/tools/sdk/samples/simple/plugin.cpp
modules/plugin/tools/sdk/samples/simple/plugin.h
modules/plugin/tools/sdk/samples/simple/readme.txt
modules/plugin/tools/sdk/samples/simple/resource.h
modules/plugin/tools/sdk/samples/simple/test.html
modules/plugin/tools/sdk/samples/winless/test.html
modules/plugin/tools/sdk/samples/winless/windows/Makefile.in
modules/plugin/tools/sdk/samples/winless/windows/npwinless.def
modules/plugin/tools/sdk/samples/winless/windows/npwinless.dsp
modules/plugin/tools/sdk/samples/winless/windows/npwinless.dsw
modules/plugin/tools/sdk/samples/winless/windows/npwinless.rc
modules/plugin/tools/sdk/samples/winless/windows/plugin.cpp
modules/plugin/tools/sdk/samples/winless/windows/plugin.h
modules/plugin/tools/sdk/samples/winless/windows/resource.h
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -75,17 +75,17 @@ endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 TOOL_DIRS += default/mac
 endif
 
 ifdef ENABLE_TESTS
 ifneq (,$(filter WINNT Darwin Linux,$(OS_ARCH)))
-TOOL_DIRS += tools/sdk
+TOOL_DIRS += sdk
 endif
 endif
 
 endif # MOZ_PLUGINS
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_PLUGINS
rename from modules/plugin/tools/sdk/Makefile.in
rename to modules/plugin/sdk/Makefile.in
--- a/modules/plugin/tools/sdk/Makefile.in
+++ b/modules/plugin/sdk/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
 
 DIRS = samples
 
rename from modules/plugin/tools/sdk/readme.txt
rename to modules/plugin/sdk/readme.txt
rename from modules/plugin/tools/sdk/samples/Makefile.in
rename to modules/plugin/sdk/samples/Makefile.in
--- a/modules/plugin/tools/sdk/samples/Makefile.in
+++ b/modules/plugin/sdk/samples/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
 
 DIRS = common simple
 
rename from modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp
rename to modules/plugin/sdk/samples/basic/mac/Basic Plugin.mcp
rename from modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.xml
rename to modules/plugin/sdk/samples/basic/mac/Basic Plugin.xml
rename from modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc
rename to modules/plugin/sdk/samples/basic/mac/Basic.rsrc
rename from modules/plugin/tools/sdk/samples/basic/mac/plugin.cpp
rename to modules/plugin/sdk/samples/basic/mac/plugin.cpp
rename from modules/plugin/tools/sdk/samples/basic/mac/plugin.h
rename to modules/plugin/sdk/samples/basic/mac/plugin.h
rename from modules/plugin/tools/sdk/samples/basic/mac/pluginCarbonPrefix.h
rename to modules/plugin/sdk/samples/basic/mac/pluginCarbonPrefix.h
rename from modules/plugin/tools/sdk/samples/basic/mac/pluginPrefix.h
rename to modules/plugin/sdk/samples/basic/mac/pluginPrefix.h
rename from modules/plugin/tools/sdk/samples/basic/test.html
rename to modules/plugin/sdk/samples/basic/test.html
rename from modules/plugin/tools/sdk/samples/basic/unix/Makefile.in
rename to modules/plugin/sdk/samples/basic/unix/Makefile.in
--- a/modules/plugin/tools/sdk/samples/basic/unix/Makefile.in
+++ b/modules/plugin/sdk/samples/basic/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
 
 LIBRARY_NAME	= npSDKbasic
 
rename from modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp
rename to modules/plugin/sdk/samples/basic/unix/plugin.cpp
rename from modules/plugin/tools/sdk/samples/basic/unix/plugin.h
rename to modules/plugin/sdk/samples/basic/unix/plugin.h
rename from modules/plugin/tools/sdk/samples/basic/windows/Makefile.in
rename to modules/plugin/sdk/samples/basic/windows/Makefile.in
--- a/modules/plugin/tools/sdk/samples/basic/windows/Makefile.in
+++ b/modules/plugin/sdk/samples/basic/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
 
 XPIDL_MODULE = npbasic
 LIBRARY_NAME = npbasic
rename from modules/plugin/tools/sdk/samples/basic/windows/basic.def
rename to modules/plugin/sdk/samples/basic/windows/basic.def
rename from modules/plugin/tools/sdk/samples/basic/windows/basic.rc
rename to modules/plugin/sdk/samples/basic/windows/basic.rc
rename from modules/plugin/tools/sdk/samples/basic/windows/npbasic.dsp
rename to modules/plugin/sdk/samples/basic/windows/npbasic.dsp
rename from modules/plugin/tools/sdk/samples/basic/windows/npbasic.dsw
rename to modules/plugin/sdk/samples/basic/windows/npbasic.dsw
rename from modules/plugin/tools/sdk/samples/basic/windows/plugin.cpp
rename to modules/plugin/sdk/samples/basic/windows/plugin.cpp
rename from modules/plugin/tools/sdk/samples/basic/windows/plugin.h
rename to modules/plugin/sdk/samples/basic/windows/plugin.h
rename from modules/plugin/tools/sdk/samples/basic/windows/resource.h
rename to modules/plugin/sdk/samples/basic/windows/resource.h
rename from modules/plugin/tools/sdk/samples/common/Makefile.in
rename to modules/plugin/sdk/samples/common/Makefile.in
--- a/modules/plugin/tools/sdk/samples/common/Makefile.in
+++ b/modules/plugin/sdk/samples/common/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
 
 LIBRARY_NAME = plugingate_s
 
rename from modules/plugin/tools/sdk/samples/common/np_entry.cpp
rename to modules/plugin/sdk/samples/common/np_entry.cpp
rename from modules/plugin/tools/sdk/samples/common/npn_gate.cpp
rename to modules/plugin/sdk/samples/common/npn_gate.cpp
rename from modules/plugin/tools/sdk/samples/common/npp_gate.cpp
rename to modules/plugin/sdk/samples/common/npp_gate.cpp
rename from modules/plugin/tools/sdk/samples/include/npplat.h
rename to modules/plugin/sdk/samples/include/npplat.h
rename from modules/plugin/tools/sdk/samples/include/pluginbase.h
rename to modules/plugin/sdk/samples/include/pluginbase.h
rename from modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
rename to modules/plugin/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
rename from modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.xml
rename to modules/plugin/sdk/samples/scriptable/mac/Scriptable Plugin.xml
rename from modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
rename to modules/plugin/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
rename from modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.xml
rename to modules/plugin/sdk/samples/scriptable/mac/Scriptable PluginIDL.xml
rename from modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc
rename to modules/plugin/sdk/samples/scriptable/mac/Scriptable.rsrc
rename from modules/plugin/tools/sdk/samples/scriptable/mac/nsIScriptablePluginSample.idl
rename to modules/plugin/sdk/samples/scriptable/mac/nsIScriptablePluginSample.idl
rename from modules/plugin/tools/sdk/samples/scriptable/mac/nsScriptablePeer.cpp
rename to modules/plugin/sdk/samples/scriptable/mac/nsScriptablePeer.cpp
rename from modules/plugin/tools/sdk/samples/scriptable/mac/nsScriptablePeer.h
rename to modules/plugin/sdk/samples/scriptable/mac/nsScriptablePeer.h
rename from modules/plugin/tools/sdk/samples/scriptable/mac/plugin.cpp
rename to modules/plugin/sdk/samples/scriptable/mac/plugin.cpp
rename from modules/plugin/tools/sdk/samples/scriptable/mac/plugin.h
rename to modules/plugin/sdk/samples/scriptable/mac/plugin.h
rename from modules/plugin/tools/sdk/samples/scriptable/mac/pluginCarbonPrefix.h
rename to modules/plugin/sdk/samples/scriptable/mac/pluginCarbonPrefix.h
rename from modules/plugin/tools/sdk/samples/scriptable/mac/pluginPrefix.h
rename to modules/plugin/sdk/samples/scriptable/mac/pluginPrefix.h
rename from modules/plugin/tools/sdk/samples/scriptable/test.html
rename to modules/plugin/sdk/samples/scriptable/test.html
rename from modules/plugin/tools/sdk/samples/scriptable/unix/Makefile.in
rename to modules/plugin/sdk/samples/scriptable/unix/Makefile.in
--- a/modules/plugin/tools/sdk/samples/scriptable/unix/Makefile.in
+++ b/modules/plugin/sdk/samples/scriptable/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		= npSDKscriptable
 LIBRARY_NAME	= npSDKscriptable
rename from modules/plugin/tools/sdk/samples/scriptable/unix/nsIScriptablePluginSample.idl
rename to modules/plugin/sdk/samples/scriptable/unix/nsIScriptablePluginSample.idl
rename from modules/plugin/tools/sdk/samples/scriptable/unix/nsScriptablePeer.cpp
rename to modules/plugin/sdk/samples/scriptable/unix/nsScriptablePeer.cpp
rename from modules/plugin/tools/sdk/samples/scriptable/unix/nsScriptablePeer.h
rename to modules/plugin/sdk/samples/scriptable/unix/nsScriptablePeer.h
rename from modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp
rename to modules/plugin/sdk/samples/scriptable/unix/plugin.cpp
rename from modules/plugin/tools/sdk/samples/scriptable/unix/plugin.h
rename to modules/plugin/sdk/samples/scriptable/unix/plugin.h
rename from modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in
rename to modules/plugin/sdk/samples/scriptable/windows/Makefile.in
--- a/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in
+++ b/modules/plugin/sdk/samples/scriptable/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
 
 XPIDL_MODULE = npscriptable
 LIBRARY_NAME = npscriptable
rename from modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.def
rename to modules/plugin/sdk/samples/scriptable/windows/npscriptable.def
rename from modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.dsp
rename to modules/plugin/sdk/samples/scriptable/windows/npscriptable.dsp
rename from modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.dsw
rename to modules/plugin/sdk/samples/scriptable/windows/npscriptable.dsw
rename from modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.rc
rename to modules/plugin/sdk/samples/scriptable/windows/npscriptable.rc
rename from modules/plugin/tools/sdk/samples/scriptable/windows/nsIScriptablePluginSample.idl
rename to modules/plugin/sdk/samples/scriptable/windows/nsIScriptablePluginSample.idl
rename from modules/plugin/tools/sdk/samples/scriptable/windows/nsScriptablePeer.cpp
rename to modules/plugin/sdk/samples/scriptable/windows/nsScriptablePeer.cpp
rename from modules/plugin/tools/sdk/samples/scriptable/windows/nsScriptablePeer.h
rename to modules/plugin/sdk/samples/scriptable/windows/nsScriptablePeer.h
rename from modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp
rename to modules/plugin/sdk/samples/scriptable/windows/plugin.cpp
rename from modules/plugin/tools/sdk/samples/scriptable/windows/plugin.h
rename to modules/plugin/sdk/samples/scriptable/windows/plugin.h
rename from modules/plugin/tools/sdk/samples/scriptable/windows/readme.txt
rename to modules/plugin/sdk/samples/scriptable/windows/readme.txt
rename from modules/plugin/tools/sdk/samples/scriptable/windows/resource.h
rename to modules/plugin/sdk/samples/scriptable/windows/resource.h
rename from modules/plugin/tools/sdk/samples/simple/Makefile.in
rename to modules/plugin/sdk/samples/simple/Makefile.in
--- a/modules/plugin/tools/sdk/samples/simple/Makefile.in
+++ b/modules/plugin/sdk/samples/simple/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
 
 XPIDL_MODULE = npsimple
 LIBRARY_NAME = npsimple
rename from modules/plugin/tools/sdk/samples/simple/npsimple.def
rename to modules/plugin/sdk/samples/simple/npsimple.def
rename from modules/plugin/tools/sdk/samples/simple/npsimple.dsp
rename to modules/plugin/sdk/samples/simple/npsimple.dsp
rename from modules/plugin/tools/sdk/samples/simple/npsimple.dsw
rename to modules/plugin/sdk/samples/simple/npsimple.dsw
rename from modules/plugin/tools/sdk/samples/simple/npsimple.rc
rename to modules/plugin/sdk/samples/simple/npsimple.rc
rename from modules/plugin/tools/sdk/samples/simple/nsISimplePlugin.idl
rename to modules/plugin/sdk/samples/simple/nsISimplePlugin.idl
rename from modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.cpp
rename to modules/plugin/sdk/samples/simple/nsScriptablePeer.cpp
rename from modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.h
rename to modules/plugin/sdk/samples/simple/nsScriptablePeer.h
rename from modules/plugin/tools/sdk/samples/simple/plugin.cpp
rename to modules/plugin/sdk/samples/simple/plugin.cpp
rename from modules/plugin/tools/sdk/samples/simple/plugin.h
rename to modules/plugin/sdk/samples/simple/plugin.h
rename from modules/plugin/tools/sdk/samples/simple/readme.txt
rename to modules/plugin/sdk/samples/simple/readme.txt
rename from modules/plugin/tools/sdk/samples/simple/resource.h
rename to modules/plugin/sdk/samples/simple/resource.h
rename from modules/plugin/tools/sdk/samples/simple/test.html
rename to modules/plugin/sdk/samples/simple/test.html
rename from modules/plugin/tools/sdk/samples/winless/test.html
rename to modules/plugin/sdk/samples/winless/test.html
rename from modules/plugin/tools/sdk/samples/winless/windows/Makefile.in
rename to modules/plugin/sdk/samples/winless/windows/Makefile.in
--- a/modules/plugin/tools/sdk/samples/winless/windows/Makefile.in
+++ b/modules/plugin/sdk/samples/winless/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
 
 XPIDL_MODULE = npwinless
 LIBRARY_NAME = npwinless
rename from modules/plugin/tools/sdk/samples/winless/windows/npwinless.def
rename to modules/plugin/sdk/samples/winless/windows/npwinless.def
rename from modules/plugin/tools/sdk/samples/winless/windows/npwinless.dsp
rename to modules/plugin/sdk/samples/winless/windows/npwinless.dsp
rename from modules/plugin/tools/sdk/samples/winless/windows/npwinless.dsw
rename to modules/plugin/sdk/samples/winless/windows/npwinless.dsw
rename from modules/plugin/tools/sdk/samples/winless/windows/npwinless.rc
rename to modules/plugin/sdk/samples/winless/windows/npwinless.rc
rename from modules/plugin/tools/sdk/samples/winless/windows/plugin.cpp
rename to modules/plugin/sdk/samples/winless/windows/plugin.cpp
rename from modules/plugin/tools/sdk/samples/winless/windows/plugin.h
rename to modules/plugin/sdk/samples/winless/windows/plugin.h
rename from modules/plugin/tools/sdk/samples/winless/windows/resource.h
rename to modules/plugin/sdk/samples/winless/windows/resource.h