From 8bb32d7ee00ae03c76275fe110ecbaa04a5a9d20 Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Fri, 12 Feb 2010 20:45:08 +0000 Subject: [PATCH] Patch by mmadia, and originally jprostko. * 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 --- build/jam/OptionalPackageDependencies | 1 + build/jam/OptionalPackages | 49 ++++++++++++++++----------- build/jam/ReleaseBuildProfiles | 4 +-- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index 1c9b7eaff0..fb1d616d6f 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -9,6 +9,7 @@ OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ; OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies Development : DevelopmentBase Perl ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; +OptionalPackageDependencies Firefox : BeZillaBrowser ; OptionalPackageDependencies LibLayout : DevelopmentBase ; OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ; OptionalPackageDependencies OpenSSH : OpenSSL ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index a54af93407..2ca1cf7ece 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -21,6 +21,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { # BeHappy - special documentation (i.e. BeBook) browser # BeOSCompatibility - creates links within the system to support old apps # BePDF - native PDF reader +# BeZillaBrowser - fork of Mozilla's 1.8 branch. # Bluetooth - experimental Haiku components for Bluetooth # CDRecord - the command line CD writing tools # 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,...) # DevelopmentMin - development headers, libs, tools, from sources only # Expat - XML parsing libraries -# Firefox - the webbrowser +# Firefox - the webbrowser NOTE: will be removed soon. # Git - the distributed version control system # ICU-devel - the headers for ICU (for development) # 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 if [ IsOptionalHaikuImagePackageAdded Bluetooth ] { local bluetoothDrivers = h2generic ; @@ -519,25 +545,8 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] { # Firefox web browser if [ IsOptionalHaikuImagePackageAdded Firefox ] { - if $(TARGET_ARCH) != x86 { - Echo "No optional package Firefox 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 ; - } + Echo "Warning: The optional package Firefox is being replaced with" + "BeZillaBrowser" ; } diff --git a/build/jam/ReleaseBuildProfiles b/build/jam/ReleaseBuildProfiles index 02d38b9071..a8752cc8e7 100644 --- a/build/jam/ReleaseBuildProfiles +++ b/build/jam/ReleaseBuildProfiles @@ -14,8 +14,8 @@ switch $(HAIKU_BUILD_PROFILE) { HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_SIZE = 650 ; - AddOptionalHaikuImagePackages BePDF Clockwerk Firefox Pe Vision VLC - WonderBrush ; + AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe Vision + VLC WonderBrush ; AddOptionalHaikuImagePackages CVS Development Git Mercurial Python Subversion OpenSSH ; AddOptionalHaikuImagePackages Nano P7zip Welcome BeBook ;