Backed out changeset 70946e64e8f8 (bug 1005704) because it caused bug 1006541
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 06 May 2014 16:39:39 -0400
changeset 181857 e8fe87fc906b18a04075aefd6dd9cb1202624790
parent 181856 eaefe44c50e2a7d61cd50540ef595efe0b8b2e6f
child 181858 44dc4cab616d0b77efb318aa20207507c36a38c6
push id26738
push usercbook@mozilla.com
push dateWed, 07 May 2014 12:08:22 +0000
treeherdermozilla-central@14194fb0cba0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1005704, 1006541
milestone32.0a1
backs out70946e64e8f8f2bf654c2bb5268ead3440c1b3ae
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 70946e64e8f8 (bug 1005704) because it caused bug 1006541
config/rules.mk
dom/indexedDB/test/extensions/Makefile.in
dom/workers/test/extensions/bootstrap/Makefile.in
dom/workers/test/extensions/traditional/Makefile.in
startupcache/test/Makefile.in
tools/quitter/Makefile.in
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1300,22 +1300,16 @@ endif
 endif
 
 ifneq ($(DIST_FILES),)
 DIST_FILES_PATH := $(FINAL_TARGET)
 DIST_FILES_FLAGS := $(XULAPP_DEFINES)
 PP_TARGETS += DIST_FILES
 endif
 
-ifneq ($(DIST_FILES_NO_PP),)
-_DIST_FILES := $(DIST_FILES_NO_PP)
-_DIST_DEST := $(FINAL_TARGET)
-INSTALL_TARGETS += _DIST
-endif
-
 ifneq ($(XPI_PKGNAME),)
 tools realchrome::
 ifdef STRIP_XPI
 ifndef MOZ_DEBUG
 	@echo 'Stripping $(XPI_PKGNAME) package directory...'
 	@echo $(FINAL_TARGET)
 	@cd $(FINAL_TARGET) && find . ! -type d \
 			! -name '*.js' \
--- a/dom/indexedDB/test/extensions/Makefile.in
+++ b/dom/indexedDB/test/extensions/Makefile.in
@@ -1,20 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_FILES = \
+  bootstrap.js \
   install.rdf \
   $(NULL)
 
-DIST_FILES_NO_PP = \
-  bootstrap.js \
-  $(NULL)
-
 TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
 
 GENERATED_DIRS = $(TEST_EXTENSIONS_DIR)
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	@(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - $(XPI_NAME)) | (cd $(TEST_EXTENSIONS_DIR) && tar -xf -)
--- a/dom/workers/test/extensions/bootstrap/Makefile.in
+++ b/dom/workers/test/extensions/bootstrap/Makefile.in
@@ -1,18 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_FILES = \
+  bootstrap.js \
   install.rdf \
-  $(NULL)
-
-DIST_FILES_NO_PP = \
-  bootstrap.js \
   worker.js \
   $(NULL)
 
 TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
 
 GENERATED_DIRS = $(TEST_EXTENSIONS_DIR)
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/workers/test/extensions/traditional/Makefile.in
+++ b/dom/workers/test/extensions/traditional/Makefile.in
@@ -1,17 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_FILES = \
   install.rdf \
-  $(NULL)
-
-DIST_FILES_NO_PP = \
   worker.js \
   $(NULL)
 
 TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
 
 GENERATED_DIRS = $(TEST_EXTENSIONS_DIR)
 
 include $(topsrcdir)/config/rules.mk
--- a/startupcache/test/Makefile.in
+++ b/startupcache/test/Makefile.in
@@ -1,10 +1,10 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LIBS += $(MOZ_COMPONENT_LIBS)
-DIST_FILES_NO_PP += \
+DIST_FILES += \
   $(srcdir)/TestStartupCacheTelemetry.manifest \
   $(srcdir)/TestStartupCacheTelemetry.js \
   $(NULL)
--- a/tools/quitter/Makefile.in
+++ b/tools/quitter/Makefile.in
@@ -3,16 +3,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPI_PKGNAME = quitter@mozilla.org
 NO_JS_MANIFEST = 1
 
 DIST_FILES = \
   install.rdf \
-  $(NULL)
-
-DIST_FILES_NO_PP = \
   chrome.manifest \
   $(NULL)
 
 # Used in install.rdf
 USE_EXTENSION_MANIFEST=1