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

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 6 Mar 2011 16:38:21 +0100 (CET)

Author: mmadia
Date: 2011-03-06 16:38:20 +0100 (Sun, 06 Mar 2011)
New Revision: 40845
Changeset: http://dev.haiku-os.org/changeset/40845

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Refactored a bit, to reduce duplicate commands. No functional change.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2011-03-06 15:10:31 UTC (rev 
40844)
+++ haiku/trunk/build/jam/OptionalPackages      2011-03-06 15:38:20 UTC (rev 
40845)
@@ -174,14 +174,14 @@
 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 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 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 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 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 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 ;
        }


Other related posts:

  • » [haiku-commits] r40845 - haiku/trunk/build/jam - mattmadia