author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 28 May 2014 22:14:46 +0200 | |
branch | firefox30 |
changeset 737 | 8ce6c378e34d |
parent 703 | c4aab80e472f |
child 779 | 354c672efefa |
permissions | -rw-r--r-- |
279 | 1 |
# HG changeset patch |
703 | 2 |
# Parent 9b45fd4b00c45014b17358158cdb51805c8ca327 |
279 | 3 |
|
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 |
|
6 |
+++ b/toolkit/mozapps/installer/package-name.mk |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
7 |
@@ -138,23 +138,23 @@ else |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
8 |
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
9 |
endif |
279 | 10 |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
11 |
ifndef INCLUDED_RCS_MK |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
12 |
USE_RCS_MK := 1 |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
13 |
include $(topsrcdir)/config/makefiles/makeutils.mk |
279 | 14 |
endif |
15 |
||
16 |
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
|
17 |
+#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
|
18 |
||
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
19 |
########################################################################### |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
20 |
# bug: 746277 - preserve existing functionality. |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
21 |
# MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
22 |
########################################################################### |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
23 |
-MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
24 |
+#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
279 | 25 |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
26 |
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
27 |
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
28 |
|
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
29 |
# JavaScript Shell |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
30 |
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
515 | 31 |
|
32 |
endif # PACKAGE_NAME_MK_INCLUDED |
|
279 | 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 |
|
703 | 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)"' |
|
279 | 39 |
|
703 | 40 |
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
|
41 |
ifdef MOZ_SOURCE_STAMP |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
42 |
|
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
43 |
INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
279 | 44 |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
45 |
- source_repo := $(call getSourceRepo) |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
46 |
+ source_repo ?= $(call getSourceRepo) |
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
47 |
|
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
48 |
# extra sanity check for old versions of hg, no showconfig support |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
49 |
ifneq (,$(filter http%,$(source_repo))) |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
50 |
INIARGS += --sourcerepo=$(source_repo) |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
51 |
endif |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
52 |
|
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
53 |
endif # MOZ_SOURCE_STAMP |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
54 |