equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 80b6464bd883864fce57e8748010869af1be69e9 |
2 # Parent 80b6464bd883864fce57e8748010869af1be69e9 |
3 # Parent 7f246bc54e416716e50efe50c0edf154b26be658 |
3 # Parent 09047118c6e38c5be50e391348eef3e993b266b5 |
4 |
4 |
5 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
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 |
6 --- a/toolkit/mozapps/installer/package-name.mk |
7 +++ b/toolkit/mozapps/installer/package-name.mk |
7 +++ b/toolkit/mozapps/installer/package-name.mk |
8 @@ -137,24 +137,24 @@ else |
8 @@ -142,24 +142,24 @@ else |
9 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
9 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
10 endif |
10 endif |
11 |
11 |
12 ifndef INCLUDED_RCS_MK |
12 ifndef INCLUDED_RCS_MK |
13 USE_RCS_MK := 1 |
13 USE_RCS_MK := 1 |
27 endif |
27 endif |
28 |
28 |
29 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt |
29 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt |
30 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json |
30 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json |
31 MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json |
31 MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json |
|
32 MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json |
32 |
33 |
33 # JavaScript Shell |
34 # JavaScript Shell |
34 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
|