Added the rest of the basic development packages.

Added autoconf, automake, libtool, texinfo, perl, gettext and nano.
Building an image with the nightly targets should give you an image
with these included.
This commit is contained in:
Alex Smith
2012-08-17 13:03:31 +01:00
parent 55e16d9d43
commit 3bf3aa2e2c
+73 -40
View File
@@ -613,44 +613,63 @@ if [ IsOptionalHaikuImagePackageAdded DemoPackage_Video ] {
# Development # Development
if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { if [ IsOptionalHaikuImagePackageAdded Development ] {
AddFilesToHaikuImage system apps : Debugger ; if $(TARGET_ARCH) = x86 {
AddSymlinkToHaikuImage home config settings deskbar Applications AddFilesToHaikuImage system apps : Debugger ;
: /boot/system/apps/Debugger : Debugger ; AddSymlinkToHaikuImage home config settings deskbar Applications
# autotools : /boot/system/apps/Debugger : Debugger ;
if $(HAIKU_GCC_VERSION[1]) >= 4 { # autotools
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip
: $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip
: : true ;
InstallOptionalHaikuImagePackage
automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip
: $(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip
: : true ;
InstallOptionalHaikuImagePackage
libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip
: $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip
: : true ;
InstallOptionalHaikuImagePackage
texinfo-4.13a-x86-gcc4-2012-03-31.zip
: $(baseURL)/texinfo-4.13a-x86-gcc4-2012-03-31.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
texinfo-4.13a-x86-gcc2-2012-03-31.zip
: $(baseURL)/texinfo-4.13a-x86-gcc2-2012-03-31.zip
: : true ;
}
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip autoconf-2.69-x86_64-2012-08-17.zip
: $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip : $(baseURL)/autoconf-2.69-x86_64-2012-08-17.zip
: : true ; : : true ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip automake-1.12.2-x86_64-2012-08-17.zip
: $(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip : $(baseURL)/automake-1.12.2-x86_64-2012-08-17.zip
: : true ; : : true ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip libtool-2.4.2-x86_64-2012-08-17.zip
: $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip : $(baseURL)/libtool-2.4.2-x86_64-2012-08-17.zip
: : true ; : : true ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
texinfo-4.13a-x86-gcc4-2012-03-31.zip texinfo-4.13a-x86_64-2012-08-17.zip
: $(baseURL)/texinfo-4.13a-x86-gcc4-2012-03-31.zip : $(baseURL)/texinfo-4.13a-x86_64-2012-08-17.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
texinfo-4.13a-x86-gcc2-2012-03-31.zip
: $(baseURL)/texinfo-4.13a-x86-gcc2-2012-03-31.zip
: : true ; : : true ;
} }
} }
@@ -1015,9 +1034,7 @@ if [ IsOptionalHaikuImagePackageAdded friss ] {
# GetText # GetText
if [ IsOptionalHaikuImagePackageAdded GetText ] { if [ IsOptionalHaikuImagePackageAdded GetText ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package GetText available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip
@@ -1029,6 +1046,13 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] {
: $(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip : $(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
: : true ; : : true ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
gettext-0.18.1.1-x86_64-2012-08-17.zip
: $(baseURL)/gettext-0.18.1.1-x86_64-2012-08-17.zip
: : true ;
} else {
Echo "No optional package GetText available for $(TARGET_ARCH)" ;
} }
} }
@@ -1398,9 +1422,7 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
# Nano # Nano
if [ IsOptionalHaikuImagePackageAdded Nano ] { if [ IsOptionalHaikuImagePackageAdded Nano ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package Nano available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip
@@ -1410,6 +1432,12 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] {
nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip
: $(baseURL)/nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
nano-2.3.1-x86_64-2012-08-17.zip
: $(baseURL)/nano-2.3.1-x86_64-2012-08-17.zip ;
} else {
Echo "No optional package Nano available for $(TARGET_ARCH)" ;
} }
} }
@@ -1636,9 +1664,7 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
# Perl # Perl
if [ IsOptionalHaikuImagePackageAdded Perl ] { if [ IsOptionalHaikuImagePackageAdded Perl ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package Perl available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
perl-5.10.1-r1a3-x86-gcc4-2011-05-24.zip perl-5.10.1-r1a3-x86-gcc4-2011-05-24.zip
@@ -1650,6 +1676,13 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] {
: $(baseURL)/perl-5.10.1-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/perl-5.10.1-r1a3-x86-gcc2-2011-05-17.zip
: : true ; : : true ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
perl-5.10.1-x86_64-2012-08-17.zip
: $(baseURL)/perl-5.10.1-x86_64-2012-08-17.zip
: : true ;
} else {
Echo "No optional package Perl available for $(TARGET_ARCH)" ;
} }
} }