1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 271b5143e89573cbbde51d0b830a6116756a52e6 |
2 # Parent d50497c25f208e4868a386f081edc790a505795c |
3 |
3 |
4 diff --git a/build/Makefile.in b/build/Makefile.in |
4 diff --git a/build/Makefile.in b/build/Makefile.in |
5 --- a/build/Makefile.in |
5 --- a/build/Makefile.in |
6 +++ b/build/Makefile.in |
6 +++ b/build/Makefile.in |
7 @@ -89,17 +89,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
7 @@ -95,17 +95,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
8 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk |
8 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk |
9 |
9 |
10 MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) |
10 MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) |
11 ifdef MOZ_SOURCE_STAMP |
11 ifdef MOZ_SOURCE_STAMP |
12 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" |
12 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" |
46 BUILD_HOSTNAME = $(shell hostname -s || hostname) |
46 BUILD_HOSTNAME = $(shell hostname -s || hostname) |
47 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" |
47 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" |
48 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
48 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
49 --- a/toolkit/mozapps/installer/package-name.mk |
49 --- a/toolkit/mozapps/installer/package-name.mk |
50 +++ b/toolkit/mozapps/installer/package-name.mk |
50 +++ b/toolkit/mozapps/installer/package-name.mk |
51 @@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
51 @@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
52 TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
52 TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
53 |
53 |
54 ifneq (,$(wildcard $(DIST)/bin/application.ini)) |
54 ifneq (,$(wildcard $(DIST)/bin/application.ini)) |
55 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) |
55 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) |
56 else |
56 else |
72 # JavaScript Shell |
72 # JavaScript Shell |
73 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
73 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
74 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
74 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
75 --- a/toolkit/xre/Makefile.in |
75 --- a/toolkit/xre/Makefile.in |
76 +++ b/toolkit/xre/Makefile.in |
76 +++ b/toolkit/xre/Makefile.in |
77 @@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
77 @@ -240,20 +240,20 @@ endif |
78 endif |
|
79 endif |
|
80 |
78 |
81 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
79 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
82 # strip a trailing slash from the repo URL because it's not always present, |
80 ifdef MOZ_SOURCE_STAMP |
83 # and we want to construct a working URL in buildconfig.html |
|
84 # make+shell+sed = awful |
|
85 _dollar=$$ |
|
86 -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
|
87 +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
|
88 |
81 |
89 ifdef MOZ_SOURCE_STAMP |
82 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
90 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
83 |
91 # extra sanity check for old versions of hg |
84 # strip a trailing slash from the repo URL because it's not always present, |
92 # that don't support showconfig |
85 # and we want to construct a working URL in buildconfig.html |
93 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
86 - SOURCE_REPO := $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
94 INIARGS += --sourcerepo=$(SOURCE_REPO) |
87 - SOURCE_REPO := $(strip $(SOURCE_REPO)) |
95 endif |
88 - SOURCE_REPO := $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
|
89 - SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) |
|
90 + SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
|
91 + SOURCE_REPO ?= $(strip $(SOURCE_REPO)) |
|
92 + SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
|
93 + SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) |
|
94 $(call errorIfEmpty,SOURCE_REPO) |
|
95 |
|
96 # extra sanity check for old versions of hg, no showconfig support |
|
97 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
|
98 INIARGS += --sourcerepo=$(SOURCE_REPO) |
|
99 endif |
|
100 |
|
101 endif # MOZ_SOURCE_STAMP |