Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanup. No functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40844 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2011-03-06 15:10:31 +00:00
parent d020e3568f
commit 2a8ccc52be
1 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
build/jam/OptionalPackages
View File

@ -104,8 +104,7 @@ if [ IsOptionalHaikuImagePackageAdded ABI-compliance-checker ] {
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip
: $(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip : $(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip ;
;
} }
} }
@ -208,8 +207,7 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
if [ IsOptionalHaikuImagePackageAdded BeBook ] { if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip : $(baseURL)/bebook_20081026.zip
: system documentation : system documentation ;
;
AddSymlinkToHaikuImage home Desktop AddSymlinkToHaikuImage home Desktop
: /boot/system/documentation/bebook/index.html : BeBook ; : /boot/system/documentation/bebook/index.html : BeBook ;
} }
@ -261,8 +259,7 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
: $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip : $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
: apps : apps ;
;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BePDF/BePDF ; : /boot/apps/BePDF/BePDF ;
AddSymlinkToHaikuImage common data licenses AddSymlinkToHaikuImage common data licenses
@ -294,8 +291,7 @@ if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] {
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ; : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
InstallSourceArchive BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz InstallSourceArchive BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz
: $(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz : $(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz ;
;
} }
} }
@ -464,7 +460,6 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
: $(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip : $(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
: : true ; : : true ;
} }
InstallSourceArchive cvs-1.12.13_haiku-2010-04-29.tar.xz InstallSourceArchive cvs-1.12.13_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/cvs-1.12.13_haiku-2010-04-29.tar.xz ; : $(baseSourceURL)/2010/cvs-1.12.13_haiku-2010-04-29.tar.xz ;
} }
@ -505,11 +500,9 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
} }
InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/automake-1.11.1_haiku-2010-04-29.tar.xz : $(baseSourceURL)/2010/automake-1.11.1_haiku-2010-04-29.tar.xz ;
;
InstallSourceArchive texinfo-4.13a_haiku-2010-04-29.tar.xz InstallSourceArchive texinfo-4.13a_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/texinfo-4.13a_haiku-2010-04-29.tar.xz : $(baseSourceURL)/2010/texinfo-4.13a_haiku-2010-04-29.tar.xz ;
;
} }
@ -727,7 +720,6 @@ if [ IsOptionalHaikuImagePackageAdded Doxygen ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Doxygen available for $(TARGET_ARCH)" ; Echo "No optional package Doxygen available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
doxygen-1.6.3-x86-gcc4-2010-05-17.zip doxygen-1.6.3-x86-gcc4-2010-05-17.zip
@ -748,7 +740,6 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Expat available for $(TARGET_ARCH)" ; Echo "No optional package Expat available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
expat-2.0.1-x86-gcc4-2010-11-12.zip expat-2.0.1-x86-gcc4-2010-11-12.zip
@ -760,7 +751,6 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
: $(baseURL)/expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip : $(baseURL)/expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip
: : true ; : : true ;
} }
InstallSourceArchive expat-2.0.1_haiku-2010-04-29.tar.xz InstallSourceArchive expat-2.0.1_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/expat-2.0.1_haiku-2010-04-29.tar.xz ; : $(baseSourceURL)/2010/expat-2.0.1_haiku-2010-04-29.tar.xz ;
} }
@ -855,9 +845,7 @@ if [ IsOptionalHaikuImagePackageAdded Groff ] {
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
groff-1.20.1-x86-gcc2-2010-08-31.zip groff-1.20.1-x86-gcc2-2010-08-31.zip
: $(baseURL)/groff-1.20.1-x86-gcc2-2010-08-31.zip : $(baseURL)/groff-1.20.1-x86-gcc2-2010-08-31.zip ;
:
;
} }
} }
@ -876,8 +864,7 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] {
# unzip gcc4 to gcc4 subdir # unzip gcc4 to gcc4 subdir
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_4_PACKAGE) InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_4_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE) : $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
: system lib gcc4 : system lib gcc4 ;
;
} }
} else { } else {
# unzip gcc4 # unzip gcc4
@ -888,8 +875,7 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] {
# unzip gcc2 to gcc2 subdir # unzip gcc2 to gcc2 subdir
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE) InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE) : $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
: system lib gcc2 : system lib gcc2 ;
;
} }
} }
} }
@ -899,8 +885,7 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] {
# ICU-devel # ICU-devel
if [ IsOptionalHaikuImagePackageAdded ICU-devel ] { if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
InstallOptionalHaikuImagePackage $(HAIKU_ICU_DEVEL_PACKAGE) InstallOptionalHaikuImagePackage $(HAIKU_ICU_DEVEL_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ;
;
local arch = $(TARGET_ARCH) ; local arch = $(TARGET_ARCH) ;
local abi = gcc$(HAIKU_GCC_VERSION[1]) ; local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
@ -922,17 +907,13 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip
: $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip : $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip ;
:
;
AddSymlinkToHaikuImage home config be Desktop\ applets AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/common/bin/KeymapSwitcher ; : /boot/common/bin/KeymapSwitcher ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
: $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip : $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip ;
:
;
AddSymlinkToHaikuImage home config be Desktop\ applets AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/common/bin/KeymapSwitcher ; : /boot/common/bin/KeymapSwitcher ;
} }
@ -973,7 +954,6 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip
: $(baseURL)/libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip ; : $(baseURL)/libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip ;
} }
InstallSourceArchive libiconv-1.13.1_haiku-2010-04-29.tar.xz InstallSourceArchive libiconv-1.13.1_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/libiconv-1.13.1_haiku-2010-04-29.tar.xz ; : $(baseSourceURL)/2010/libiconv-1.13.1_haiku-2010-04-29.tar.xz ;
} }
@ -1021,7 +1001,6 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip
: $(baseURL)/libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip ; : $(baseURL)/libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip ;
} }
InstallSourceArchive libxml2-2.7.7_haiku-2010-04-29.tar.xz InstallSourceArchive libxml2-2.7.7_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/libxml2-2.7.7_haiku-2010-04-29.tar.xz ; : $(baseSourceURL)/2010/libxml2-2.7.7_haiku-2010-04-29.tar.xz ;
} }
@ -1222,7 +1201,6 @@ if [ IsOptionalHaikuImagePackageAdded OpenSound ] {
opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip
: $(baseURL)/opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip ; : $(baseURL)/opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip ;
} }
#ExtractArchiveToHaikuImage home : data/vv.mp3.zip : 0 ;
} }
@ -1280,9 +1258,7 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
p7zip-9.13-x86-gcc2-2011-02-25.zip p7zip-9.13-x86-gcc2-2011-02-25.zip
: $(baseURL)/p7zip-9.13-x86-gcc2-2011-02-25.zip : $(baseURL)/p7zip-9.13-x86-gcc2-2011-02-25.zip ;
:
;
} }
AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
: "7za l \\0045s" : "7za l \\0045s"
@ -1345,7 +1321,6 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
pe-2.4.3-600-x86-gcc2-2010-09-28.zip pe-2.4.3-600-x86-gcc2-2010-09-28.zip
: $(baseURL)/pe-2.4.3-600-x86-gcc2-2010-09-28.zip ; : $(baseURL)/pe-2.4.3-600-x86-gcc2-2010-09-28.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Pe/Pe ; : /boot/apps/Pe/Pe ;
AddSymlinkToHaikuImage common bin AddSymlinkToHaikuImage common bin
@ -1370,7 +1345,6 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] {
: $(baseURL)/perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip : $(baseURL)/perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
: : true ; : : true ;
} }
InstallSourceArchive perl-5.10.1_haiku-2010-04-29.tar.xz InstallSourceArchive perl-5.10.1_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/perl-5.10.1_haiku-2010-04-29.tar.xz ; : $(baseSourceURL)/2010/perl-5.10.1_haiku-2010-04-29.tar.xz ;
} }
@ -1505,7 +1479,6 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] {
tar-1.25-x86-gcc2-2011-02-07.zip tar-1.25-x86-gcc2-2011-02-07.zip
: $(baseURL)/tar-1.25-x86-gcc2-2011-02-07.zip ; : $(baseURL)/tar-1.25-x86-gcc2-2011-02-07.zip ;
} }
InstallSourceArchive tar-1.25_haiku-2011-02-07.tar.xz InstallSourceArchive tar-1.25_haiku-2011-02-07.tar.xz
: $(baseSourceURL)/2011/tar-1.25_haiku-2011-02-07.tar.xz ; : $(baseSourceURL)/2011/tar-1.25_haiku-2011-02-07.tar.xz ;
} }
@ -1727,8 +1700,7 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
} else { } else {
InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip
: $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip : $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip
: apps : apps ;
;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
: /boot/apps/WonderBrush/WonderBrush ; : /boot/apps/WonderBrush/WonderBrush ;
} }
@ -1757,7 +1729,6 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
: $(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip ; : $(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip ;
} }
InstallSourceArchive xz-utils-4.999.9_haiku-2010-04-29.tar.xz InstallSourceArchive xz-utils-4.999.9_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/2010/xz-utils-4.999.9_haiku-2010-04-29.tar.xz ; : $(baseSourceURL)/2010/xz-utils-4.999.9_haiku-2010-04-29.tar.xz ;
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz