[haiku-commits] r38665 - haiku/trunk/build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 16 Sep 2010 04:34:38 +0200 (CEST)
Author: scottmc
Date: 2010-09-16 04:34:38 +0200 (Thu, 16 Sep 2010)
New Revision: 38665
Changeset: http://dev.haiku-os.org/changeset/38665
Modified:
haiku/trunk/build/jam/OptionalPackageDependencies
haiku/trunk/build/jam/OptionalPackages
Log:
Updated BeAE and added a gcc4 build.
Added BurnItNow, both a gcc2 and gcc4 build.
Added Bazaar, both a gcc2 and gcc4 build.
Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies 2010-09-15 22:23:50 UTC
(rev 38664)
+++ haiku/trunk/build/jam/OptionalPackageDependencies 2010-09-16 02:34:38 UTC
(rev 38665)
@@ -7,6 +7,7 @@
OptionalPackageDependencies APR-util : APR Expat ;
OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ;
+OptionalPackageDependencies BurnItNow : CDRecord ;
OptionalPackageDependencies CDRecord : LibIconv ;
OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2010-09-15 22:23:50 UTC (rev
38664)
+++ haiku/trunk/build/jam/OptionalPackages 2010-09-16 02:34:38 UTC (rev
38665)
@@ -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
+# Bazaar - the distributed version
control system
# BeAE - open source Audio Editor
# Beam - powerful native e-mail client
# BeBook - the classic BeOS API
documentation
@@ -24,6 +25,7 @@
# BePDF - native PDF reader
# BeZillaBrowser - fork of Mozilla's 1.8 branch.
# Bluetooth - experimental Haiku components
for Bluetooth
+# BurnItNow - CD burning app
# Bzip - file archiving utility
# CCache - fast compiler cache
# CDRecord - the command line CD writing
tools
@@ -139,15 +141,38 @@
}
+# Bazaar
+if [ IsOptionalHaikuImagePackageAdded Bazaar ] {
+ if $(TARGET_ARCH) != x86 {
+ Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip
+ : $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip
+ :
+ ;
+ } else {
+ InstallOptionalHaikuImagePackage
bzr-2.2.0-x86-gcc2-2010-09-15.zip
+ : $(baseURL)/bzr-2.2.0-x86-gcc2-2010-09-16.zip
+ :
+ ;
+ }
+}
+
+
# BeAE
if [ IsOptionalHaikuImagePackageAdded BeAE ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package BeAE available for gcc4" ;
+ 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-20-x86-gcc2-2010-09-09.zip
- : $(baseURL)/beae-20-x86-gcc2-2010-09-09.zip
+ InstallOptionalHaikuImagePackage beae-22-x86-gcc2-2010-09-15.zip
+ : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip
:
;
AddSymlinkToHaikuImage home config be Applications
@@ -297,6 +322,28 @@
}
+# BurnItNow
+if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
+ if $(TARGET_ARCH) != x86 {
+ Echo "No optional package BurnItNow available for
$(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ 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 {
+ 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 ;
+ }
+}
+
+
# Bzip
if [ IsOptionalHaikuImagePackageAdded Bzip ] {
if $(TARGET_ARCH) != x86 {
Other related posts:
