Changeset 24600

Timestamp:

03/26/08 19:48:41 (8 months ago)

Author:

bonefish

Message:

* Added new optional parameter to AddHeaderDirectoryToHaikuImage,

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.

Location:

haiku/trunk/build/jam

Files:

• HaikuImage (modified) (2 diffs)
• ImageRules (modified) (1 diff)

haiku/trunk/build/jam/HaikuImage

@@ -506 +506 @@
 
         # headers
-        AddHeaderDirectoryToHaikuImage gnu ;
+        AddHeaderDirectoryToHaikuImage gnu : 3rdparty ;
         AddHeaderDirectoryToHaikuImage os ;
         AddHeaderDirectoryToHaikuImage posix ;
@@ -514 +514 @@
         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 {

haiku/trunk/build/jam/ImageRules

@@ -599 +599 @@
 }
 
-rule AddHeaderDirectoryToHaikuImage dirTokens : alwaysUpdate
-{
-        # AddHeaderDirectoryToHaikuImage <dirTokens> : <alwaysUpdate> ;
+rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
+{
+        # AddHeaderDirectoryToHaikuImage <dirTokens> : [ <dirName> ]
+        #       : <alwaysUpdate> ;
 
         CopyDirectoryToHaikuImage develop headers
                 : [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
-                : : -x .svn : $(alwaysUpdate) ;
+                : $(dirName) : -x .svn : $(alwaysUpdate) ;
 }