Backed out changeset cff5a22acb7c (bug 924992) for breaking upload_symbolds on Nightlies
authorEd Morley <emorley@mozilla.com>
Fri, 11 Oct 2013 17:49:25 +0100
changeset 164254 500765bd8dd9b772701c86c34e62948ec7f0eab5
parent 164253 6b101d4c6d241e3fa39b5ce71f122243fe2c118c
child 164297 342e9d40235aea91cb28a4e3a10e61ffe7b48bc0
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs924992
milestone27.0a1
backs outcff5a22acb7c81cf373a85a3de08c480999ed550
first release with
nightly win32
500765bd8dd9 / 27.0a1 / 20131011115413 / files
nightly win64
500765bd8dd9 / 27.0a1 / 20131011115833 / files
nightly linux32
nightly linux64
nightly mac
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win32
nightly win64
Backed out changeset cff5a22acb7c (bug 924992) for breaking upload_symbolds on Nightlies
config/baseconfig.mk
config/config.mk
js/src/config/baseconfig.mk
js/src/config/config.mk
security/build/Makefile.in
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -1,18 +1,13 @@
 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-
-ifndef INCLUDED_FUNCTIONS_MK
-include $(topsrcdir)/config/makefiles/functions.mk
-endif
-
-DIST := $(call core_realpath,$(DEPTH)/dist)
+DIST = $(DEPTH)/dist
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
 
 # We only want to do the pymake sanity on Windows, other os's can cope
 ifeq ($(HOST_OS_ARCH),WINNT)
--- a/config/config.mk
+++ b/config/config.mk
@@ -59,16 +59,20 @@ CHECK_VARS := \
  $(NULL)
 
 # checks for internal spaces or trailing spaces in the variable
 # named by $x
 check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not allowed in $(x)))
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
+
 RM = rm -f
 
 # LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.
 LIBXUL_DIST ?= $(DIST)
 
 # FINAL_TARGET specifies the location into which we copy end-user-shipped
 # build products (typelibs, components, chrome).
 #
--- a/js/src/config/baseconfig.mk
+++ b/js/src/config/baseconfig.mk
@@ -1,22 +1,18 @@
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 
-ifndef INCLUDED_FUNCTIONS_MK
-include $(topsrcdir)/config/makefiles/functions.mk
-endif
-
 ifneq (,$(filter /%,$(TOP_DIST)))
-DIST := $(call core_realpath,$(TOP_DIST))
+DIST = $(TOP_DIST)
 else
 ifeq (.,$(DEPTH))
-DIST := $(call core_realpath,$(TOP_DIST))
+DIST = $(TOP_DIST)
 else
-DIST := $(call core_realpath,$(DEPTH)/$(TOP_DIST))
+DIST = $(DEPTH)/$(TOP_DIST)
 endif
 endif
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
 
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -59,16 +59,20 @@ CHECK_VARS := \
  $(NULL)
 
 # checks for internal spaces or trailing spaces in the variable
 # named by $x
 check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not allowed in $(x)))
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
+
 RM = rm -f
 
 # LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.
 LIBXUL_DIST ?= $(DIST)
 
 # FINAL_TARGET specifies the location into which we copy end-user-shipped
 # build products (typelibs, components, chrome).
 #
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -7,16 +7,18 @@ CC_WRAPPER =
 CXX_WRAPPER =
 
 ifdef MOZ_FOLD_LIBS
 FORCE_SHARED_LIB = 1
 endif
 
 default::
 
+include $(topsrcdir)/config/makefiles/functions.mk
+
 NSS_LIBS = \
   nss3 \
   nssutil3 \
   smime3 \
   ssl3 \
   $(NULL)
 
 ifdef MOZ_FOLD_LIBS