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

Patch by Matt Madia: Added "cd-image" build profile type and "alpha-cd" build

Browse Source 
profile. Small changes by myself.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30832 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-05-23 22:19:30 +00:00
parent 396dd2edd3
commit a84f41d8a0
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MiscRules
+13 -4
View File
@@ -279,8 +279,9 @@ rule DefineBuildProfile name : type : path {
# <name> - The name of the build profile. # <name> - The name of the build profile.
# <type> - The type of the build profile. Must be one of "image" (plain # <type> - The type of the build profile. Must be one of "image" (plain
# disk image), "vmware-image" (VMware disk image), "disk" # disk image), "vmware-image" (VMware disk image), "disk"
# (actual partition or hard disk device), "install" (installation # (actual partition or hard disk device), "cd-image" (ISO CD
# in a directory), or "custom" (user-defined). # image), "install" (installation in a directory), or "custom"
# (user-defined).
# <path> - The path associated with the profile. Depending on the profile # <path> - The path associated with the profile. Depending on the profile
# type, this is the path to the disk image/VMware image, hard # type, this is the path to the disk image/VMware image, hard
# disk/partition device, or the installation directory. If the # disk/partition device, or the installation directory. If the
@@ -325,6 +326,14 @@ rule DefineBuildProfile name : type : path {
local startOffset ; local startOffset ;
switch $(type) { switch $(type) {
case "cd-image" : {
targetName ?= $(HAIKU_CD_NAME) ;
targetName ?= $(HAIKU_DEFAULT_CD_NAME) ;
HAIKU_CD_DIR = $(targetDir) ;
HAIKU_CD_NAME = $(targetName) ;
buildTarget = haiku-cd ;
}
case "image" : { case "image" : {
targetName ?= $(HAIKU_IMAGE_NAME) ; targetName ?= $(HAIKU_IMAGE_NAME) ;
targetName ?= $(HAIKU_DEFAULT_IMAGE_NAME) ; targetName ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
@@ -377,9 +386,9 @@ rule DefineBuildProfile name : type : path {
} }
case "mount" : { case "mount" : {
if $(type) = "install" { if $(type) in "install" "cd-image" {
Exit "Build action \"mount\" not supported for profile type" Exit "Build action \"mount\" not supported for profile type"
"\"install\"." ; "\"$(type)\"." ;
} }
local commandLine = :<build>bfs_shell $(startOffset) local commandLine = :<build>bfs_shell $(startOffset)
build/jam/ReleaseBuildProfiles
+1
View File
@@ -1,5 +1,6 @@
DefineBuildProfile alpha-raw : image : "haiku-alpha.image" ; DefineBuildProfile alpha-raw : image : "haiku-alpha.image" ;
DefineBuildProfile alpha-vmware : vmware-image : "haiku-alpha.vmdk" ; DefineBuildProfile alpha-vmware : vmware-image : "haiku-alpha.vmdk" ;
DefineBuildProfile alpha-cd : cd-image : "haiku-alpha.iso" ;
switch $(HAIKU_BUILD_PROFILE) { switch $(HAIKU_BUILD_PROFILE) {
case "alpha-*" : { case "alpha-*" : {