Bug 1244997 - Remove TOOLKIT_EM_VERSION from toolkit/xre/Makefile.in. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 02 Feb 2016 14:10:06 +0900
changeset 282754 9aa4890029d7b0806080ef62418eee568aa6fbfc
parent 282753 04d23831d95086bea5382d56131bc021cfcf9683
child 282755 617af7c95a2cf62c0a8fd7fae84fca4f3145c00c
push id71301
push usermh@glandium.org
push dateTue, 02 Feb 2016 23:44:35 +0000
treeherdermozilla-inbound@82adb48a15e7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1244997, 383167, 543150
milestone47.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 1244997 - Remove TOOLKIT_EM_VERSION from toolkit/xre/Makefile.in. r=mshal Bug 383167 made it obsolete 8.5 years ago, and while bug 543150 kind of backed it out, it used GRE_MILESTONE instead of TOOLKIT_EM_VERSION.
toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -7,23 +7,16 @@
 
 USE_RCS_MK=1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
 milestone_txt = $(topsrcdir)/config/milestone.txt
 
 include $(topsrcdir)/config/rules.mk
 
-# Should version be optional or required ?
-TOOLKIT_EM_VERSION=$(shell $(PYTHON) $(topsrcdir)/python/mozbuild/mozbuild/milestone.py --topsrcdir=$(topsrcdir))
-$(call warnIfEmpty,TOOLKIT_EM_VERSION)
-
-# Valid if null: {warn,error}IfEmpty
-DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"'
-
 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node}\n' 2>/dev/null))
 ifdef MOZ_SOURCE_STAMP
 
   INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)
 
   ifdef MOZ_INCLUDE_SOURCE_INFO
     source_repo := $(call getSourceRepo)