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

* Applied patch by Andreas that uses git as a fallback in case retrieving

Browse Source 
the revision failed using "svn info".
* While there is no official git tree, this should help those people using
  svn over git.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26977 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-08-15 11:00:07 +00:00
parent 84b6bd9a95
commit 8c74d99c63
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+10 -1
View File
@@ -234,6 +234,10 @@ rule CopySetHaikuRevision target : source
local svnEntries = <haiku-rootdir-svn>entries ; local svnEntries = <haiku-rootdir-svn>entries ;
SEARCH on $(svnEntries) = [ FDirName $(HAIKU_TOP) .svn ] ; SEARCH on $(svnEntries) = [ FDirName $(HAIKU_TOP) .svn ] ;
Depends $(target) : $(svnEntries) ; Depends $(target) : $(svnEntries) ;
} else if [ Glob [ FDirName $(HAIKU_TOP) .git ] : index ] {
local gitIndex = <haiku-rootdir-git>index ;
SEARCH on $(gitIndex) = [ FDirName $(HAIKU_TOP) .git ] ;
Depends $(target) : $(gitIndex) ;
} }
HAIKU_INCLUDE_IN_IMAGE on $(target) HAIKU_INCLUDE_IN_IMAGE on $(target)
@@ -247,7 +251,12 @@ 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 || echo Revision: 0) | revision=`(LC_ALL=C LANG=C svn info $(HAIKU_TOP) 2> /dev/null ||
(cd $(HAIKU_TOP) && LC_ALL=C LANG=C git svn info) 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 "Revision: " $1}') 2> /dev/null ||
echo Revision: 0) |
grep Revision | awk '{printf $2}'` grep Revision | awk '{printf $2}'`
$(2[1]) --data $(2[3]) $(1) && $(2[1]) --data $(2[3]) $(1) &&
$(2[2]) $(1) ${revision} $(2[2]) $(1) ${revision}