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

Create "anyboot-image" and define build profile rules to utilize it.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35871 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-03-15 23:51:45 +00:00
parent b3a0c3e552
commit 26b5ececca
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/AnybootImage
+17 -14
View File
@@ -1,3 +1,9 @@
# Set anyboot file name and directory defaults.
HAIKU_ANYBOOT_NAME ?= $(HAIKU_DEFAULT_ANYBOOT_NAME) ;
HAIKU_ANYBOOT_DIR ?= $(HAIKU_DEFAULT_ANYBOOT_DIR) ;
HAIKU_ANYBOOT = $(HAIKU_ANYBOOT_NAME) ;
HAIKU_ANYBOOT_LABEL ?= $(HAIKU_DEFAULT_ANYBOOT_LABEL) ;
rule BuildAnybootMBR binary : source { rule BuildAnybootMBR binary : source {
Depends $(binary) : $(source) ; Depends $(binary) : $(source) ;
@@ -11,14 +17,6 @@ actions BuildAnybootMBR1 {
$(TARGET_CC) $(MBR_SOURCE) -o $(1) -nostdlib -Xlinker --oformat=binary -Xlinker -S -Xlinker -N -Xlinker "-e start" -Xlinker "-Ttext=0x600" $(TARGET_CC) $(MBR_SOURCE) -o $(1) -nostdlib -Xlinker --oformat=binary -Xlinker -S -Xlinker -N -Xlinker "-e start" -Xlinker "-Ttext=0x600"
} }
local baseMBR = base_mbr.bin ;
local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.S ] ;
BuildAnybootMBR $(baseMBR) : $(mbrSource) ;
MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ;
rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile { rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile {
local anyboot = <build>anyboot ; local anyboot = <build>anyboot ;
@@ -34,14 +32,19 @@ actions BuildAnybootImage1 {
$(2[1]) $(1) $(2[2]) $(2[3]) $(2[4]) $(2[1]) $(1) $(2[2]) $(2[3]) $(2[4])
} }
HAIKU_ANYBOOT_IMAGE = haiku-anyboot.image ; local baseMBR = base_mbr.bin ;
MakeLocate $(HAIKU_ANYBOOT_IMAGE) : $(HAIKU_OUTPUT_DIR) ; local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.S ] ;
BuildAnybootMBR $(baseMBR) : $(mbrSource) ;
BuildAnybootImage $(HAIKU_ANYBOOT_IMAGE) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE) MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ;
MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ;
BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE)
: $(HAIKU_IMAGE_NAME) ; : $(HAIKU_IMAGE_NAME) ;
# TODO: this one seems to cause the build to fail each other run (caching?) # TODO: this one seems to cause the build to fail each other run (caching?)
#RmTemps $(HAIKU_ANYBOOT_IMAGE) : $(baseMBR) ; #RmTemps $(HAIKU_ANYBOOT) : $(baseMBR) ;
RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_CD_BOOT_IMAGE) ;
RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_IMAGE_NAME) ;
RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_BOOT_FLOPPY) ;
NotFile haiku-anyboot-image ; NotFile haiku-anyboot-image ;
Depends haiku-anyboot-image : $(HAIKU_ANYBOOT_IMAGE) ; Depends haiku-anyboot-image : $(HAIKU_ANYBOOT) ;
build/jam/BuildSetup
+5
View File
@@ -73,6 +73,11 @@ HAIKU_DEFAULT_CD_NAME = haiku-cd.iso ;
HAIKU_DEFAULT_CD_DIR = $(HAIKU_OUTPUT_DIR) ; HAIKU_DEFAULT_CD_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_CD_LABEL = Haiku ; HAIKU_DEFAULT_CD_LABEL = Haiku ;
# Haiku Anyboot defaults
HAIKU_DEFAULT_ANYBOOT_NAME = haiku-anyboot.image ;
HAIKU_DEFAULT_ANYBOOT_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_ANYBOOT_LABEL ?= Haiku ;
# analyze and optionally replace jam's target parameters # analyze and optionally replace jam's target parameters
ProcessCommandLineArguments ; ProcessCommandLineArguments ;
build/jam/MiscRules
+8
View File
@@ -326,6 +326,14 @@ rule DefineBuildProfile name : type : path {
local startOffset ; local startOffset ;
switch $(type) { switch $(type) {
case "anyboot-image" : {
targetName ?= $(HAIKU_ANYBOOT_NAME) ;
targetName ?= $(HAIKU_DEFAULT_ANYBOOT_NAME) ;
HAIKU_ANYBOOT_DIR = $(targetDir) ;
HAIKU_ANYBOOT_NAME = $(targetName) ;
buildTarget = haiku-anyboot-image ;
}
case "cd-image" : { case "cd-image" : {
targetName ?= $(HAIKU_CD_NAME) ; targetName ?= $(HAIKU_CD_NAME) ;
targetName ?= $(HAIKU_DEFAULT_CD_NAME) ; targetName ?= $(HAIKU_DEFAULT_CD_NAME) ;
build/jam/ReleaseBuildProfiles
+4
View File
@@ -1,9 +1,13 @@
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" ; DefineBuildProfile alpha-cd : cd-image : "haiku-alpha.iso" ;
DefineBuildProfile alpha-anyboot : anyboot-image
: "haiku-alpha-anyboot.image" ;
DefineBuildProfile nightly-raw : image : "haiku-nightly.image" ; DefineBuildProfile nightly-raw : image : "haiku-nightly.image" ;
DefineBuildProfile nightly-vmware : vmware-image : "haiku-nightly.vmdk" ; DefineBuildProfile nightly-vmware : vmware-image : "haiku-nightly.vmdk" ;
DefineBuildProfile nightly-cd : cd-image : "haiku-nightly.iso" ; DefineBuildProfile nightly-cd : cd-image : "haiku-nightly.iso" ;
DefineBuildProfile nightly-anyboot : anyboot-image
: "haiku-nightly-anyboot.image" ;
switch $(HAIKU_BUILD_PROFILE) { switch $(HAIKU_BUILD_PROFILE) {
case "alpha-*" : { case "alpha-*" : {