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

* Include HaikuImage after the Jamfiles, so they can provide/adjust info

Browse Source 
relevant for the image creation.
* The CopySetHaikuRevision propagates the value of the
  HAIKU_INCLUDE_IN_IMAGE variable from the source to the target.
* Propagate the value of HAIKU_INCLUDE_IN_IMAGE from "kernel" to
  "kernel_$(TARGET_ARCH)".

Now "jam update-install kernel" should work as expected.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21527 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2007-06-29 19:28:11 +00:00
parent 677a72ede1
commit a970df44af
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jamfile
View File

@ -142,5 +142,8 @@ if $(HAIKU_DONT_INCLUDE_SRC) {
SubInclude HAIKU_TOP src ;
}
# specify the Haiku image contents
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
# Perform deferred SubIncludes.
ExecuteDeferredSubIncludes ;

3
Jamrules
View File

@ -45,6 +45,3 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildSetup ] ;
}
PrepareConfigVariables ;
# specify the Haiku image contents
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;

3
build/jam/FileRules
View File

@ -236,6 +236,9 @@ rule CopySetHaikuRevision target : source
Depends $(target) : $(svnEntries) ;
}
HAIKU_INCLUDE_IN_IMAGE on $(target)
= [ on $(source) return $(HAIKU_INCLUDE_IN_IMAGE) ] ;
Depends $(target) : <build>copyattr <build>set_haiku_revision $(source) ;
CopySetHaikuRevision1 $(target)
: <build>copyattr <build>set_haiku_revision $(source) ;

3
src/system/kernel/Jamfile
View File

@ -117,6 +117,9 @@ Depends kernel : kernel_$(TARGET_ARCH) ;
Depends kernel.so : kernel ;
# kernel.so will be rebuilt with the kernel
# propagate HAIKU_INCLUDE_IN_IMAGE variable from kernel to kernel_$(TARGET_ARCH)
HAIKU_INCLUDE_IN_IMAGE on kernel_$(TARGET_ARCH)
= [ on kernel return $(HAIKU_INCLUDE_IN_IMAGE) ] ;
# Copy kernel and update the copy's revision section. We link everything
# against the original, but the copy will end up on the disk image (this way