[haiku-commits] r39193 - haiku/trunk/build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 30 Oct 2010 09:19:03 +0200 (CEST)
Author: scottmc
Date: 2010-10-30 09:19:02 +0200 (Sat, 30 Oct 2010)
New Revision: 39193
Changeset: http://dev.haiku-os.org/changeset/39193
Modified:
haiku/trunk/build/jam/OptionalPackageDependencies
haiku/trunk/build/jam/OptionalPackages
Log:
Added gcc2 armyknife and stable vision packages.
TODO: Create fresh gcc4 packages for armyknife, vision and taglib.
Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies 2010-10-30 07:06:55 UTC
(rev 39192)
+++ haiku/trunk/build/jam/OptionalPackageDependencies 2010-10-30 07:19:02 UTC
(rev 39193)
@@ -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 ;
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2010-10-30 07:06:55 UTC (rev
39192)
+++ haiku/trunk/build/jam/OptionalPackages 2010-10-30 07:19:02 UTC (rev
39193)
@@ -16,6 +16,7 @@
# 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 @@
}
+# 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 $(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 ;
}
}
Other related posts:
- » [haiku-commits] r39193 - haiku/trunk/build/jam - scott mc
