Update UserBuildConfig readme and sample

AddOptionalHaikuImagePackage is replaced with AddHaikuImagePackages.
This commit is contained in:
Adrien Destugues 2014-01-12 17:56:52 +01:00
parent 121a158f9c
commit 024e81af86
2 changed files with 10 additions and 8 deletions

View File

@ -142,13 +142,13 @@ ExtractArchiveToHaikuImage develop tools
# Add the optional package WonderBrush to the image. The package is downloaded
# via wget (i.e. wget must be installed).
AddOptionalHaikuImagePackages WonderBrush ;
AddHaikuImagePackages WonderBrush ;
# Add the optional package WebPositive to the image but don't add its
# dependent SQLite optional package to the image. WebPositive still needs
# SQLite to run, this allows you to test a different version of it though.
AddOptionalHaikuImagePackages WebPositive ;
SuppressOptionalHaikuImagePackages SQLite ;
SuppressHaikuImagePackages SQLite ;
# Specify scripts that shall be run when populating the image/installation
# directory. The "early" script is run before anything has been copied onto
@ -210,9 +210,9 @@ DefineBuildProfile install : install : /Haiku2 ;
switch $(HAIKU_BUILD_PROFILE) {
case "disk" : {
AddOptionalHaikuImagePackages BeBook BeHappy BePDF Bluetooth CVS
Development Firefox OpenSSH OpenSSL P7zip Pe Subversion Vision
Welcome WonderBrush ;
AddOptionalHaikuImagePackages BeBook BeHappy Bluetooth Development
OpenSSH OpenSSL Welcome ;
AddHaikuImagePackages bepdf cvs p7zip pe subversion vision wonderbrush ;
}
case "qemu" : {
@ -222,7 +222,8 @@ switch $(HAIKU_BUILD_PROFILE) {
case "vmware" : {
HAIKU_IMAGE_SIZE = 400 ;
HAIKU_DONT_CLEAR_IMAGE = 1 ;
AddOptionalHaikuImagePackages Development Pe ;
AddOptionalHaikuImagePackages Development ;
AddHaikuImagePackages pe ;
}
case "anyboot" : {
@ -232,7 +233,8 @@ switch $(HAIKU_BUILD_PROFILE) {
case "crash" : {
HAIKU_IMAGE_SIZE = 1024 ;
HAIKU_DONT_CLEAR_IMAGE = 1 ;
AddOptionalHaikuImagePackages Development Pe ;
AddOptionalHaikuImagePackages Development ;
AddHaikuImagePackages pe ;
CopyDirectoryToHaikuImage home Desktop : $(HAIKU_TOP)/../crash-tests ;
}
}

View File

@ -26,7 +26,7 @@
# Add the optional package WonderBrush to the image.
#AddOptionalHaikuImagePackages WonderBrush ;
#AddHaikuImagePackages WonderBrush ;
# Add an example optional gfx driver and its accelerant.
# (Drivers just have a special rule because of the need for the symlink in dev/)