From b95ed5682cd4880f9d62128a9d5aa57a463957b7 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 3 Feb 2006 22:53:09 +0000
Subject: [PATCH] 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
---
 src/apps/abouthaiku/Jamfile | 42 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/apps/abouthaiku/Jamfile b/src/apps/abouthaiku/Jamfile
index 8b9eaf444d..a30046ddae 100644
--- a/src/apps/abouthaiku/Jamfile
+++ b/src/apps/abouthaiku/Jamfile
@@ -6,29 +6,31 @@ if $(TARGET_PLATFORM) = r5 {
 	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 :
 	AboutHaiku.cpp
 	: libbe.so libtranslation.so libroot.so
 	: 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 ] ;
-SEARCH on [ FGristFiles haikulogo.png ] = [ FDirName $(HAIKU_TOP) src apps abouthaiku ] ;
-
+SEARCH on [ FGristFiles haikulogo.png ]
+	= [ FDirName $(HAIKU_TOP) src apps abouthaiku ] ;