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

* Introduced "MandatoryPackages", which is added to all default images

Browse Source 
* Renamed "BasicCommandLinesTools" to "Sed"
 * Removed isCDPackage's parameter from "Sed"s InstallOptionalHaikuImagePackage
 * Currently, "MandatoryPackages" only dependency is "Sed"
 * Fixes #5560


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35829 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-03-12 18:03:57 +00:00
parent 0fee9c60ae
commit a5c31cbbc0
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jamfile
View File

@ -157,6 +157,9 @@ if $(HAIKU_ADD_OPTIONAL_PACKAGES) {
[ FSplitString $(HAIKU_ADD_OPTIONAL_PACKAGES) : / ] ; [ FSplitString $(HAIKU_ADD_OPTIONAL_PACKAGES) : / ] ;
} }
#include packages that are required by all images.
AddOptionalHaikuImagePackages MandatoryPackages ;
# Evaluate optional package dependencies and prepare the optional build # Evaluate optional package dependencies and prepare the optional build
# features before parsing the Jamfile tree. # features before parsing the Jamfile tree.
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;

1
build/jam/OptionalPackageDependencies
View File

@ -17,6 +17,7 @@ OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ; OptionalPackageDependencies Mercurial : Python ;
OptionalPackageDependencies Git : Expat Curl OpenSSL ; OptionalPackageDependencies Git : Expat Curl OpenSSL ;
OptionalPackageDependencies Curl : OpenSSL ; OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies MandatoryPackages : Sed ;
OptionalPackageDependencies NetFS : UserlandFS ; OptionalPackageDependencies NetFS : UserlandFS ;
OptionalPackageDependencies Vim : LibIconv ; OptionalPackageDependencies Vim : LibIconv ;
OptionalPackageDependencies XZ-Utils : Tar ; OptionalPackageDependencies XZ-Utils : Tar ;

30
build/jam/OptionalPackages
View File

@ -15,7 +15,6 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# ABI-compliance-checker - tool for checking ABI compatibility between libs # ABI-compliance-checker - tool for checking ABI compatibility between libs
# APR - support libraries used for example by Subversion # APR - support libraries used for example by Subversion
# APR-util - Apache portable runtime utility library # APR-util - Apache portable runtime utility library
# BasicCommandLineTools - basic commandline tools
# Beam - powerful native e-mail client # Beam - powerful native e-mail client
# BeBook - the classic BeOS API documentation # BeBook - the classic BeOS API documentation
# BeHappy - special documentation (i.e. BeBook) browser # BeHappy - special documentation (i.e. BeBook) browser
@ -55,6 +54,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# Perl - the scripting language # Perl - the scripting language
# Python - the scripting language # Python - the scripting language
# Rsync - remote directory synchronization # Rsync - remote directory synchronization
# Sed - the ultimate stream editor
# SQLite - the database implementation # SQLite - the database implementation
# Subversion - the version control system # Subversion - the version control system
# Tar - archiving utility # Tar - archiving utility
@ -110,20 +110,6 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
} }
# BasicCommandLineTools
if [ IsOptionalHaikuImagePackageAdded BasicCommandLineTools ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BasicCommandLineTools available for $(TARGET_ARCH)" ;
} else {
# sed
InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
: $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
:
: true ;
}
}
# Beam # Beam
if [ IsOptionalHaikuImagePackageAdded Beam ] { if [ IsOptionalHaikuImagePackageAdded Beam ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
@ -928,6 +914,20 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] {
} }
# Sed
if [ IsOptionalHaikuImagePackageAdded Sed ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Sed available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
: $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
:
:
;
}
}
# SQLite # SQLite
if [ IsOptionalHaikuImagePackageAdded SQLite ] { if [ IsOptionalHaikuImagePackageAdded SQLite ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {

2
build/jam/ReleaseBuildProfiles
View File

@ -14,7 +14,6 @@ switch $(HAIKU_BUILD_PROFILE) {
HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 650 ; HAIKU_IMAGE_SIZE = 650 ;
AddOptionalHaikuImagePackages BasicCommandLineTools ;
AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe Vision AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe Vision
VLC WonderBrush ; VLC WonderBrush ;
AddOptionalHaikuImagePackages CVS Development Git Mercurial AddOptionalHaikuImagePackages CVS Development Git Mercurial
@ -34,7 +33,6 @@ switch $(HAIKU_BUILD_PROFILE) {
HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 450 ; HAIKU_IMAGE_SIZE = 450 ;
AddOptionalHaikuImagePackages BasicCommandLineTools ;
AddOptionalHaikuImagePackages Pe Nano Vision P7zip ; AddOptionalHaikuImagePackages Pe Nano Vision P7zip ;
AddOptionalHaikuImagePackages Development Subversion OpenSSH ; AddOptionalHaikuImagePackages Development Subversion OpenSSH ;
} }