Bug 1005704 - Enable installing files dist files without preprocessing; r=mshal
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 05 May 2014 21:26:11 -0400
changeset 200910 70946e64e8f8f2bf654c2bb5268ead3440c1b3ae
parent 200909 038f364ab0297c06fb237265f0a9c48a46414809
child 200911 84df4dda7a43017dcc18ff7e95ba91e802a7eae9
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1005704
milestone32.0a1
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
Bug 1005704 - Enable installing files dist files without preprocessing; r=mshal
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,16 +1300,22 @@ 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 ($(DIST_CHROME_FILES),)
 DIST_CHROME_FILES_PATH := $(FINAL_TARGET)/chrome
 DIST_CHROME_FILES_FLAGS := $(XULAPP_DEFINES)
 PP_TARGETS += DIST_CHROME_FILES
 endif
 
 ifneq ($(XPI_PKGNAME),)
 tools realchrome::
--- a/dom/indexedDB/test/extensions/Makefile.in
+++ b/dom/indexedDB/test/extensions/Makefile.in
@@ -1,15 +1,18 @@
 # 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 = \
   bootstrap.js \
-  install.rdf \
   $(NULL)
 
 TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
 
 GENERATED_DIRS = $(TEST_EXTENSIONS_DIR)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/workers/test/extensions/bootstrap/Makefile.in
+++ b/dom/workers/test/extensions/bootstrap/Makefile.in
@@ -1,15 +1,18 @@
 # 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 = \
   bootstrap.js \
-  install.rdf \
   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,14 +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 = \
   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 += \
+DIST_FILES_NO_PP += \
   $(srcdir)/TestStartupCacheTelemetry.manifest \
   $(srcdir)/TestStartupCacheTelemetry.js \
   $(NULL)
--- a/tools/quitter/Makefile.in
+++ b/tools/quitter/Makefile.in
@@ -3,13 +3,16 @@
 # 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