2011-06-15 17:00:40 +02:00
|
|
|
# HG changeset patch
|
2015-01-14 19:32:16 +01:00
|
|
|
# Parent 80b6464bd883864fce57e8748010869af1be69e9
|
2015-08-12 09:11:49 +02:00
|
|
|
# Parent 57bb5e3ab77acbff5414d4dbce35a38f21d39276
|
2011-06-15 17:00:40 +02:00
|
|
|
|
|
|
|
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
|
|
|
|
--- a/toolkit/mozapps/installer/package-name.mk
|
|
|
|
+++ b/toolkit/mozapps/installer/package-name.mk
|
2015-08-12 09:11:49 +02:00
|
|
|
@@ -142,24 +142,24 @@ else
|
2011-06-15 17:00:40 +02:00
|
|
|
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
|
|
|
|
endif
|
|
|
|
|
2013-05-14 16:33:59 +02:00
|
|
|
ifndef INCLUDED_RCS_MK
|
|
|
|
USE_RCS_MK := 1
|
2015-04-01 07:22:19 +02:00
|
|
|
include $(MOZILLA_DIR)/config/makefiles/makeutils.mk
|
2013-05-14 16:33:59 +02:00
|
|
|
endif
|
|
|
|
|
2011-06-15 17:00:40 +02:00
|
|
|
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
|
|
|
|
+#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
|
|
|
|
|
2013-05-14 16:33:59 +02:00
|
|
|
###########################################################################
|
|
|
|
# bug: 746277 - preserve existing functionality.
|
|
|
|
# MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists
|
|
|
|
###########################################################################
|
2015-05-10 22:12:38 +02:00
|
|
|
ifdef MOZ_INCLUDE_SOURCE_INFO
|
2013-05-14 16:33:59 +02:00
|
|
|
-MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
|
|
|
|
+#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
|
2014-12-02 23:01:52 +01:00
|
|
|
endif
|
2011-06-15 17:00:40 +02:00
|
|
|
|
2013-05-14 16:33:59 +02:00
|
|
|
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
|
|
|
|
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
|
2015-01-14 19:32:16 +01:00
|
|
|
MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json
|
2015-08-12 09:11:49 +02:00
|
|
|
MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json
|
|
|
|
MOZ_TEST_PACKAGES_FILE_TC = $(DIST)/$(PKG_PATH)/test_packages_tc.json
|
2011-09-26 08:53:33 +02:00
|
|
|
|