author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sat, 15 Sep 2012 23:24:13 +0200 | |
changeset 543 | 24c3eafd49a1 |
parent 515 | 0f6539389500 |
child 637 | 73640b76d6c3 |
permissions | -rw-r--r-- |
279 | 1 |
# HG changeset patch |
515 | 2 |
# Parent 7820633b718ca1983da7b105d7868c455809cff1 |
279 | 3 |
|
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
4 |
diff --git a/build/Makefile.in b/build/Makefile.in |
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
5 |
--- a/build/Makefile.in |
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
6 |
+++ b/build/Makefile.in |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
7 |
@@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
8 |
APP_INI_DEPS += $(DEPTH)/config/autoconf.mk |
280
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
9 |
|
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
10 |
MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) |
280
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
11 |
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
|
12 |
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
|
13 |
endif |
37650d092283
modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
279
diff
changeset
|
14 |
|
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
15 |
_dollar=$$ |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
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)//" ) |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
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)//" ) |
280
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 |
|
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
22 |
DEFINES += \ |
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
23 |
-DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \ |
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
24 |
-DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \ |
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
25 |
-DMOZ_APP_ID="$(MOZ_APP_ID)" \ |
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 |
|
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
29 |
@@ -35,17 +35,17 @@ endif |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
30 |
ifeq (Android,$(OS_TARGET)) |
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
31 |
DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) |
279 | 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 |
||
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
46 |
BUILD_HOSTNAME = $(shell hostname -s || hostname) |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
47 |
DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" |
279 | 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 |
|
515 | 51 |
@@ -131,22 +131,22 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
279 | 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 |
||
410 | 70 |
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
71 |
|
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
72 |
# JavaScript Shell |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
73 |
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
515 | 74 |
|
75 |
endif # PACKAGE_NAME_MK_INCLUDED |
|
279 | 76 |
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
77 |
--- a/toolkit/xre/Makefile.in |
|
78 |
+++ b/toolkit/xre/Makefile.in |
|
515 | 79 |
@@ -218,20 +218,20 @@ endif |
279 | 80 |
|
81 |
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
|
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
82 |
ifdef MOZ_SOURCE_STAMP |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
83 |
|
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
84 |
INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
279 | 85 |
|
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
86 |
# strip a trailing slash from the repo URL because it's not always present, |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
87 |
# and we want to construct a working URL in buildconfig.html |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
88 |
- SOURCE_REPO := $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
89 |
- SOURCE_REPO := $(strip $(SOURCE_REPO)) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
90 |
- SOURCE_REPO := $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
91 |
- SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
92 |
+ SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
93 |
+ SOURCE_REPO ?= $(strip $(SOURCE_REPO)) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
94 |
+ SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
95 |
+ SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
96 |
|
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
97 |
# command set should change based on revision control use. |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
98 |
# warn for now in case (git, bzr, ...) is in use. |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
99 |
$(call warnIfEmpty,SOURCE_REPO) |
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
100 |
|
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
101 |
# extra sanity check for old versions of hg, no showconfig support |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
102 |
ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
103 |
INIARGS += --sourcerepo=$(SOURCE_REPO) |