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

Add AddPackageFilesToHaikuImage rule

Browse Source
This commit is contained in:
Ingo Weinhold
2013-04-29 16:13:03 +02:00
parent 58081381ea
commit 5d41bc9af9
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1 -1
View File
@@ -200,7 +200,7 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs
# build the haiku system package and add it # build the haiku system package and add it
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ;
AddFilesToHaikuImage system packages : haiku.hpkg ; AddPackageFilesToHaikuImage system : haiku.hpkg ;
AddSymlinkToHaikuImage . : /boot/common/apps ; AddSymlinkToHaikuImage . : /boot/common/apps ;
build/jam/ImageRules
+5
View File
@@ -862,6 +862,11 @@ rule AddBootModuleSymlinksToHaikuImage targets
: $(targets) ; : $(targets) ;
} }
rule AddPackageFilesToHaikuImage location : packages
{
AddFilesToHaikuImage $(location) packages : $(packages) ;
}
rule AddOptionalHaikuImagePackages packages rule AddOptionalHaikuImagePackages packages
{ {
local package ; local package ;
build/jam/OptionalPackages
+4 -4
View File
@@ -579,8 +579,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
$(HAIKU_GCC_VERSION[1]) ; $(HAIKU_GCC_VERSION[1]) ;
} }
AddFilesToHaikuImage system packages : haiku_devel.hpkg ; AddPackageFilesToHaikuImage system : haiku_devel.hpkg ;
AddFilesToHaikuImage common packages : makefile_engine.hpkg ; AddPackageFilesToHaikuImage common : makefile_engine.hpkg ;
} }
@@ -1515,8 +1515,8 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
# Welcome # Welcome
if [ IsOptionalHaikuImagePackageAdded Welcome ] { if [ IsOptionalHaikuImagePackageAdded Welcome ] {
AddFilesToHaikuImage system packages : haiku_userguide.hpkg ; AddPackageFilesToHaikuImage system : haiku_userguide.hpkg ;
AddFilesToHaikuImage system packages : haiku_welcome.hpkg ; AddPackageFilesToHaikuImage system : haiku_welcome.hpkg ;
AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome
: Welcome ; : Welcome ;