wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1057600 - Don't require MOZILLA_OFFICIAL to include build revisions in build. Add MOZ_INCLUDE_SOURCE_INFO variable as an alternate way to include build revisions without setting MOZILLA_OFFICIAL. r=glandium

Browse Source
This commit is contained in:
Kevin K. 2015-02-17 22:10:03 -05:00
parent 2147691b41
commit ceff8a147e
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Makefile.in
View File

@ -33,7 +33,7 @@ ifdef MOZ_SOURCE_STAMP
DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)'
endif
ifdef MOZILLA_OFFICIAL
ifdef MOZ_INCLUDE_SOURCE_INFO
source_repo ?= $(call getSourceRepo,$(topsrcdir)/$(MOZ_BUILD_APP)/..)
ifneq (,$(source_repo))
DEFINES += -DMOZ_SOURCE_REPO='$(source_repo)'

7
configure.in
View File

@ -8694,6 +8694,13 @@ AC_SUBST(MOZ_PKG_SPECIAL)
AC_SUBST(MOZILLA_OFFICIAL)
# Build revisions should always be present in official builds
if test "$MOZILLA_OFFICIAL"; then
MOZ_INCLUDE_SOURCE_INFO=1
fi
AC_SUBST(MOZ_INCLUDE_SOURCE_INFO)
AC_DEFINE_UNQUOTED(MOZ_TELEMETRY_DISPLAY_REV, 2)
AC_SUBST(MOZ_TELEMETRY_DISPLAY_REV)

2
toolkit/content/Makefile.in
View File

@ -16,7 +16,7 @@ ifdef MOZ_SOURCE_STAMP
DEFINES += -DSOURCE_CHANGESET='$(MOZ_SOURCE_STAMP)'
endif
ifdef MOZILLA_OFFICIAL
ifdef MOZ_INCLUDE_SOURCE_INFO
source_repo ?= $(call getSourceRepo)
ifneq (,$(filter http%,$(source_repo)))
DEFINES += -DSOURCE_REPO='$(source_repo)'

2
toolkit/mozapps/installer/package-name.mk
View File

@ -148,7 +148,7 @@ MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{
# bug: 746277 - preserve existing functionality.
# MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists
###########################################################################
ifdef MOZILLA_OFFICIAL
ifdef MOZ_INCLUDE_SOURCE_INFO
MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
endif

2
toolkit/xre/Makefile.in
View File

@ -24,7 +24,7 @@ ifdef MOZ_SOURCE_STAMP
INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)
ifdef MOZILLA_OFFICIAL
ifdef MOZ_INCLUDE_SOURCE_INFO
source_repo := $(call getSourceRepo)
# extra sanity check for old versions of hg, no showconfig support