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

* Added small description to all OptionalPackages at the top.

Browse Source 
* Replaced Pe GCC4 package with one that works again after the BToolTip
  addition.
* Disabled Firefox and Vision GCC4 packages for the time being, so that one
  at least gets a working hybrid installation.
* Added Clockwerk GCC2 and GCC4 packages. I also added it to the alpha
  release build profile, so that people testing the pre-alpha images have
  more easy access to it. I am not sure if it should stay there, since it may
  not be polished enough. Feedback welcome! :-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32112 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-08-04 16:25:24 +00:00
parent 1e4b23dae2
commit 9be5fa8055
2 changed files with 92 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
build/jam/OptionalPackages
View File

@ -12,47 +12,48 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# Available Optional Packages: # Available Optional Packages:
# APR # APR - support libraries used for example by SVN
# APR-util # APR-util
# Beam # Beam - powerful native e-mail client
# BeBook # BeBook - the classic BeOS API documentation
# BeHappy # BeHappy - special documentation (i.e. BeBook) browser
# BeOSCompatibility # BeOSCompatibility - creates links within the system to support old apps
# BePDF # BePDF - native PDF reader
# Bluetooth # Bluetooth - experimental Haiku components for Bluetooth
# CDRecord # CDRecord - the command line CD writing tools
# CLucene # Clockwerk - native audio/video compositing
# CVS # CLucene - indexed file search
# CVS - the version control system
# Development - more complete dev environment (including autotools) # Development - more complete dev environment (including autotools)
# DevelopmentBase - basic development environment (gcc, headers, libs,...) # DevelopmentBase - basic development environment (gcc, headers, libs,...)
# DevelopmentMin - development headers, libs, tools, from sources only # DevelopmentMin - development headers, libs, tools, from sources only
# Firefox # Firefox - the webbrowser
# KeymapSwitcher # KeymapSwitcher - Desktop utility
# LibIconv # LibIconv - text encoding conversion library
# LibLayout # LibLayout - GCC2 package needed by some BeOS apps to compile
# LibXML2 # LibXML2 - the XML support libary
# Links # Links - the web browser
# Nano # Nano - the command line text editor
# Neon # Neon - support libraries used for example by SVN
# NetSurf # NetSurf - the web browser
# OpenSound # OpenSound - additional audio driver package
# OpenSSH # OpenSSH - the secure shell
# OpenSSL # OpenSSL - secure sockets library
# P7zip # P7zip - file archiving utility
# Pe # Pe - the powerful native Programmer's Editor
# Perl # Perl - the scripting language
# Python # Python - the scripting language
# Rsync # Rsync - remote directory synchronization
# SQLite # SQLite - the database implementation
# Subversion # Subversion - the version control system
# Tar # Tar - archiving utility
# UserlandFS # UserlandFS - aids native file system development (like FUSE)
# Vim # Vim - the command line text editor
# Vision # Vision - powerful native IRC client
# VLC # VLC - the multi media player with native interface
# Welcome # Welcome - introductory documentation to Haiku
# WonderBrush # WonderBrush - native graphics application
# Yasm # Yasm - the assembler utility
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
@ -198,6 +199,28 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
} }
# Clockwerk
if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Clockwerk available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage Clockwerk-0.0.1-2009-08-04
: $(baseURL)/Clockwerk-0.0.1-x86-gcc4-2009-08-04.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Clockwerk/Clockwerk ;
} else {
InstallOptionalHaikuImagePackage Clockwerk-0.0.1-2009-08-04
: $(baseURL)/Clockwerk-0.0.1-x86-gcc2-2009-08-04.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Clockwerk/Clockwerk ;
}
}
# CLucene # CLucene
if [ IsOptionalHaikuImagePackageAdded CLucene ] { if [ IsOptionalHaikuImagePackageAdded CLucene ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
@ -375,16 +398,19 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
if [ IsOptionalHaikuImagePackageAdded Firefox ] { if [ IsOptionalHaikuImagePackageAdded Firefox ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Firefox available for $(TARGET_ARCH)" ; Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { # TODO: Update BeZilla GCC4 build, this one is currently broken, because of
InstallOptionalHaikuImagePackage # the BToolTip addition. At least the GCC2 build will work just fine on hybrid
BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01 # installations.
: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip # } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
: apps # InstallOptionalHaikuImagePackage
; # BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
AddSymlinkToHaikuImage home config be Applications # : $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
: /boot/apps/BeZillaBrowser/BeZillaBrowser ; # : apps
# ;
# AddSymlinkToHaikuImage home config be Applications
# : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Firefox available for GCC4" ;
} else { } else {
InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218 InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
: http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip : http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
@ -600,8 +626,8 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
Echo "No optional package Pe available for $(TARGET_ARCH)" ; Echo "No optional package Pe available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-07-05 InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-08-04
: $(baseURL)/Pe-2.4.2-x86-gcc4-2009-07-05.zip : $(baseURL)/Pe-2.4.2-x86-gcc4-2009-08-04.zip
; ;
} else { } else {
InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc2-2009-07-05 InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc2-2009-07-05
@ -774,13 +800,18 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
if [ IsOptionalHaikuImagePackageAdded Vision ] { if [ IsOptionalHaikuImagePackageAdded Vision ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Vision available for $(TARGET_ARCH)" ; Echo "No optional package Vision available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { # TODO: Update Vision GCC4 build, this one is currently broken, because of
InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423 # the BToolTip addition. At least the GCC2 build will work just fine on hybrid
: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip # installations.
: apps # } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
; # InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
AddSymlinkToHaikuImage home config be Applications # : $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
: /boot/apps/Vision-0.9.7-H-090423/Vision ; # : apps
# ;
# AddSymlinkToHaikuImage home config be Applications
# : /boot/apps/Vision-0.9.7-H-090423/Vision ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Vision available for GCC4" ;
} else { } else {
InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423 InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
: $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip : $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip

3
build/jam/ReleaseBuildProfiles
View File

@ -11,7 +11,8 @@ switch $(HAIKU_BUILD_PROFILE) {
HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 500 ; HAIKU_IMAGE_SIZE = 500 ;
AddOptionalHaikuImagePackages BePDF Firefox Pe Vision VLC WonderBrush ; AddOptionalHaikuImagePackages BePDF Clockwerk Firefox Pe Vision VLC
WonderBrush ;
AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ; AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ;
AddOptionalHaikuImagePackages Welcome BeBook ; AddOptionalHaikuImagePackages Welcome BeBook ;
} }