i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated several more OptionalPackages

Browse Source
This commit is contained in:
Scott McCreary
2012-09-11 23:45:06 -07:00
parent 1bd0748253
commit 554fe146cb
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalLibPackages
+10 -10
View File
@@ -38,14 +38,14 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ; Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip ; : $(baseURL)/lib/allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip ; : $(baseURL)/lib/dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip ; : $(baseURL)/lib/jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip
@@ -67,8 +67,8 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
box2d-2.1.2-r1a3-r1a3-x86-gcc4-2011-05-26.zip box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-26.zip : $(baseURL)/lib/box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip
: : true ; : : true ;
} else { } else {
Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ; Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ;
@@ -209,8 +209,8 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
Echo "No optional package physfs available for $(TARGET_ARCH)" ; Echo "No optional package physfs available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip : $(baseURL)/lib/physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
build/jam/OptionalPackages
+18 -14
View File
@@ -715,8 +715,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip
: $(baseURL)/m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip ; : $(baseURL)/m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip flex-2.5.35-r1a4-x86-gcc2-2012-09-10.zip
: $(baseURL)/flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip ; : $(baseURL)/flex-2.5.35-r1a4-x86-gcc2-2012-09-10.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
jam-2.5-r1a4-x86-gcc2-2012-08-27.zip jam-2.5-r1a4-x86-gcc2-2012-08-27.zip
: $(baseURL)/jam-2.5-r1a4-x86-gcc2-2012-08-27.zip ; : $(baseURL)/jam-2.5-r1a4-x86-gcc2-2012-08-27.zip ;
@@ -1141,12 +1141,12 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.7-x86-gcc4-2012-05-19.zip KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc4-2012-05-19.zip ; : $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.7-x86-gcc2-2012-05-19.zip KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip
: $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc2-2012-05-19.zip ; : $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip ;
} }
AddSymlinkToHaikuImage home config settings deskbar Preferences AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/common/bin/KeymapSwitcher ; : /boot/common/bin/KeymapSwitcher ;
@@ -1273,8 +1273,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] {
if [ IsOptionalHaikuImagePackageAdded Links ] { if [ IsOptionalHaikuImagePackageAdded Links ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Links available for $(TARGET_ARCH)" ; Echo "No optional package Links available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
Echo "No optional package Links available for gcc4" ; InstallOptionalHaikuImagePackage
links-2.3pre2-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/links-2.3pre2-r1a4-x86-gcc4-2012-09-09.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/home/config/bin/links ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip
@@ -1648,8 +1652,8 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip rsync-3.0.7-r1a4-x86-gcc4-2012-09-09.zip
: $(baseURL)/rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip : $(baseURL)/rsync-3.0.7-r1a4-x86-gcc4-2012-09-09.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
@@ -1667,12 +1671,12 @@ if [ IsOptionalHaikuImagePackageAdded Ruby ] {
Echo "No optional package Ruby available for $(TARGET_ARCH)" ; Echo "No optional package Ruby available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip ruby-1.9.1-r1a4-x86-gcc4-2012-09-10.zip
: $(baseURL)/ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip ; : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc4-2012-09-10.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip ruby-1.9.1-r1a4-x86-gcc2-2012-09-10.zip
: $(baseURL)/ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip ; : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc2-2012-09-10.zip ;
} }
} }