[haiku-commits] r35456 - haiku/trunk/build/jam

  • From: fredrik.holmqvist@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 12 Feb 2010 21:45:08 +0100 (CET)

Author: tqh
Date: 2010-02-12 21:45:08 +0100 (Fri, 12 Feb 2010)
New Revision: 35456
Changeset: http://dev.haiku-os.org/changeset/35456/haiku
Ticket: http://dev.haiku-os.org/ticket/3529

Modified:
   haiku/trunk/build/jam/OptionalPackageDependencies
   haiku/trunk/build/jam/OptionalPackages
   haiku/trunk/build/jam/ReleaseBuildProfiles
Log:
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.


Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies   2010-02-11 20:18:33 UTC 
(rev 35455)
+++ haiku/trunk/build/jam/OptionalPackageDependencies   2010-02-12 20:45:08 UTC 
(rev 35456)
@@ -9,6 +9,7 @@
 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 ;

Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-02-11 20:18:33 UTC (rev 
35455)
+++ haiku/trunk/build/jam/OptionalPackages      2010-02-12 20:45:08 UTC (rev 
35456)
@@ -21,6 +21,7 @@
 #      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 @@
 #      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 @@
 }
 
 
+# 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 @@
 
 # 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" ;
 }
 
 

Modified: haiku/trunk/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/trunk/build/jam/ReleaseBuildProfiles  2010-02-11 20:18:33 UTC (rev 
35455)
+++ haiku/trunk/build/jam/ReleaseBuildProfiles  2010-02-12 20:45:08 UTC (rev 
35456)
@@ -14,8 +14,8 @@
                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 ;


Other related posts:

  • » [haiku-commits] r35456 - haiku/trunk/build/jam - fredrik . holmqvist