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

Reorganized BeZillaBrowser's if/else statements. Switched to a hardcoded url

Browse Source 
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
This commit is contained in:
Matt Madia
2010-04-30 19:06:46 +00:00
parent 4d6b1f03da
commit 7846d91843
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+15 -21
View File
@@ -230,32 +230,27 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
# BeZillaBrowser # BeZillaBrowser
if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] { if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] {
local sURL = http://haiku-files.org/files/sources ;
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package BeZillaBrowser available for $(TARGET_ARCH)" ; 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 { } else {
InstallOptionalHaikuImagePackage if $(HAIKU_GCC_VERSION[1]) >= 4 {
BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-03-14.zip InstallOptionalHaikuImagePackage
: $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-03-14.zip 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 AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser : /boot/apps/BeZillaBrowser/BeZillaBrowser
; ;
InstallSourceArchive BeZillaBrowser-2010-01-21-src.7z 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 AddSymlinkToHaikuImage home config be Applications
: /boot/apps/netsurf/NetSurf ; : /boot/apps/netsurf/NetSurf ;
local sURL = http://haiku-files.org/files/sources ;
InstallSourceArchive netsurf-r9862.7z InstallSourceArchive netsurf-r9862.7z
: $(sURL)/2010/netsurf-r9862.7z : http://haiku-files.org/files/sources/2010/netsurf-r9862.7z
; ;
} }
} }