haiku/buildtools
1
0
Fork 0
mirror of https://review.haiku-os.org/buildtools synced 2026-02-04 07:53:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moving jam to the buildtools module caused the rc finding algorithm to break.

Browse Source 
We no longer even try to do that. The user can define the environment variable
RC, if they want StatCacheServer resources, otherwise they will just not be
added (a respective note is printed).
Closes bug #176.


git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@16533 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2006-02-27 15:02:06 +00:00
parent a1a02bed3c
commit d018825503
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
jam/Jamfile
View File

@@ -162,6 +162,17 @@ if $(BINDIR) { InstallBin $(BINDIR) : jam ; }
# Build stat cache server under BeOS.
#
if $(OS) = BEOS {
# RC must be defined, if we are to compile the resources.
if ! $(RC) && ! $(NO_STAT_CACHE_SERVER_RESOURCES) {
Echo "NOTE: The variable RC is not defined, and therefore the" ;
Echo "NOTE: built StatCacheServer won't have resources (it will thus" ;
Echo "NOTE: appear in the Deskbar). If you want to have resources," ;
Echo "NOTE: define RC as an absolute or relative path referring to" ;
Echo "NOTE: the rc program, or just the program name, if it lives in" ;
Echo "NOTE: the PATH." ;
NO_STAT_CACHE_SERVER_RESOURCES = 1 ;
}
rule CompileResources
{
SEARCH on $(2) += $(SEARCH_SOURCE) ;
@@ -170,36 +181,9 @@ if $(OS) = BEOS {
LocalClean clean : $(1) ;
}
# rc must exist, if we are to compile the resources. We hard-code the
# path where it should be located. Not nice, but good enough for the moment.
actions CompileResources
{
RC=
for arch in x86 ppc
do
for plat in r5 bone dano haiku
do
for version in release debug_1 debug_2
do
PATH=../../../generated/objects/${plat}/${arch}/${version}/tools/rc/rc
if [ -f $PATH ]
then
RC=$PATH
break 3
fi
done
done
done
if [ -f $RC ]; then
$RC -o "$(1)" "$(2)"
else
echo "Error: Couldn't find rc, the resources compiler. It should "
echo "Error: be located in objects/<arch>.<version>.<plat>/tools/rc/ and can be made"
echo "Error: by invoking \`jam rc'. You can also build the"
echo "Error: StatCacheServer without resources by running"
echo "Error: NO_STAT_CACHE_SERVER_RESOURCES=1 jam"
exit 1;
fi
$(RC) -o "$(1)" "$(2)"
}
rule AddResources