From 7846d918430685065915889092ec3f858b05a91e Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Fri, 30 Apr 2010 19:06:46 +0000 Subject: [PATCH] Reorganized BeZillaBrowser's if/else statements. Switched to a hardcoded url for bezilla's and NetSurf's source archives, instead of defining a local variable (as installoptionalpackage didn't like it). No functional change. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36557 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 1abd9dc05c..ebe18d63bb 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -230,32 +230,27 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] { # BeZillaBrowser if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] { - local sURL = http://haiku-files.org/files/sources ; 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-03-14.zip - : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-03-14.zip - : - ; - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/BeZillaBrowser/BeZillaBrowser - ; - InstallSourceArchive BeZillaBrowser-2010-01-21-src.7z - : $(sURL)/2010/BeZillaBrowser-2010-01-21-src.7z - ; } else { - InstallOptionalHaikuImagePackage - BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-03-14.zip - : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-03-14.zip - : - ; + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-03-14.zip + : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-03-14.zip + : + ; + } else { + InstallOptionalHaikuImagePackage + BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-03-14.zip + : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-03-14.zip + : + ; + } AddSymlinkToHaikuImage home config be Applications : /boot/apps/BeZillaBrowser/BeZillaBrowser ; InstallSourceArchive BeZillaBrowser-2010-01-21-src.7z - : $(sURL)/2010/BeZillaBrowser-2010-01-21-src.7z + : http://haiku-files.org/files/sources/2010/BeZillaBrowser-2010-01-21-src.7z ; } } @@ -897,9 +892,8 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] { ; AddSymlinkToHaikuImage home config be Applications : /boot/apps/netsurf/NetSurf ; - local sURL = http://haiku-files.org/files/sources ; InstallSourceArchive netsurf-r9862.7z - : $(sURL)/2010/netsurf-r9862.7z + : http://haiku-files.org/files/sources/2010/netsurf-r9862.7z ; } }