1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 07dc7ea11c92368cb7c137a403feaaa6861abb3c |
2 # Parent e315e5900fa90c2183edccd211fbe1e81cdb4c5f |
3 |
3 |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
4 diff --git a/build/Makefile.in b/build/Makefile.in |
5 --- a/browser/app/Makefile.in |
5 --- a/build/Makefile.in |
6 +++ b/browser/app/Makefile.in |
6 +++ b/build/Makefile.in |
7 @@ -68,17 +68,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc |
7 @@ -86,17 +86,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
|
8 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk |
8 |
9 |
9 DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) |
10 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
10 |
|
11 MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null) |
|
12 ifdef MOZ_SOURCE_STAMP |
11 ifdef MOZ_SOURCE_STAMP |
13 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" |
12 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" |
14 endif |
13 endif |
15 |
14 |
16 -SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") |
15 _dollar=$$ |
17 +SOURCE_REPO ?= $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") |
16 -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) && 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 += -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \ |
22 DEFINES += \ |
23 -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" |
23 -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \ |
24 |
24 -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \ |
25 ifdef MOZ_APP_PROFILE |
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 @@ -65,17 +65,17 @@ endif |
30 ifeq (Android,$(OS_TARGET)) |
30 ifeq (Android,$(OS_TARGET)) |
46 ifdef MOZ_TOOLKIT_SEARCH |
46 ifdef MOZ_TOOLKIT_SEARCH |
47 DEFINES += -DMOZ_TOOLKIT_SEARCH |
47 DEFINES += -DMOZ_TOOLKIT_SEARCH |
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 @@ -154,20 +154,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
51 @@ -156,20 +156,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 @@ -227,17 +227,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
77 @@ -235,17 +235,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, |