From e14ebc03e3e3101a6e2aba0ec7cffdb538d1e155 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 07:13:21 -0500 Subject: Use BUILDID for package name for Basilisk and ONLY Basilisk --- toolkit/mozapps/installer/package-name.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'toolkit/mozapps/installer/package-name.mk') diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index b1ac9a588..54de3c995 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -12,8 +12,12 @@ ifndef PACKAGE_NAME_MK_INCLUDED PACKAGE_NAME_MK_INCLUDED := 1 ifndef MOZ_PKG_VERSION +ifdef MC_BASILISK +MOZ_PKG_VERSION = $(BUILDID) +else MOZ_PKG_VERSION = $(MOZ_APP_VERSION) endif +endif ifndef MOZ_PKG_PLATFORM MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU) -- cgit v1.2.3 From b6ccccbc56bc040f0c1585e12b329b665624f754 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 07:14:10 -0500 Subject: Put generated installers and mar files in dist root --- toolkit/mozapps/installer/package-name.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolkit/mozapps/installer/package-name.mk') diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index 54de3c995..09ec7108e 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -65,17 +65,17 @@ endif ifdef MOZ_SIMPLE_PACKAGE_NAME PKG_BASENAME := $(MOZ_SIMPLE_PACKAGE_NAME) else -PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM) +PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(MOZ_PKG_PLATFORM) endif PKG_PATH = SDK_PATH = PKG_INST_BASENAME = $(PKG_BASENAME).installer PKG_STUB_BASENAME = $(PKG_BASENAME).installer-stub -PKG_INST_PATH = install/sea/ +PKG_INST_PATH = $(PKG_PATH) PKG_UPDATE_BASENAME = $(PKG_BASENAME) CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME) MOZ_INFO_BASENAME = $(PKG_BASENAME) -PKG_UPDATE_PATH = update/ +PKG_UPDATE_PATH = $(PKG_PATH) COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar # PARTIAL_MAR needs to be processed by $(wildcard) before you use it. PARTIAL_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.*.mar -- cgit v1.2.3 From 827033c57c7529841b6045eb4615866def853001 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 07:58:10 -0500 Subject: Don't generate redundant packaging artifacts --- toolkit/mozapps/installer/package-name.mk | 5 ----- 1 file changed, 5 deletions(-) (limited to 'toolkit/mozapps/installer/package-name.mk') diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index 09ec7108e..a2caff914 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -136,9 +136,6 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols # Code coverage package naming CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_BASENAME).code-coverage-gcno -# Mozharness naming -MOZHARNESS_PACKAGE = mozharness.zip - # Test package naming TEST_PACKAGE = $(PKG_BASENAME).common.tests.zip CPP_TEST_PACKAGE = $(PKG_BASENAME).cppunittest.tests.zip @@ -157,8 +154,6 @@ endif MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json -MOZ_BUILDID_INFO_TXT_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME)_info.txt -MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).test_packages.json # JavaScript Shell -- cgit v1.2.3