1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 9b45fd4b00c45014b17358158cdb51805c8ca327 |
2 # Parent 1478a2c97152e81b6d7cb89a4ab34da7310e3e86 |
3 |
3 |
4 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 |
5 --- a/toolkit/mozapps/installer/package-name.mk |
5 --- a/toolkit/mozapps/installer/package-name.mk |
6 +++ b/toolkit/mozapps/installer/package-name.mk |
6 +++ b/toolkit/mozapps/installer/package-name.mk |
7 @@ -138,23 +138,23 @@ else |
7 @@ -137,24 +137,24 @@ else |
8 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
8 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
9 endif |
9 endif |
10 |
10 |
11 ifndef INCLUDED_RCS_MK |
11 ifndef INCLUDED_RCS_MK |
12 USE_RCS_MK := 1 |
12 USE_RCS_MK := 1 |
18 |
18 |
19 ########################################################################### |
19 ########################################################################### |
20 # bug: 746277 - preserve existing functionality. |
20 # bug: 746277 - preserve existing functionality. |
21 # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists |
21 # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists |
22 ########################################################################### |
22 ########################################################################### |
|
23 ifdef MOZILLA_OFFICIAL |
23 -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
24 -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
24 +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
25 +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
|
26 endif |
25 |
27 |
26 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt |
28 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt |
27 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json |
29 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json |
28 |
30 |
29 # JavaScript Shell |
31 # JavaScript Shell |
30 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
32 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
31 |
33 |
32 endif # PACKAGE_NAME_MK_INCLUDED |
|
33 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
|
34 --- a/toolkit/xre/Makefile.in |
|
35 +++ b/toolkit/xre/Makefile.in |
|
36 @@ -39,17 +39,17 @@ TOOLKIT_EM_VERSION=$(shell $(PERL) $(top |
|
37 # Valid if null: {warn,error}IfEmpty |
|
38 DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"' |
|
39 |
|
40 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null)) |
|
41 ifdef MOZ_SOURCE_STAMP |
|
42 |
|
43 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
|
44 |
|
45 - source_repo := $(call getSourceRepo) |
|
46 + source_repo ?= $(call getSourceRepo) |
|
47 |
|
48 # extra sanity check for old versions of hg, no showconfig support |
|
49 ifneq (,$(filter http%,$(source_repo))) |
|
50 INIARGS += --sourcerepo=$(source_repo) |
|
51 endif |
|
52 |
|
53 endif # MOZ_SOURCE_STAMP |
|
54 |
|