Bug 1261479 - Remove remaining USE_RCS_MK usage; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Fri, 01 Apr 2016 14:45:58 -0400
changeset 291770 6944634621fc034106a0065a9ccc95a69dfba938
parent 291769 01301f098c43a7871515538df52a0e3b2ae9dbfa
child 291771 0a748d0eca440791c26eb3ec549a15486753dcc0
push id30146
push usercbook@mozilla.com
push dateWed, 06 Apr 2016 09:56:58 +0000
treeherdermozilla-central@05ce1f2670ae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1261479
milestone48.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 1261479 - Remove remaining USE_RCS_MK usage; r=chmanchester MozReview-Commit-ID: 4T5IVg1SUHk
build/Makefile.in
toolkit/mozapps/installer/package-name.mk
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -1,16 +1,13 @@
 #
 # 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/.
 
-USE_RCS_MK := 1
-include $(topsrcdir)/config/makefiles/makeutils.mk
-
 ifdef MOZ_APP_BASENAME
 APP_INI_DEPS = $(topsrcdir)/config/milestone.txt
 
 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
 endif
 
 ifdef MOZTTDIR
 # Install the Firefox OS fonts.
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -146,21 +146,16 @@ TALOS_PACKAGE = $(PKG_BASENAME).talos.te
 GTEST_PACKAGE = $(PKG_BASENAME).gtest.tests.zip
 
 ifneq (,$(wildcard $(DIST)/bin/application.ini))
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
 else
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
 endif
 
-ifndef INCLUDED_RCS_MK
-  USE_RCS_MK := 1
-  include $(MOZILLA_DIR)/config/makefiles/makeutils.mk
-endif
-
 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
 MOZ_BUILDID_INFO_TXT_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME)_info.txt
 MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json
 MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).test_packages.json
 
 # JavaScript Shell
 ifdef MOZ_SIMPLE_PACKAGE_NAME