From 016c24a8b79a6ad32bdaa83397d92c3e68ef2b47 Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Mon, 30 Jan 2012 18:50:40 -0600 Subject: [PATCH] Backout 561e1013aba0 for bustage on windows. --- dom/Makefile.in | 1 - dom/dom-config.mk | 1 - dom/power/Makefile.in | 61 -------------------------------------- dom/power/test/Makefile.in | 58 ------------------------------------ 4 files changed, 121 deletions(-) delete mode 100644 dom/power/Makefile.in delete mode 100644 dom/power/test/Makefile.in diff --git a/dom/Makefile.in b/dom/Makefile.in index d0a56b35e18..5ea49bab9c8 100644 --- a/dom/Makefile.in +++ b/dom/Makefile.in @@ -77,7 +77,6 @@ endif DIRS += \ base \ battery \ - power \ sms \ src \ locales \ diff --git a/dom/dom-config.mk b/dom/dom-config.mk index ac61255020c..710c69327c2 100644 --- a/dom/dom-config.mk +++ b/dom/dom-config.mk @@ -1,7 +1,6 @@ DOM_SRCDIRS = \ dom/base \ dom/battery \ - dom/power \ dom/network/src \ dom/sms/src \ dom/src/events \ diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in deleted file mode 100644 index ed5451cd1ae..00000000000 --- a/dom/power/Makefile.in +++ /dev/null @@ -1,61 +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 build system. -# -# The Initial Developer of the Original Code is Mozilla Foundation -# Portions created by the Initial Developer are Copyright (C) 2011 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Kan-Ru Chen (Original Author) -# -# 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 - -LIBRARY_NAME = dom_power_s -XPIDL_MODULE = dom_power -LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/dom/dom-config.mk - -CPPSRCS = \ - $(NULL) - -XPIDLSRCS = \ - $(NULL) - -ifdef ENABLE_TESTS -DIRS += test -endif - -include $(topsrcdir)/config/rules.mk diff --git a/dom/power/test/Makefile.in b/dom/power/test/Makefile.in deleted file mode 100644 index 90ce3fbc3ba..00000000000 --- a/dom/power/test/Makefile.in +++ /dev/null @@ -1,58 +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 build system. -# -# The Initial Developer of the Original Code is Mozilla Foundation -# Portions created by the Initial Developer are Copyright (C) 2011 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Kan-Ru Chen (Original Author) -# -# 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@ - -relativesrcdir = dom/power/test - -include $(DEPTH)/config/autoconf.mk - -DIRS = \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - -_TEST_FILES = \ - $(NULL) - -#libs:: $(_TEST_FILES) -# $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) - -#libs:: $(_CHROME_TEST_FILES) -# $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)