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

Allow to suppress individual Optional Packages

Browse Source 
Add Jam rule SuppressOptionalHaikuImagePackages as a mechanism to keep
packages from being installed.

Extend the UserBuildConfig.ReadMe document to cover the new command.

Closes ticket #6260.

Changes from v1:
* Simplified IsOptionalHaikuImagePackageAdded as suggested by Ingo.
* Added example as documentation.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38100 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Andreas Färber
2010-08-14 16:43:55 +00:00
parent 2323e7fa92
commit 8b006b36e7
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+12 -1
View File
@@ -785,6 +785,16 @@ rule AddOptionalHaikuImagePackages packages
} }
} }
rule SuppressOptionalHaikuImagePackages packages
{
local package ;
for package in $(packages) {
if ! [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_SUPPRESSED) ] {
HAIKU_OPTIONAL_PACKAGE_SUPPRESSED on $(package) = 1 ;
}
}
}
rule IsOptionalHaikuImagePackageAdded package rule IsOptionalHaikuImagePackageAdded package
{ {
if ! [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_EXISTS) ] { if ! [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_EXISTS) ] {
@@ -792,7 +802,8 @@ rule IsOptionalHaikuImagePackageAdded package
HAIKU_EXISTING_OPTIONAL_PACKAGES += $(package) ; HAIKU_EXISTING_OPTIONAL_PACKAGES += $(package) ;
} }
if [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_ADDED) ] { if [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_ADDED) ] &&
! [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_SUPPRESSED) ] {
return 1 ; return 1 ;
} }
build/jam/UserBuildConfig.ReadMe
+6
View File
@@ -128,6 +128,12 @@ ExtractArchiveToHaikuImage develop tools
# via wget (i.e. wget must be installed). # via wget (i.e. wget must be installed).
AddOptionalHaikuImagePackages WonderBrush ; AddOptionalHaikuImagePackages WonderBrush ;
# Add the optional package WebPositive to the image but don't add its
# dependent SQLite optional package to the image. WebPositive still needs
# SQLite to run, this allows you to test a different version of it though.
AddOptionalHaikuImagePackages WebPositive ;
SuppressOptionalHaikuImagePackages SQLite ;
# Don't add the libraries built with the alternative gcc version. # Don't add the libraries built with the alternative gcc version.
# If the alternative gcc generated directory has been specified via the # If the alternative gcc generated directory has been specified via the
# configure option --alternative-gcc-output-dir, the libraries for the # configure option --alternative-gcc-output-dir, the libraries for the