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

Adjust handling of package infos.

Browse Source 
* add HAIKU_PACKAGING_ARCH, which is set to the target packaging 
  architecture
* introduce support for generic package infos, which are package infos
  that are the same for all architectures, except for the declaration
  of the package architecture itself
* move package info files underneath architecture-specific or generic
  folder
This commit is contained in:
Oliver Tappe
2013-06-04 00:24:37 +02:00
parent 6c36ad168e
commit 59e2e2f3a7
10 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/PackageRules
+7 -1
View File
@@ -298,7 +298,11 @@ rule BuildHaikuPackage package : packageInfo
# locate the package and package info
MakeLocate $(package) : $(HAIKU_PACKAGES_DIR) ;
SEARCH on $(packageInfo) += $(HAIKU_PACKAGE_INFOS_DIR) ;
SEARCH on $(packageInfo) +=
[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) $(HAIKU_PACKAGING_ARCH) ]
[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) any ]
[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) generic ]
;
LocalDepends $(package) : $(packageInfo) ;
# prepare the script that initializes the shell variables
@@ -316,6 +320,8 @@ rule BuildHaikuPackage package : packageInfo
: [ on $(package) return $(HAIKU_PACKAGE_COMPRESSION_LEVEL) ] ;
AddVariableToScript $(script) : updateOnly
: [ on $(package) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] ;
AddVariableToScript $(script) : cc : $(TARGET_CC) ;
AddVariableToScript $(script) : packagingArch : $(HAIKU_PACKAGING_ARCH) ;
AddTargetVariableToScript $(script) : <build>addattr ;
AddTargetVariableToScript $(script) : <build>copyattr ;
AddTargetVariableToScript $(script) : <mimedb>mime_db : mimeDB ;