1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent d50497c25f208e4868a386f081edc790a505795c |
2 # Parent c9af3b8022c3f92070c1bd205553d799887cd1b8 |
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 @@ -95,17 +95,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
7 @@ -62,17 +62,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)" |
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 @@ -67,17 +67,17 @@ endif |
29 @@ -35,17 +35,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, |
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 @@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
51 @@ -128,20 +128,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 @@ -240,20 +240,20 @@ endif |
77 @@ -220,20 +220,20 @@ endif |
78 |
78 |
79 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)) |
80 ifdef MOZ_SOURCE_STAMP |
80 ifdef MOZ_SOURCE_STAMP |
81 |
81 |
82 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
82 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
89 - SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) |
89 - SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) |
90 + SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
90 + SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
91 + SOURCE_REPO ?= $(strip $(SOURCE_REPO)) |
91 + SOURCE_REPO ?= $(strip $(SOURCE_REPO)) |
92 + SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
92 + SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
93 + SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) |
93 + SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) |
94 $(call errorIfEmpty,SOURCE_REPO) |
94 |
|
95 # command set should change based on revision control use. |
|
96 # warn for now in case (git, bzr, ...) is in use. |
|
97 $(call warnIfEmpty,SOURCE_REPO) |
95 |
98 |
96 # extra sanity check for old versions of hg, no showconfig support |
99 # extra sanity check for old versions of hg, no showconfig support |
97 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
100 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
98 INIARGS += --sourcerepo=$(SOURCE_REPO) |
101 INIARGS += --sourcerepo=$(SOURCE_REPO) |
99 endif |
|
100 |
|
101 endif # MOZ_SOURCE_STAMP |
|