author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sat, 14 Mar 2015 15:56:15 +0100 | |
changeset 841 | d8a3e976dfba |
parent 837 | a1f740acf68e |
child 850 | a2bdff616a0e |
permissions | -rw-r--r-- |
279 | 1 |
# HG changeset patch |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2 |
# Parent 80b6464bd883864fce57e8748010869af1be69e9 |
837 | 3 |
# Parent d160c6876c5f05d902b391551bf4f684254b3c7d |
279 | 4 |
|
5 |
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
|
6 |
--- a/toolkit/mozapps/installer/package-name.mk |
|
7 |
+++ b/toolkit/mozapps/installer/package-name.mk |
|
779 | 8 |
@@ -137,24 +137,24 @@ else |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
9 |
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
|
10 |
endif |
279 | 11 |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
12 |
ifndef INCLUDED_RCS_MK |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
13 |
USE_RCS_MK := 1 |
837 | 14 |
include $(MOZILLA_DIR)/config/makefiles/makeutils.mk |
279 | 15 |
endif |
16 |
||
17 |
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
|
18 |
+#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
|
19 |
||
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
20 |
########################################################################### |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
21 |
# bug: 746277 - preserve existing functionality. |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
22 |
# MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
23 |
########################################################################### |
779 | 24 |
ifdef MOZILLA_OFFICIAL |
637
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)) |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
26 |
+#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) |
779 | 27 |
endif |
279 | 28 |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
29 |
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
|
30 |
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
31 |
MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
32 |
|
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
33 |
# JavaScript Shell |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
289
diff
changeset
|
34 |
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |