Bug 674879 - Move Scratchpad to browser/devtools; r=gavin.sharp,mihai.sucan
authorRob Campbell <rcampbell@mozilla.com>
Tue, 02 Aug 2011 11:11:32 -0300
changeset 74520 327bd5e0d8043aacfaccd177b142eb3306e8227b
parent 74519 0d0395cb99ff140ae2e2386aaf0f4e0384096cbb
child 74521 a8c39fc1b57b33f9d127a0afe06b96b54c907e14
push idunknown
push userunknown
push dateunknown
reviewersgavin.sharp, mihai.sucan
bugs674879
milestone8.0a1
Bug 674879 - Move Scratchpad to browser/devtools; r=gavin.sharp,mihai.sucan
browser/base/content/scratchpad.js
browser/base/content/scratchpad.xul
browser/base/content/test/Makefile.in
browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
browser/base/content/test/browser_scratchpad_bug_660560_tab.js
browser/base/content/test/browser_scratchpad_contexts.js
browser/base/content/test/browser_scratchpad_execute_print.js
browser/base/content/test/browser_scratchpad_files.js
browser/base/content/test/browser_scratchpad_initialization.js
browser/base/content/test/browser_scratchpad_inspect.js
browser/base/content/test/browser_scratchpad_tab_switch.js
browser/base/content/test/browser_scratchpad_ui.js
browser/base/jar.mn
browser/devtools/Makefile.in
browser/devtools/jar.mn
browser/devtools/scratchpad/Makefile.in
browser/devtools/scratchpad/scratchpad.js
browser/devtools/scratchpad/scratchpad.xul
browser/devtools/scratchpad/test/Makefile.in
browser/devtools/scratchpad/test/browser_scratchpad_bug_646070_chrome_context_pref.js
browser/devtools/scratchpad/test/browser_scratchpad_bug_660560_tab.js
browser/devtools/scratchpad/test/browser_scratchpad_contexts.js
browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js
browser/devtools/scratchpad/test/browser_scratchpad_files.js
browser/devtools/scratchpad/test/browser_scratchpad_initialization.js
browser/devtools/scratchpad/test/browser_scratchpad_inspect.js
browser/devtools/scratchpad/test/browser_scratchpad_tab_switch.js
browser/devtools/scratchpad/test/browser_scratchpad_ui.js
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -182,25 +182,16 @@ endif
                  browser_ctrlTab.js \
                  browser_customize_popupNotification.js \
                  browser_disablechrome.js \
                  browser_discovery.js \
                  browser_duplicateIDs.js \
                  browser_gestureSupport.js \
                  browser_getshortcutoruri.js \
                  browser_hide_removing.js \
-                 browser_scratchpad_initialization.js \
-                 browser_scratchpad_contexts.js \
-                 browser_scratchpad_tab_switch.js \
-                 browser_scratchpad_execute_print.js \
-                 browser_scratchpad_inspect.js \
-                 browser_scratchpad_files.js \
-                 browser_scratchpad_ui.js \
-                 browser_scratchpad_bug_646070_chrome_context_pref.js \
-                 browser_scratchpad_bug_660560_tab.js \
                  browser_overflowScroll.js \
                  browser_locationBarExternalLoad.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
                  browser_pinnedTabs.js \
                  browser_plainTextLinks.js \
                  browser_pluginnotification.js \
                  browser_relatedTabs.js \
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -27,18 +27,16 @@ browser.jar:
         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
 *       content/browser/browser.css                   (content/browser.css)
 *       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/content.js                    (content/content.js)
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
 *       content/browser/inspector.html                (content/inspector.html)
-*       content/browser/scratchpad.xul                (content/scratchpad.xul)
-*       content/browser/scratchpad.js                 (content/scratchpad.js)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
 *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
 *       content/browser/pageinfo/pageInfo.xml         (content/pageinfo/pageInfo.xml)
 *       content/browser/pageinfo/feeds.js             (content/pageinfo/feeds.js)
 *       content/browser/pageinfo/feeds.xml            (content/pageinfo/feeds.xml)
 *       content/browser/pageinfo/permissions.js       (content/pageinfo/permissions.js)
 *       content/browser/pageinfo/security.js          (content/pageinfo/security.js)
--- a/browser/devtools/Makefile.in
+++ b/browser/devtools/Makefile.in
@@ -42,15 +42,16 @@ srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
 DIRS = \
   webconsole \
+  scratchpad \
   $(NULL)
 
 ifdef ENABLE_TESTS
 # DIRS += test # no tests yet
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -1,2 +1,4 @@
 browser.jar:
     content/browser/NetworkPanel.xhtml            (webconsole/NetworkPanel.xhtml)
+*   content/browser/scratchpad.xul                (scratchpad/scratchpad.xul)
+*   content/browser/scratchpad.js                 (scratchpad/scratchpad.js)
new file mode 100644
--- /dev/null
+++ b/browser/devtools/scratchpad/Makefile.in
@@ -0,0 +1,52 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS 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.
+#
+# The Original Code is  HUDService code.
+#
+# The Initial Developer of the Original Code is Mozilla Corporation.
+# 
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Rob Campbell <rcampbell@mozilla.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# 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		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifdef ENABLE_TESTS
+ifneq (mobile,$(MOZ_BUILD_APP))
+	DIRS += test
+endif
+endif
+
+include $(topsrcdir)/config/rules.mk
rename from browser/base/content/scratchpad.js
rename to browser/devtools/scratchpad/scratchpad.js
rename from browser/base/content/scratchpad.xul
rename to browser/devtools/scratchpad/scratchpad.xul
new file mode 100644
--- /dev/null
+++ b/browser/devtools/scratchpad/test/Makefile.in
@@ -0,0 +1,58 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS 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.
+#
+# The Original Code is HUD test code.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Rob Campbell <rcampbell@mozilla.com> (Original Author)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# 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			= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH			= @srcdir@
+relativesrcdir  = browser/devtools/scratchpad/test
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+_BROWSER_TEST_FILES = \
+		browser_scratchpad_initialization.js \
+		browser_scratchpad_contexts.js \
+		browser_scratchpad_tab_switch.js \
+		browser_scratchpad_execute_print.js \
+		browser_scratchpad_inspect.js \
+		browser_scratchpad_files.js \
+		browser_scratchpad_ui.js \
+		browser_scratchpad_bug_646070_chrome_context_pref.js \
+		browser_scratchpad_bug_660560_tab.js \
+
+libs:: $(_BROWSER_TEST_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
rename from browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_bug_646070_chrome_context_pref.js
rename from browser/base/content/test/browser_scratchpad_bug_660560_tab.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_bug_660560_tab.js
rename from browser/base/content/test/browser_scratchpad_contexts.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_contexts.js
rename from browser/base/content/test/browser_scratchpad_execute_print.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js
rename from browser/base/content/test/browser_scratchpad_files.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_files.js
rename from browser/base/content/test/browser_scratchpad_initialization.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_initialization.js
rename from browser/base/content/test/browser_scratchpad_inspect.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_inspect.js
rename from browser/base/content/test/browser_scratchpad_tab_switch.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_tab_switch.js
rename from browser/base/content/test/browser_scratchpad_ui.js
rename to browser/devtools/scratchpad/test/browser_scratchpad_ui.js