Fixed problems with generating the new revision resource. Now we
create a file that only contains the revision number and use the AddFileDataResource rule for adding it as a resource. We also handle the case that "svn info" fails (e.g. for source trees not containing svn information anymore), setting the resource to "unknown". git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16226 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+22
-20
@@ -6,29 +6,31 @@ if $(TARGET_PLATFORM) = r5 {
|
|||||||
SubDirC++Flags -DR5_COMPATIBLE ;
|
SubDirC++Flags -DR5_COMPATIBLE ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rule GenerateRevisionFile
|
||||||
|
{
|
||||||
|
MakeLocateCommonPlatform $(1) ;
|
||||||
|
Always $(1) ;
|
||||||
|
# we want to rebuild the resources everytime AboutHaiku
|
||||||
|
# is built to keep them up-to-date
|
||||||
|
}
|
||||||
|
|
||||||
|
actions GenerateRevisionFile
|
||||||
|
{
|
||||||
|
(svn info $(HAIKU_TOP) 2> /dev/null || echo Revision: unknown) |
|
||||||
|
grep Revision | awk '{printf $2}' > $(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
local revisionFile = [ FGristFiles haiku-revision ] ;
|
||||||
|
GenerateRevisionFile $(revisionFile) ;
|
||||||
|
|
||||||
|
AddFileDataResource AboutHaiku : CSTR:201:SVN:REVISION : $(revisionFile) ;
|
||||||
|
|
||||||
Application AboutHaiku :
|
Application AboutHaiku :
|
||||||
AboutHaiku.cpp
|
AboutHaiku.cpp
|
||||||
: libbe.so libtranslation.so libroot.so
|
: libbe.so libtranslation.so libroot.so
|
||||||
: AboutHaiku.rdef
|
: AboutHaiku.rdef
|
||||||
;
|
;
|
||||||
|
|
||||||
rule AddRevisionToResources {
|
|
||||||
Depends $(1) ;
|
|
||||||
AddRevisionToResources1 $(1) : <build>rc ;
|
|
||||||
}
|
|
||||||
|
|
||||||
actions AddRevisionToResources1 {
|
|
||||||
VERSION=`svn info | grep Revision | cut -d\ -f2`
|
|
||||||
echo "resource(201, \"SVN:REVISION\") #'CSTR' \""$VERSION"\";" | $(2) -m -o $(1) -
|
|
||||||
}
|
|
||||||
|
|
||||||
# This must come after the Application rule, so that the
|
|
||||||
# AboutHaiku.rsrc file is already created
|
|
||||||
AddRevisionToResources [ FGristFiles AboutHaiku.rsrc ] ;
|
|
||||||
ALWAYS [ FGristFiles AboutHaiku.rsrc ] ;
|
|
||||||
# we want to rebuild the resources everytime AboutHaiku
|
|
||||||
# is built to keep them up-to-date
|
|
||||||
|
|
||||||
Includes [ FGristFiles AboutHaiku.rdef ] : [ FGristFiles haikulogo.png ] ;
|
Includes [ FGristFiles AboutHaiku.rdef ] : [ FGristFiles haikulogo.png ] ;
|
||||||
SEARCH on [ FGristFiles haikulogo.png ] = [ FDirName $(HAIKU_TOP) src apps abouthaiku ] ;
|
SEARCH on [ FGristFiles haikulogo.png ]
|
||||||
|
= [ FDirName $(HAIKU_TOP) src apps abouthaiku ] ;
|
||||||
|
|||||||
Reference in New Issue
Block a user