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

Introduced new buildsystem feature that places certain packages into _packages_

Browse Source 
on the target image instead of extracting them, but only if the target image
is a CD image. This then speeds up installing a great lot, at the expense of
certain applications not being available in LiveCD mode. This affects
* the revision control tools and their dependency libraries,
* autotools
* texinfo
* perl and python


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32996 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-09-08 11:45:52 +00:00
parent bf81407606
commit 6ab71ad3b7
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/jam/ImageRules
View File

@ -758,13 +758,18 @@ rule OptionalPackageDependencies package : dependencies
}
}
rule InstallOptionalHaikuImagePackage package : url : dirTokens
rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
{
# download zip file
local zipFile = [ DownloadOptionalPackage $(package) : $(url) ] ;
# unzip onto image
UnzipArchiveToHaikuImage $(dirTokens) : $(zipFile) ;
if $(isCDPackage) = true || $(isCDPackage) = 1 && $(HAIKU_CD_NAME) {
# copy onto image
AddFilesToHaikuImage _packages_ : $(zipFile) ;
} else {
# unzip onto image
UnzipArchiveToHaikuImage $(dirTokens) : $(zipFile) ;
}
}
rule AddEntryToHaikuImageUserGroupFile file : entry

39
build/jam/OptionalPackages
View File

@ -12,7 +12,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# Available Optional Packages:
# APR - support libraries used for example by SVN
# APR - support libraries used for example by Subversion
# APR-util
# Beam - powerful native e-mail client
# BeBook - the classic BeOS API documentation
@ -70,6 +70,7 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
InstallOptionalHaikuImagePackage apr-1.3.8-r1a1-x86-gcc2-2009-08-29
: $(baseURL)/apr-1.3.8-r1a1-x86-gcc2-2009-08-29.zip
:
: true
;
}
}
@ -83,6 +84,7 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
InstallOptionalHaikuImagePackage apr-util-1.3.9-r1a1-x86-gcc2-2009-08-29
: $(baseURL)/apr-util-1.3.9-r1a1-x86-gcc2-2009-08-29.zip
:
: true
;
}
}
@ -237,6 +239,7 @@ if [ IsOptionalHaikuImagePackageAdded CLucene ] {
clucene-0.9.21svn-x86-gcc4-haiku-2009-08-11
: $(baseURL)/clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip
:
: true
;
}
}
@ -249,8 +252,8 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] {
} else {
InstallOptionalHaikuImagePackage curl-7.19.6-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/curl-7.19.6-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -264,6 +267,7 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
InstallOptionalHaikuImagePackage cvs-1.12.13-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/cvs-1.12.13-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -273,13 +277,21 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
# autotools
InstallOptionalHaikuImagePackage autoconf-2.64-r1a1-x86-gcc2-2009-08-27
: $(baseURL)/autoconf-2.64-r1a1-x86-gcc2-2009-08-27.zip ;
: $(baseURL)/autoconf-2.64-r1a1-x86-gcc2-2009-08-27.zip
:
: true ;
InstallOptionalHaikuImagePackage automake-1.11-r1a1-x86-gcc2-2009-08-27
: $(baseURL)/automake-1.11-r1a1-x86-gcc2-2009-08-27.zip ;
: $(baseURL)/automake-1.11-r1a1-x86-gcc2-2009-08-27.zip
:
: true ;
InstallOptionalHaikuImagePackage libtool-2.2.6a-r1a1-x86-gcc2-2009-08-28
: $(baseURL)/libtool-2.2.6a-r1a1-x86-gcc2-2009-08-28.zip ;
: $(baseURL)/libtool-2.2.6a-r1a1-x86-gcc2-2009-08-28.zip
:
: true ;
InstallOptionalHaikuImagePackage texinfo-4.13a-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/texinfo-4.13a-r1a1-x86-gcc2-2009-08-30.zip ;
: $(baseURL)/texinfo-4.13a-r1a1-x86-gcc2-2009-08-30.zip
:
: true ;
}
@ -423,6 +435,7 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
InstallOptionalHaikuImagePackage expat-2.0.1-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/expat-2.0.1-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -459,6 +472,7 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
InstallOptionalHaikuImagePackage git-1.6.4.2-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/git-1.6.4.2-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -471,7 +485,7 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31
: $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip
: $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip
:
;
AddSymlinkToHaikuImage home config be Desktop\ Applets
@ -479,7 +493,7 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
} else {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06
: $(baseURL)/KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip
: $(baseURL)/KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip
:
;
AddSymlinkToHaikuImage home config be Desktop\ Applets
@ -524,6 +538,7 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
InstallOptionalHaikuImagePackage libxml2-2.7.3-r1a1-x86-gcc2-2009-09-08
: $(baseURL)/libxml2-2.7.3-r1a1-x86-gcc2-2009-09-08.zip
:
: true
;
}
}
@ -554,6 +569,7 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
InstallOptionalHaikuImagePackage mercurial-1.3.1-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/mercurial-1.3.1-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -580,6 +596,7 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
InstallOptionalHaikuImagePackage neon-0.28.6-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/neon-0.28.6-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -725,6 +742,7 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] {
InstallOptionalHaikuImagePackage perl-5.10.0-gcc2-2008-10-29
: $(baseURL)/perl-5.10.0-gcc2-2008-10-29.zip
:
: true
;
}
}
@ -738,6 +756,7 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
InstallOptionalHaikuImagePackage python-2.6.2-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/python-2.6.2-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -763,8 +782,8 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
} else {
InstallOptionalHaikuImagePackage sqlite-3.6.17-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/sqlite-3.6.17-r1a1-x86-gcc2-2009-08-30.zip
:
: true
;
}
}
@ -778,6 +797,7 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
InstallOptionalHaikuImagePackage subversion-1.6.5-r1a1-x86-gcc2-2009-09-02
: $(baseURL)/subversion-1.6.5-r1a1-x86-gcc2-2009-09-02.zip
:
: true
;
}
}
@ -952,7 +972,6 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] {
} else {
InstallOptionalHaikuImagePackage yasm-0.8.0-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/yasm-0.8.0-r1a1-x86-gcc2-2009-08-30.zip
:
;
}