1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e315e5900fa90c2183edccd211fbe1e81cdb4c5f |
2 # Parent 8ea0f829916d7d9dc54567813367bcdfe6cee179 |
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 @@ -86,17 +86,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
7 @@ -91,17 +91,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 hg -R $(topsrcdir) 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)" |
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 @@ -156,20 +156,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 |
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 |
65 # make+shell+sed = awful |
65 # make+shell+sed = awful |
66 _dollar=$$ |
66 _dollar=$$ |
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)//" ) |
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)//" ) |
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)//" ) |
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)//" ) |
69 |
69 |
70 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt |
70 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt |
71 |
71 |
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 @@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
77 @@ -236,17 +236,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, |