i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Applied patch by Andreas to unify SVN version detection with GIT, also fixing

Browse Source 
bug #2860.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31333 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-06-30 15:20:54 +00:00
parent b6fffec7e1
commit a1c6f0fde1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+11 -6
View File
@@ -315,14 +315,19 @@ rule CopySetHaikuRevision target : source
actions CopySetHaikuRevision1 actions CopySetHaikuRevision1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
revision=`LC_ALL=C LANG=C svn info $(HAIKU_TOP) 2> /dev/null | # Try svn or git-svn
# Extract from "Revision: 12345" line
revision=`(LC_ALL=C LANG=C svn info $(HAIKU_TOP) ||
(cd $(HAIKU_TOP) && LC_ALL=C LANG=C git svn info)) 2> /dev/null |
grep Revision | awk '{printf $2}'` grep Revision | awk '{printf $2}'`
if [ "$revision" = 0 -o "$revision" = "" ]; then if [ "$revision" = 0 -o "$revision" = "" ]; then
revision=`(cd $(HAIKU_TOP) && LC_ALL=C LANG=C git svn info) # git-svn not present or not configured for this repository
2> /dev/null || # Try searching git logs for last git-svn commit
(git log --max-count=1 --grep="git-svn-id:" 2> /dev/null | # Extract from " git-svn-id: .../haiku/trunk@12345 ..." line
grep git-svn-id: | cut -d '@' -f 2 | revision=`cd $(HAIKU_TOP) &&
awk '{printf $1}') 2> /dev/null` git log --max-count=1 --grep="git-svn-id:" 2> /dev/null |
grep "git-svn-id:" | cut -d '@' -f 2 |
awk '{printf $1}'`
fi fi
if [ "$revision" = "" ]; then if [ "$revision" = "" ]; then
revision=0 revision=0