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

* Reverted my change to AddFileDataResource - I obviously missed someone's intentions :-)

Browse Source 
* Added a comment about the proper use of the data-file argument.
* Applied Ingo's suggestion to the Jamfile, and it worked out of the box.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19649 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-12-28 21:28:17 +00:00
parent 3963402ca5
commit ef33454cfd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/jam/BeOSRules
View File

@ -46,6 +46,9 @@ rule AddFileDataResource
# <resourceID>: A resource ID string as understood by xres (type:id[:name]).
# <dataFile>: The data to be written into the resource will be read from
# that file.
# Note that this is supposed to be a build target, not a path
# name - if you need to add a data file in a different path, you
# have to locate it first.
#
local target = $(1) ;
local resourceID = $(2) ;
@ -53,7 +56,7 @@ rule AddFileDataResource
# the resource file
local resources
= <added-resources>file-data-$(resourceID).rsrc ;
= <added-resources>file-data-$(resourceID)-$(dataFile).rsrc ;
# add it to the resources of the given target
AddResources $(target) : $(resources) ;

5
src/kits/network/Jamfile
View File

@ -2,8 +2,9 @@ SubDir HAIKU_TOP src kits network ;
UsePrivateHeaders libroot net ;
AddFileDataResource libnetwork.so : CSTR:201:services :
[ FDirName $(SUBDIR) dns defaults services ] ;
local services = [ FGristFiles services ] ;
SEARCH on $(services) = [ FDirName $(SUBDIR) dns defaults ] ;
AddFileDataResource libnetwork.so : CSTR:201:services : $(services) ;
SharedLibrary libnetwork.so :
init.cpp