From 39c68f46dd35e76233b94b942f4f1021aeb24d4f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 9 May 2020 14:45:49 +0200 Subject: [PATCH] Remove deprecated build profiles @image and @vmware-image. The @image build is not used anymore and doesn't work. Use @nightly-raw or @nightly-anyboot instead. The new method of release type/image type configuration of profiles is more flexible and allows to manage the various configurations a lot more easily for us. But the old profiles were never formally deprecated. Fixes #15963 Change-Id: I1c72f0e77bfbcda10502476e595f120280e8c7a4 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2625 Reviewed-by: waddlesplash --- build/jam/CommandLineArguments | 4 ++-- build/jam/DefaultBuildProfiles | 3 +-- build/jam/UserBuildConfig.ReadMe | 12 +++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build/jam/CommandLineArguments b/build/jam/CommandLineArguments index 033d5652dc..26259bdc4c 100644 --- a/build/jam/CommandLineArguments +++ b/build/jam/CommandLineArguments @@ -26,9 +26,9 @@ rule ProcessCommandLineArguments "with one of the build" ; Echo "profile actions. Typical command lines using a build" "profile looks like this:" ; - Echo " jam @image" ; + Echo " jam @nightly-anyboot" ; Echo " jam @install update libbe.so" ; - Echo " jam @vmware-image mount" ; + Echo " jam @nightly-vmware mount" ; Echo ; Echo "Default build profiles (minimal set of packages and" "configuration):" ; diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles index 72bf5dd63b..d146360015 100644 --- a/build/jam/DefaultBuildProfiles +++ b/build/jam/DefaultBuildProfiles @@ -251,8 +251,7 @@ rule DefineDefaultBuildProfiles # check whether it is unknown or one of the default profiles. if $(HAIKU_BUILD_PROFILE) && ! $(HAIKU_BUILD_PROFILE_DEFINED) { # define the obvious default profiles - if $(HAIKU_BUILD_PROFILE) in anyboot-image cd-image image install - vmware-image { + if $(HAIKU_BUILD_PROFILE) in cd-image install vmware-image { DefineBuildProfile $(HAIKU_BUILD_PROFILE) : $(HAIKU_BUILD_PROFILE) ; } else { Exit "Build profile" $(HAIKU_BUILD_PROFILE) "not defined." ; diff --git a/build/jam/UserBuildConfig.ReadMe b/build/jam/UserBuildConfig.ReadMe index c0c1320f26..980bcd7dba 100644 --- a/build/jam/UserBuildConfig.ReadMe +++ b/build/jam/UserBuildConfig.ReadMe @@ -259,11 +259,13 @@ switch $(HAIKU_BUILD_PROFILE) { # -> Enters the bfs_shell mounting the image specified by the "crash" profile. # # Note, that the build system will automatically define the build profiles -# "image", "vmware-image", and "install", unless they are already defined in -# the UserBuildConfig. They correspond to the respective build profile types -# and use the values of the variables HAIKU[_VMWARE]_IMAGE_NAME, -# HAIKU_IMAGE_DIR, HAIKU_INSTALL_DIR, respectively their default values. -# "jam -q @image" will therefore be equivalent to "jam -q haiku-image". +# for the common combination of release type (nightly, minimal, release) and +# image type (raw, anyboot, vmware), as well as the "install" profile, +# unless they are already defined in the UserBuildConfig. They correspond to +# the respective build profile types and use the values of the variables +# HAIKU[_VMWARE]_IMAGE_NAME, HAIKU_IMAGE_DIR, HAIKU_INSTALL_DIR, respectively +# their default values. +# "jam -q @nightly-raw" will therefore be equivalent to "jam -q haiku-image". # Creating Sourceable Shell Scripts