Ticket #3529: BezillaBrowser.diff

build/jam/OptionalPackages

@@ -18 +18 @@
 #   BeBook
 #   BeHappy
 #   BePDF
+#   BezillaBrowser
 #   Bluetooth
 #   CVS
 #   Development
-#   Firefox
 #   Links
 #   NetSurf
 #   OpenSound
@@ -140 +140 @@
 }
 
 
+# BezillaBrowser
+if [ IsOptionalHaikuImagePackageAdded BezillaBrowser ] {
+    if $(TARGET_ARCH) != x86 {
+        Echo "No optional package BezillaBrowser available for $(TARGET_ARCH)" ;
+    } else if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) = 1 {
+        InstallOptionalHaikuImagePackage BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
+            : http://haiku-files.org/files/optional-packages/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
+            : apps
+        ;
+        AddSymlinkToHaikuImage home config be Applications
+            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
+
+
+    } else {
+        InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
+            : http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
+            : apps
+        ;
+        AddSymlinkToHaikuImage home config be Applications
+            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
+    }
+}
+
+
 # Bluetooth stack
 if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
     local bluetoothDrivers = h2generic ;
@@ -277 +301 @@
 }
 
 
-# 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 && $(isHybridBuild) = 0 {
-        InstallOptionalHaikuImagePackage BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
-            : http://haiku-files.org/files/optional-packages/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
-            : apps
-        ;
-        AddSymlinkToHaikuImage home config be Applications
-            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
-
-
-    } else {
-        InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
-            : http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
-            : apps
-        ;
-        AddSymlinkToHaikuImage home config be Applications
-            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
-    }
-}
-
-
 # Links web browser
 if [ IsOptionalHaikuImagePackageAdded Links ] {
     if $(TARGET_ARCH) != x86 {

build/jam/ReleaseBuildProfiles

@@ -11 +11 @@
         HAIKU_IMAGE_SIZE = 400 ;
         USE_SSL = 1 ;
 
-        AddOptionalHaikuImagePackages BePDF Firefox Pe Vision VLC WonderBrush ;
+        AddOptionalHaikuImagePackages BePDF BezillaBrowser Pe Vision VLC ;
+        AddOptionalHaikuImagePackages WonderBrush ;
         AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ;
         AddOptionalHaikuImagePackages Welcome BeBook ;
     }