author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 07 Jul 2011 08:00:10 +0200 | |
changeset 288 | d51f3999a1c2 |
parent 280 | 37650d092283 |
child 289 | 3c0dff7ca9c4 |
permissions | -rw-r--r-- |
279 | 1 |
# HG changeset patch |
2 |
# Parent 84ecc6172ec5f01c80346bdb819520d08f982bac |
|
3 |
||
280
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
4 |
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
5 |
--- a/browser/app/Makefile.in |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
6 |
+++ b/browser/app/Makefile.in |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
7 |
@@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
8 |
|
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
9 |
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
10 |
|
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
11 |
MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null) |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
12 |
ifdef MOZ_SOURCE_STAMP |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
13 |
DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
14 |
endif |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
15 |
|
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
16 |
-SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
17 |
+SOURCE_REPO ?= $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
18 |
ifdef SOURCE_REPO |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
19 |
DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
20 |
endif |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
21 |
|
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
22 |
LIBS += $(JEMALLOC_LIBS) |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
23 |
|
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
24 |
ifdef LIBXUL_SDK |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
25 |
include $(topsrcdir)/config/rules.mk |
279 | 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 |
@@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops |
|
30 |
ifdef MOZ_SOURCE_STAMP |
|
31 |
DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)" |
|
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 |
ifdef MOZ_TOOLKIT_SEARCH |
|
47 |
DEFINES += -DMOZ_TOOLKIT_SEARCH |
|
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 |
|
50 |
+++ b/toolkit/mozapps/installer/package-name.mk |
|
51 |
@@ -154,17 +154,17 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
|
52 |
TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
|
53 |
||
54 |
ifneq (,$(wildcard $(DIST)/bin/application.ini)) |
|
55 |
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) |
|
56 |
else |
|
57 |
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
|
58 |
endif |
|
59 |
||
60 |
-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)) |
|
62 |
||
63 |
# strip a trailing slash from the repo URL because it's not always present, |
|
64 |
# and we want to construct a working URL in the sourcestamp file. |
|
65 |
# make+shell+sed = awful |
|
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)//" ) |
|
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 |
||
70 |
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt |
|
71 |
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
|
72 |
--- a/toolkit/xre/Makefile.in |
|
73 |
+++ b/toolkit/xre/Makefile.in |
|
74 |
@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
|
75 |
endif |
|
76 |
endif |
|
77 |
||
78 |
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
|
79 |
# strip a trailing slash from the repo URL because it's not always present, |
|
80 |
# and we want to construct a working URL in buildconfig.html |
|
81 |
# make+shell+sed = awful |
|
82 |
_dollar=$$ |
|
83 |
-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
|
84 |
+SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) |
|
85 |
||
86 |
ifdef MOZ_SOURCE_STAMP |
|
87 |
INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
|
88 |
# extra sanity check for old versions of hg |
|
89 |
# that don't support showconfig |
|
90 |
ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
|
91 |
INIARGS += --sourcerepo=$(SOURCE_REPO) |
|
92 |
endif |