1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 8ea0f829916d7d9dc54567813367bcdfe6cee179 |
2 # Parent 271b5143e89573cbbde51d0b830a6116756a52e6 |
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 @@ -91,17 +91,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
7 @@ -89,17 +89,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 hg -R $(topsrcdir) 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)" |
13 endif |
13 endif |
14 |
14 |
15 _dollar=$$ |
15 _dollar=$$ |
16 -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
16 -SOURCE_REPO := $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
17 +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
17 +SOURCE_REPO ?= $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
18 ifdef SOURCE_REPO |
18 ifdef SOURCE_REPO |
19 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
19 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
20 endif |
20 endif |
21 |
21 |
22 DEFINES += \ |
22 DEFINES += \ |
24 -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \ |
24 -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \ |
25 -DMOZ_APP_ID="$(MOZ_APP_ID)" \ |
25 -DMOZ_APP_ID="$(MOZ_APP_ID)" \ |
26 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in |
26 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in |
27 --- a/toolkit/content/Makefile.in |
27 --- a/toolkit/content/Makefile.in |
28 +++ b/toolkit/content/Makefile.in |
28 +++ b/toolkit/content/Makefile.in |
29 @@ -65,17 +65,17 @@ endif |
29 @@ -67,17 +67,17 @@ endif |
30 ifeq (Android,$(OS_TARGET)) |
30 ifeq (Android,$(OS_TARGET)) |
31 DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) |
31 DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) |
32 endif |
32 endif |
33 |
33 |
34 # strip a trailing slash from the repo URL because it's not always present, |
34 # strip a trailing slash from the repo URL because it's not always present, |
41 # that don't support showconfig |
41 # that don't support showconfig |
42 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
42 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
43 DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)" |
43 DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)" |
44 endif |
44 endif |
45 |
45 |
46 ifdef MOZ_TOOLKIT_SEARCH |
46 BUILD_HOSTNAME = $(shell hostname -s || hostname) |
47 DEFINES += -DMOZ_TOOLKIT_SEARCH |
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 @@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
52 TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
52 TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
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 @@ -236,17 +236,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
77 @@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
78 endif |
78 endif |
79 endif |
79 endif |
80 |
80 |
81 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
81 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, |
82 # strip a trailing slash from the repo URL because it's not always present, |