Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove deprecated build profiles @image and @vmware-image.

Browse Source 
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 <waddlesplash@gmail.com>
This commit is contained in:
Adrien Destugues 2020-05-09 14:45:49 +02:00 committed by waddlesplash
parent 8bb5fd2437
commit 39c68f46dd
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/jam/CommandLineArguments
View File

@ -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):" ;

3
build/jam/DefaultBuildProfiles
View File

@ -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." ;

12
build/jam/UserBuildConfig.ReadMe
View File

@ -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