1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 7820633b718ca1983da7b105d7868c455809cff1 |
2 # Parent 8d013204e3f06811daf5156939452765fb3e10bb |
3 |
3 |
4 diff --git a/build/Makefile.in b/build/Makefile.in |
|
5 --- a/build/Makefile.in |
|
6 +++ b/build/Makefile.in |
|
7 @@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
|
8 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk |
|
9 |
|
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 |
|
12 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" |
|
13 endif |
|
14 |
|
15 _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)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
|
18 ifdef SOURCE_REPO |
|
19 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
|
20 endif |
|
21 |
|
22 DEFINES += \ |
|
23 -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \ |
|
24 -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \ |
|
25 -DMOZ_APP_ID="$(MOZ_APP_ID)" \ |
|
26 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in |
|
27 --- a/toolkit/content/Makefile.in |
|
28 +++ b/toolkit/content/Makefile.in |
|
29 @@ -35,17 +35,17 @@ endif |
|
30 ifeq (Android,$(OS_TARGET)) |
|
31 DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) |
|
32 endif |
|
33 |
|
34 # strip a trailing slash from the repo URL because it's not always present, |
|
35 # and we want to construct a working URL in buildconfig.html |
|
36 # make+shell+sed = awful |
|
37 _dollar=$$ |
|
38 -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
|
39 +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
|
40 # extra sanity check for old versions of hg |
|
41 # that don't support showconfig |
|
42 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
|
43 DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)" |
|
44 endif |
|
45 |
|
46 BUILD_HOSTNAME = $(shell hostname -s || hostname) |
|
47 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" |
|
48 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
4 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
49 --- a/toolkit/mozapps/installer/package-name.mk |
5 --- a/toolkit/mozapps/installer/package-name.mk |
50 +++ b/toolkit/mozapps/installer/package-name.mk |
6 +++ b/toolkit/mozapps/installer/package-name.mk |
51 @@ -131,22 +131,22 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
7 @@ -138,23 +138,23 @@ else |
52 TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
8 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
|
9 endif |
53 |
10 |
54 ifneq (,$(wildcard $(DIST)/bin/application.ini)) |
11 ifndef INCLUDED_RCS_MK |
55 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) |
12 USE_RCS_MK := 1 |
56 else |
13 include $(topsrcdir)/config/makefiles/makeutils.mk |
57 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
|
58 endif |
14 endif |
59 |
15 |
60 -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
16 -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
61 +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
17 +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
62 |
18 |
63 # strip a trailing slash from the repo URL because it's not always present, |
19 ########################################################################### |
64 # and we want to construct a working URL in the sourcestamp file. |
20 # bug: 746277 - preserve existing functionality. |
65 # make+shell+sed = awful |
21 # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists |
66 _dollar=$$ |
22 ########################################################################### |
67 -MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
23 -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
68 +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
24 +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
69 |
25 |
70 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt |
26 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt |
|
27 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json |
71 |
28 |
72 # JavaScript Shell |
29 # JavaScript Shell |
73 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
30 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
74 |
31 |
75 endif # PACKAGE_NAME_MK_INCLUDED |
32 endif # PACKAGE_NAME_MK_INCLUDED |
76 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
33 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
77 --- a/toolkit/xre/Makefile.in |
34 --- a/toolkit/xre/Makefile.in |
78 +++ b/toolkit/xre/Makefile.in |
35 +++ b/toolkit/xre/Makefile.in |
79 @@ -218,20 +218,20 @@ endif |
36 @@ -214,17 +214,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
|
37 endif |
|
38 endif |
80 |
39 |
81 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
40 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
82 ifdef MOZ_SOURCE_STAMP |
41 ifdef MOZ_SOURCE_STAMP |
83 |
42 |
84 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
43 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
85 |
44 |
86 # strip a trailing slash from the repo URL because it's not always present, |
45 - source_repo := $(call getSourceRepo) |
87 # and we want to construct a working URL in buildconfig.html |
46 + source_repo ?= $(call getSourceRepo) |
88 - SOURCE_REPO := $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
|
89 - SOURCE_REPO := $(strip $(SOURCE_REPO)) |
|
90 - SOURCE_REPO := $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
|
91 - SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) |
|
92 + SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
|
93 + SOURCE_REPO ?= $(strip $(SOURCE_REPO)) |
|
94 + SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
|
95 + SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) |
|
96 |
|
97 # command set should change based on revision control use. |
|
98 # warn for now in case (git, bzr, ...) is in use. |
|
99 $(call warnIfEmpty,SOURCE_REPO) |
|
100 |
47 |
101 # extra sanity check for old versions of hg, no showconfig support |
48 # extra sanity check for old versions of hg, no showconfig support |
102 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
49 ifneq (,$(filter http%,$(source_repo))) |
103 INIARGS += --sourcerepo=$(SOURCE_REPO) |
50 INIARGS += --sourcerepo=$(source_repo) |
|
51 endif |
|
52 |
|
53 endif # MOZ_SOURCE_STAMP |
|
54 |