From 59f482ee5f829090c1a718a67f2cde36b048ba13 Mon Sep 17 00:00:00 2001 From: "philringnalda%gmail.com" Date: Mon, 12 Mar 2007 17:25:01 +0000 Subject: [PATCH] Bug 370475: Make building layout-debug deterministic, r=gavin git-svn-id: svn://10.0.0.236/trunk@221782 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/Makefile.in | 2 +- mozilla/browser/extensions/Makefile.in | 49 -------------- .../extensions/layout-debug/Makefile.in | 45 ------------- .../layout-debug/content/contents.rdf | 66 ------------------ .../content/layoutdebug-overlay.xul | 67 ------------------- .../browser/extensions/layout-debug/jar.mn | 3 - 6 files changed, 1 insertion(+), 231 deletions(-) delete mode 100644 mozilla/browser/extensions/Makefile.in delete mode 100644 mozilla/browser/extensions/layout-debug/Makefile.in delete mode 100644 mozilla/browser/extensions/layout-debug/content/contents.rdf delete mode 100644 mozilla/browser/extensions/layout-debug/content/layoutdebug-overlay.xul delete mode 100644 mozilla/browser/extensions/layout-debug/jar.mn diff --git a/mozilla/browser/Makefile.in b/mozilla/browser/Makefile.in index 280431d8395..f18f908eefd 100644 --- a/mozilla/browser/Makefile.in +++ b/mozilla/browser/Makefile.in @@ -42,7 +42,7 @@ VPATH = @srcdir@ include $(topsrcdir)/config/config.mk -DIRS = base components locales extensions themes app +DIRS = base components locales themes app include $(topsrcdir)/config/rules.mk diff --git a/mozilla/browser/extensions/Makefile.in b/mozilla/browser/extensions/Makefile.in deleted file mode 100644 index d1aedf8f24f..00000000000 --- a/mozilla/browser/extensions/Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ -# ***** 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 the Mozilla Browser code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 2002 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Brian Ryner -# -# 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 - -ifneq (,$(findstring layout-debug,$(MOZ_EXTENSIONS))) -DIRS += layout-debug -endif - -include $(topsrcdir)/config/rules.mk diff --git a/mozilla/browser/extensions/layout-debug/Makefile.in b/mozilla/browser/extensions/layout-debug/Makefile.in deleted file mode 100644 index 4502b21079c..00000000000 --- a/mozilla/browser/extensions/layout-debug/Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -# -# ***** 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 mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# 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 - -include $(topsrcdir)/config/rules.mk diff --git a/mozilla/browser/extensions/layout-debug/content/contents.rdf b/mozilla/browser/extensions/layout-debug/content/contents.rdf deleted file mode 100644 index 5b0ab5c7e4e..00000000000 --- a/mozilla/browser/extensions/layout-debug/content/contents.rdf +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - chrome://layoutdebug/content/layoutdebug-overlay.xul - - diff --git a/mozilla/browser/extensions/layout-debug/content/layoutdebug-overlay.xul b/mozilla/browser/extensions/layout-debug/content/layoutdebug-overlay.xul deleted file mode 100644 index c5d4e382fb8..00000000000 --- a/mozilla/browser/extensions/layout-debug/content/layoutdebug-overlay.xul +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/mozilla/browser/extensions/layout-debug/jar.mn b/mozilla/browser/extensions/layout-debug/jar.mn deleted file mode 100644 index defc41e9ca3..00000000000 --- a/mozilla/browser/extensions/layout-debug/jar.mn +++ /dev/null @@ -1,3 +0,0 @@ -layoutdebug.jar: -+ content/layoutdebug/contents.rdf (content/contents.rdf) -+ content/layoutdebug/layoutdebug-overlay.xul (content/layoutdebug-overlay.xul)