From 7b2a8eeb1c47ac9eae71d9965f68eda6676b362a Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sun, 6 Mar 2011 15:38:20 +0000 Subject: [PATCH] Refactored a bit, to reduce duplicate commands. No functional change. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40845 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 94 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 2c8b16a97a..2faf2ad5ae 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -174,14 +174,14 @@ if [ IsOptionalHaikuImagePackageAdded Bazaar ] { if [ IsOptionalHaikuImagePackageAdded BeAE ] { if $(TARGET_ARCH) != x86 { Echo "No optional package BeAE available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip - : $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip ; - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/BeAE/BeAE ; } else { - InstallOptionalHaikuImagePackage beae-22-x86-gcc2-2010-09-15.zip - : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip ; + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip + : $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip ; + } else { + InstallOptionalHaikuImagePackage beae-22-x86-gcc2-2010-09-15.zip + : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip ; + } AddSymlinkToHaikuImage home config be Applications : /boot/apps/BeAE/BeAE ; } @@ -322,14 +322,14 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] { if [ IsOptionalHaikuImagePackageAdded BurnItNow ] { if $(TARGET_ARCH) != x86 { Echo "No optional package BurnItNow available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage burnitnow-39-x86-gcc4-2010-09-15.zip - : $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip ; - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/BurnItNow/BurnItNow ; } else { + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage burnitnow-39-x86-gcc4-2010-09-15.zip + : $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip ; + } else { InstallOptionalHaikuImagePackage burnitnow-39-x86-gcc2-2010-09-15.zip : $(baseURL)/burnitnow-39-x86-gcc2-2010-09-15.zip ; + } AddSymlinkToHaikuImage home config be Applications : /boot/apps/BurnItNow/BurnItNow ; } @@ -379,16 +379,16 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] { if [ IsOptionalHaikuImagePackageAdded Clockwerk ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Clockwerk available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage - Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip - : $(baseURL)/Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip ; - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/Clockwerk/Clockwerk ; } else { - InstallOptionalHaikuImagePackage - Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip - : $(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip ; + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip + : $(baseURL)/Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip ; + } else { + InstallOptionalHaikuImagePackage + Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip + : $(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip ; + } AddSymlinkToHaikuImage home config be Applications : /boot/apps/Clockwerk/Clockwerk ; } @@ -904,16 +904,16 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] { if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] { if $(TARGET_ARCH) != x86 { Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage - KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip - : $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip ; - AddSymlinkToHaikuImage home config be Desktop\ applets - : /boot/common/bin/KeymapSwitcher ; } else { - InstallOptionalHaikuImagePackage - KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip - : $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip ; + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip + : $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip ; + } else { + InstallOptionalHaikuImagePackage + KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip + : $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip ; + } AddSymlinkToHaikuImage home config be Desktop\ applets : /boot/common/bin/KeymapSwitcher ; } @@ -1575,18 +1575,16 @@ if [ IsOptionalHaikuImagePackageAdded UserlandFS ] { if [ IsOptionalHaikuImagePackageAdded Vim ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Vim available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage vim-7.3-x86-gcc4-2010-08-22.zip - : $(baseURL)/vim-7.3-x86-gcc4-2010-08-22.zip - : : true ; - AddSymlinkToHaikuImage home config be Applications - : /boot/common/bin/gvim ; - # TODO: move this symlink to the archive - AddSymlinkToHaikuImage common bin : vim : vi ; } else { - InstallOptionalHaikuImagePackage vim-7.3-x86-gcc2-2010-08-22.zip - : $(baseURL)/vim-7.3-x86-gcc2-2010-08-22.zip - : : true ; + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage vim-7.3-x86-gcc4-2010-08-22.zip + : $(baseURL)/vim-7.3-x86-gcc4-2010-08-22.zip + : : true ; + } else { + InstallOptionalHaikuImagePackage vim-7.3-x86-gcc2-2010-08-22.zip + : $(baseURL)/vim-7.3-x86-gcc2-2010-08-22.zip + : : true ; + } AddSymlinkToHaikuImage home config be Applications : /boot/common/bin/gvim ; # TODO: move this symlink to the archive @@ -1599,14 +1597,14 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] { if [ IsOptionalHaikuImagePackageAdded Vision ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Vision available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-11-14.zip - : $(baseURL)/vision-908-x86-gcc4-2010-11-14.zip ; - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/Vision/Vision ; } else { - InstallOptionalHaikuImagePackage vision-908-x86-gcc2-2010-10-30.zip - : $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip ; + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-11-14.zip + : $(baseURL)/vision-908-x86-gcc4-2010-11-14.zip ; + } else { + InstallOptionalHaikuImagePackage vision-908-x86-gcc2-2010-10-30.zip + : $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip ; + } AddSymlinkToHaikuImage home config be Applications : /boot/apps/Vision/Vision ; }