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

Simplify use of InstallOptionalHaikuImagePackage

Browse Source 
When invoked for a hpkg only the installation location (i.e. "common"
or "system") has to be specified now and "common" is the default. The
rule uses AddPackageFilesToHaikuImage now.
This commit is contained in:
Ingo Weinhold
2013-04-29 17:28:18 +02:00
parent 5d41bc9af9
commit 4fd280ddfa
2 changed files with 70 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+14 -1
View File
@@ -927,16 +927,29 @@ rule InstallSourceArchive file : url
rule InstallOptionalHaikuImagePackage url : dirTokens : isCDPackage
{
# TODO: Remove the non-hpkg cases!
# Currently the semantics differs depending on isCDPackage and the type of
# the package file:
# * For a hpkg <dirTokens> is "common" (default) or "system" and specifies
# the installation location of the package (will be copied to the
# packages/ subdirectory).
# * For a regular archive and isCDPackage true, <dirTokens> is ignored and
# the package will be copied to the _package_ directory of the CD image.
# * For a regular archive and isCDPackage false, <dirTokens> specifies the
# directory relative to the image's root directory where the content of
# the archive will be extracted to.
local package = $(url:BS) ;
# download archive file
local archiveFile = [ DownloadFile $(package) : $(url) ] ;
if $(package:S) = .hpkg {
local location = $(dirTokens:E=common) ;
if $(HAIKU_UPDATE_ALL_PACKAGES) {
HAIKU_INCLUDE_IN_IMAGE on $(archiveFile) = 1 ;
}
AddFilesToHaikuImage $(dirTokens) : $(archiveFile) ;
AddPackageFilesToHaikuImage $(location) : $(archiveFile) ;
} else if ( $(isCDPackage) = true || $(isCDPackage) = 1 )
&& $(HAIKU_CD_NAME) {
# TODO: If HAIKU_CD_NAME is set, that doesn't mean we're building a CD