author | Wolfgang Rosenauer <wr@rosenauer.org> |
Tue, 07 Jun 2016 17:58:57 +0200 | |
branch | firefox46 |
changeset 914 | 20bd16d68ed2 |
parent 909 | c6717354928b |
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 |
909 | 3 |
# Parent 808d61f33afa6fb9921d3a7f994a71cf2dd9331a |
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 |
|
889 | 8 |
@@ -147,24 +147,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 |
||
889 | 17 |
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node}\n" 2>/dev/null)) |
18 |
+#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node}\n" 2>/dev/null)) |
|
279 | 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 |
########################################################################### |
850 | 24 |
ifdef MOZ_INCLUDE_SOURCE_INFO |
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 |
909 | 31 |
MOZ_BUILDID_INFO_TXT_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME)_info.txt |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
32 |
MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json |
868 | 33 |
MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json |
34 |
MOZ_TEST_PACKAGES_FILE_TC = $(DIST)/$(PKG_PATH)/test_packages_tc.json |