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

* Added new optional parameter to AddHeaderDirectoryToHaikuImage,

Browse Source 
specifying the name of the header directory on the image.
* Renamed the "gnu" header directory on the image to "3rdparty" and
  created a "gnu" symlink for compatiblity.
* Added zlib and libpng headers to the "3rdparty" header dir.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24600 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-03-26 23:48:41 +00:00
parent 6638711aa9
commit c904fe377e
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+15 -3
View File
@@ -505,7 +505,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ]
AddFilesToHaikuImage beos bin : cc c++ ;
# headers
AddHeaderDirectoryToHaikuImage gnu ;
AddHeaderDirectoryToHaikuImage gnu : 3rdparty ;
AddHeaderDirectoryToHaikuImage os ;
AddHeaderDirectoryToHaikuImage posix ;
@@ -513,8 +513,20 @@ if [ IsOptionalHaikuImagePackageAdded Development ]
SEARCH on <header>_G_config.h = [ FDirName $(HAIKU_TOP) headers glibc ] ;
AddFilesToHaikuImage develop headers posix : <header>_G_config.h ;
# make be -> os symlink for now
AddSymlinkToHaikuImage develop headers : /boot/develop/headers/os : be ;
# create be -> os symlink for now
AddSymlinkToHaikuImage develop headers : os : be ;
# create gnu -> 3rdparty symlink
AddSymlinkToHaikuImage develop headers : 3rdparty : gnu ;
# TODO: Change BEINCLUDES and gcc to refer to 3rdparty rather than gnu.
# individual headers of third party libs
local zlibHeaders = <header>zlib.h <header>zconf.h ;
SEARCH on $(zlibHeaders) = [ FDirName $(HAIKU_TOP) headers libs zlib ] ;
local pngHeaders = <header>png.h <header>pngconf.h ;
SEARCH on $(pngHeaders) = [ FDirName $(HAIKU_TOP) headers libs png ] ;
AddFilesToHaikuImage develop headers 3rdparty
: $(zlibHeaders) $(pngHeaders) ;
if $(HAIKU_GCC_VERSION[1]) > 2 {
# gcc 4
build/jam/ImageRules
+4 -3
View File
@@ -598,13 +598,14 @@ rule AddSourceDirectoryToHaikuImage dirTokens : alwaysUpdate
: : -x .svn : $(alwaysUpdate) ;
}
rule AddHeaderDirectoryToHaikuImage dirTokens : alwaysUpdate
rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
{
# AddHeaderDirectoryToHaikuImage <dirTokens> : <alwaysUpdate> ;
# AddHeaderDirectoryToHaikuImage <dirTokens> : [ <dirName> ]
# : <alwaysUpdate> ;
CopyDirectoryToHaikuImage develop headers
: [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
: : -x .svn : $(alwaysUpdate) ;
: $(dirName) : -x .svn : $(alwaysUpdate) ;
}
rule UnzipArchiveToHaikuImage dirTokens : zipFile : alwaysUpdate