| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Tue, 11 Nov 2014 21:46:09 +0100 | |
| changeset 805 | e14da82b1332 |
| parent 779 | 354c672efefa |
| child 807 | f54c68340963 |
| permissions | -rw-r--r-- |
| 279 | 1 |
# HG changeset patch |
| 779 | 2 |
# Parent 1478a2c97152e81b6d7cb89a4ab34da7310e3e86 |
| 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 |
|
| 779 | 7 |
@@ -137,24 +137,24 @@ else |
|
637
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 |
########################################################################### |
| 779 | 23 |
ifdef MOZILLA_OFFICIAL |
|
637
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)) |
|
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
25 |
+#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
| 779 | 26 |
endif |
| 279 | 27 |
|
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
28 |
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
|
29 |
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
|
30 |
|
|
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
31 |
# JavaScript Shell |
|
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
32 |
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
| 515 | 33 |