From d8a9d43683059b43dd482e940358b2f3bf5a52f1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 30 Oct 2010 07:19:02 +0000 Subject: [PATCH] Added gcc2 armyknife and stable vision packages. TODO: Create fresh gcc4 packages for armyknife, vision and taglib. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39193 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackageDependencies | 1 + build/jam/OptionalPackages | 43 +++++++++++++++++++++------ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index c0f384cf0c..787dea6656 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -5,6 +5,7 @@ # dependencies. OptionalPackageDependencies APR-util : APR Expat ; +OptionalPackageDependencies ArmyKnife : TagLib ; OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ; OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies BurnItNow : CDRecord ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index f0ac2381c1..e6bca33aee 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -16,6 +16,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1 # ABI-compliance-checker - tool for checking ABI compatibility between libs # APR - support libraries used for example by Subversion # APR-util - Apache portable runtime utility library +# ArmyKnife - tool for editing audio file metadata and attributes # Bazaar - the distributed version control system # BeAE - open source Audio Editor # Beam - powerful native e-mail client @@ -137,6 +138,29 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] { } +# ArmyKnife +if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] { + if $(TARGET_ARCH) != x86 { + Echo "No optional package ArmyKnife available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + Echo "No optional package ArmyKnife for gcc4" ; +# InstallOptionalHaikuImagePackage armyknife-61-x86-gcc4-2010-10-30.zip +# : $(baseURL)/armyknife-61-x86-gcc4-2010-10-30.zip +# : +# ; +# AddSymlinkToHaikuImage home config be Applications +# : /boot/apps/ArmyKnife/ArmyKnife ; + } else { + InstallOptionalHaikuImagePackage armyknife-61-x86-gcc2-2010-10-30.zip + : $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip + : + ; + AddSymlinkToHaikuImage home config be Applications + : /boot/apps/ArmyKnife/ArmyKnife ; + } +} + + # Bazaar if [ IsOptionalHaikuImagePackageAdded Bazaar ] { if $(TARGET_ARCH) != x86 { @@ -1587,19 +1611,20 @@ 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-0.9.7-H-x86-gcc4-2010-05-22.zip - : $(baseURL)/Vision-0.9.7-H-x86-gcc4-2010-05-22.zip - : - ; - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/Vision-0.9.7-H-090423/Vision ; + Echo "No optional package Vision for gcc4" ; +# InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-10-30.zip +# : $(baseURL)/vision-908-x86-gcc4-2010-10-30.zip +# : +# ; +# AddSymlinkToHaikuImage home config be Applications +# : /boot/apps/Vision/Vision ; } else { - InstallOptionalHaikuImagePackage Vision-0.9.7-H-x86-gcc2-2010-05-22.zip - : $(baseURL)/Vision-0.9.7-H-x86-gcc2-2010-05-22.zip + 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-0.9.7-H-090423/Vision ; + : /boot/apps/Vision/Vision ; } }