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

* add support for generating a useful haiku-revision from a

Browse Source 
git repository

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41478 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2011-05-13 20:38:02 +00:00
parent 88a50ed5df
commit 64c5bc6323
1 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+52 -15
View File
@@ -334,21 +334,56 @@ rule CopySetHaikuRevision target : source
actions CopySetHaikuRevision1 actions CopySetHaikuRevision1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
# Try svn or git-svn
# Extract from "Revision: 12345" line originalDir=`pwd`
revision=`(LC_ALL=C LANG=C svn info $(HAIKU_TOP) || cd $(HAIKU_TOP)
(cd $(HAIKU_TOP) && [ -d .git/svn ] && LC_ALL=C LANG=C git svn info)) 2> /dev/null | export LC_ALL=C
grep Revision | awk '{printf $2}'` if [ -d .svn ]; then
if [ "$revision" = 0 -o "$revision" = "" ]; then revision=`svn info 2>/dev/null | grep Revision | awk '{printf $2}'`
# git-svn not present or not configured for this repository elif [ -d .git/svn ]; then
# Try searching git logs for last git-svn commit revision=`git svn info 2>/dev/null | grep Revision | awk '{printf $2}'`
# Extract from " git-svn-id: .../haiku/trunk@12345 ..." line elif [ -d .git ]; then
revision=`cd $(HAIKU_TOP) && revision=`cat $(HAIKU_BUILD_OUTPUT_DIR)/haiku-revision 2>/dev/null`
git log --max-count=1 --grep="git-svn-id:" 2> /dev/null | lastBuiltRevision=`cat $(HAIKU_BUILD_OUTPUT_DIR)/last-built-revision \
grep "git-svn-id:" | cut -d '@' -f 2 | 2>/dev/null`
awk '{printf $1}'` localRev=`git rev-list -n1 HEAD`
fi
if [ "$revision" = 0 -o "$revision" = "" ]; then # only determine the haiku-revision if anything has changed from
# last build
if [ -z "$revision" -o "$lastBuiltRevision" != "$localRev" ]; then
currentBranch=`git branch --contains HEAD | awk '{printf $2}'`
haikuTip=`git rev-list -n1 haiku/${currentBranch}.tip`
# make sure that haiku-tip matches the remote tracking branch,
# otherwise the tag hasn't been fetched/updated and we should
# print a warning
trackingBranch=`git branch -r --contains $haikuTip \
| grep -v -- '->' | tr -d ' '`
haikuTipLag=`git rev-list --count ${haikuTip}..$trackingBranch`
if [ "$haikuTipLag" != "0" ]; then
echo "*********************************************************"
echo "!!! haiku/${currentBranch}.tip is $haikuTipLag behind \
remote tracking branch"
echo "!!! you may want to 'git fetch --tags' to update the tag"
echo "*********************************************************"
fi
# the haiku revision the HEAD is based on is the nearest common ancestor
# of these two (i.e. the merge base)
haikuBaseRev=`git merge-base $localRev $haikuTip`
# the revision we use is the description of HEAD with
# respect to the root of the current branch
revision=`git describe --dirty --long --match=haiku/$currentBranch`
if [ "$localRev" != "$haikuBaseRev" ]; then
# HEAD is not a changeset from Haiku's central repo, so we add
# a description of the changeset in Haiku's repo HEAD is based on
haikuBaseRevDescr=`git describe --long --match=haiku/$currentBranch $haikuBaseRev`
revision="$revision [$haikuBaseRevDescr]"
fi
echo $localRev >$(HAIKU_BUILD_OUTPUT_DIR)/last-built-revision
fi
elif [ -d .hg ]; then
# Try searching hg log for last svn commit # Try searching hg log for last svn commit
# Extract from "(svn r12345) ..." line # Extract from "(svn r12345) ..." line
revision=`(cd $(HAIKU_TOP) && revision=`(cd $(HAIKU_TOP) &&
@@ -359,6 +394,8 @@ actions CopySetHaikuRevision1
if [ "$revision" = "" ]; then if [ "$revision" = "" ]; then
revision=0 revision=0
fi fi
echo $revision >$(HAIKU_BUILD_OUTPUT_DIR)/haiku-revision
cd $originalDir
$(2[1]) --data $(2[3]) $(1) && $(2[1]) --data $(2[3]) $(1) &&
$(2[2]) $(1) ${revision} $(2[2]) $(1) ${revision}
} }