i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update UserBuildConfig readme and sample

Browse Source 
AddOptionalHaikuImagePackage is replaced with AddHaikuImagePackages.
This commit is contained in:
Adrien Destugues
2014-01-13 08:05:34 +01:00
parent 121a158f9c
commit 024e81af86
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/UserBuildConfig.ReadMe
+9 -7
View File
@@ -142,13 +142,13 @@ ExtractArchiveToHaikuImage develop tools
# Add the optional package WonderBrush to the image. The package is downloaded # Add the optional package WonderBrush to the image. The package is downloaded
# via wget (i.e. wget must be installed). # 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 # Add the optional package WebPositive to the image but don't add its
# dependent SQLite optional package to the image. WebPositive still needs # dependent SQLite optional package to the image. WebPositive still needs
# SQLite to run, this allows you to test a different version of it though. # SQLite to run, this allows you to test a different version of it though.
AddOptionalHaikuImagePackages WebPositive ; AddOptionalHaikuImagePackages WebPositive ;
SuppressOptionalHaikuImagePackages SQLite ; SuppressHaikuImagePackages SQLite ;
# Specify scripts that shall be run when populating the image/installation # Specify scripts that shall be run when populating the image/installation
# directory. The "early" script is run before anything has been copied onto # directory. The "early" script is run before anything has been copied onto
@@ -210,9 +210,9 @@ DefineBuildProfile install : install : /Haiku2 ;
switch $(HAIKU_BUILD_PROFILE) { switch $(HAIKU_BUILD_PROFILE) {
case "disk" : { case "disk" : {
AddOptionalHaikuImagePackages BeBook BeHappy BePDF Bluetooth CVS AddOptionalHaikuImagePackages BeBook BeHappy Bluetooth Development
Development Firefox OpenSSH OpenSSL P7zip Pe Subversion Vision OpenSSH OpenSSL Welcome ;
Welcome WonderBrush ; AddHaikuImagePackages bepdf cvs p7zip pe subversion vision wonderbrush ;
} }
case "qemu" : { case "qemu" : {
@@ -222,7 +222,8 @@ switch $(HAIKU_BUILD_PROFILE) {
case "vmware" : { case "vmware" : {
HAIKU_IMAGE_SIZE = 400 ; HAIKU_IMAGE_SIZE = 400 ;
HAIKU_DONT_CLEAR_IMAGE = 1 ; HAIKU_DONT_CLEAR_IMAGE = 1 ;
AddOptionalHaikuImagePackages Development Pe ; AddOptionalHaikuImagePackages Development ;
AddHaikuImagePackages pe ;
} }
case "anyboot" : { case "anyboot" : {
@@ -232,7 +233,8 @@ switch $(HAIKU_BUILD_PROFILE) {
case "crash" : { case "crash" : {
HAIKU_IMAGE_SIZE = 1024 ; HAIKU_IMAGE_SIZE = 1024 ;
HAIKU_DONT_CLEAR_IMAGE = 1 ; HAIKU_DONT_CLEAR_IMAGE = 1 ;
AddOptionalHaikuImagePackages Development Pe ; AddOptionalHaikuImagePackages Development ;
AddHaikuImagePackages pe ;
CopyDirectoryToHaikuImage home Desktop : $(HAIKU_TOP)/../crash-tests ; CopyDirectoryToHaikuImage home Desktop : $(HAIKU_TOP)/../crash-tests ;
} }
} }
build/jam/UserBuildConfig.sample
+1 -1
View File
@@ -26,7 +26,7 @@
# Add the optional package WonderBrush to the image. # Add the optional package WonderBrush to the image.
#AddOptionalHaikuImagePackages WonderBrush ; #AddHaikuImagePackages WonderBrush ;
# Add an example optional gfx driver and its accelerant. # Add an example optional gfx driver and its accelerant.
# (Drivers just have a special rule because of the need for the symlink in dev/) # (Drivers just have a special rule because of the need for the symlink in dev/)