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

Patch by mmadia, and originally jprostko.

Browse Source 
* moves Firefox's jam code to BeZillaBrowser
 * echos a warning on Firefox being phased out.
 * sets BeZillaBrowser as a dependency of Firefox 
The last two to ease transition from Firefox. This fixes #3529.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35456 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Fredrik Holmqvist
2010-02-12 20:45:08 +00:00
parent 8d6ef54c41
commit 8bb32d7ee0
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackageDependencies
+1
View File
@@ -9,6 +9,7 @@ OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies BeHappy : BeBook NetSurf ;
OptionalPackageDependencies Development : DevelopmentBase Perl ; OptionalPackageDependencies Development : DevelopmentBase Perl ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Firefox : BeZillaBrowser ;
OptionalPackageDependencies LibLayout : DevelopmentBase ; OptionalPackageDependencies LibLayout : DevelopmentBase ;
OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ; OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;
OptionalPackageDependencies OpenSSH : OpenSSL ; OptionalPackageDependencies OpenSSH : OpenSSL ;
build/jam/OptionalPackages
+29 -20
View File
@@ -21,6 +21,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# BeHappy - special documentation (i.e. BeBook) browser # BeHappy - special documentation (i.e. BeBook) browser
# BeOSCompatibility - creates links within the system to support old apps # BeOSCompatibility - creates links within the system to support old apps
# BePDF - native PDF reader # BePDF - native PDF reader
# BeZillaBrowser - fork of Mozilla's 1.8 branch.
# Bluetooth - experimental Haiku components for Bluetooth # Bluetooth - experimental Haiku components for Bluetooth
# CDRecord - the command line CD writing tools # CDRecord - the command line CD writing tools
# Clockwerk - native audio/video compositing # Clockwerk - native audio/video compositing
@@ -32,7 +33,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# 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
# Expat - XML parsing libraries # Expat - XML parsing libraries
# Firefox - the webbrowser # Firefox - the webbrowser NOTE: will be removed soon.
# Git - the distributed version control system # Git - the distributed version control system
# ICU-devel - the headers for ICU (for development) # ICU-devel - the headers for ICU (for development)
# KeymapSwitcher - Desktop utility # KeymapSwitcher - Desktop utility
@@ -208,6 +209,31 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
} }
# BeZillaBrowser
if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BeZillaBrowser available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27
: $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
} else {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27
: $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
}
}
# Bluetooth stack # Bluetooth stack
if [ IsOptionalHaikuImagePackageAdded Bluetooth ] { if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
local bluetoothDrivers = h2generic ; local bluetoothDrivers = h2generic ;
@@ -519,25 +545,8 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
# Firefox web browser # Firefox web browser
if [ IsOptionalHaikuImagePackageAdded Firefox ] { if [ IsOptionalHaikuImagePackageAdded Firefox ] {
if $(TARGET_ARCH) != x86 { Echo "Warning: The optional package Firefox is being replaced with"
Echo "No optional package Firefox available for $(TARGET_ARCH)" ; "BeZillaBrowser" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27
: $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
} else {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27
: $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
}
} }
build/jam/ReleaseBuildProfiles
+2 -2
View File
@@ -14,8 +14,8 @@ switch $(HAIKU_BUILD_PROFILE) {
HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 650 ; HAIKU_IMAGE_SIZE = 650 ;
AddOptionalHaikuImagePackages BePDF Clockwerk Firefox Pe Vision VLC AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe Vision
WonderBrush ; VLC WonderBrush ;
AddOptionalHaikuImagePackages CVS Development Git Mercurial AddOptionalHaikuImagePackages CVS Development Git Mercurial
Python Subversion OpenSSH ; Python Subversion OpenSSH ;
AddOptionalHaikuImagePackages Nano P7zip Welcome BeBook ; AddOptionalHaikuImagePackages Nano P7zip Welcome BeBook ;