Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Fixed generate_svn_version.sh when building on detached head

This commit is contained in:
Manatsawin Hanmongkolchai 2016-02-27 12:01:00 +07:00
parent 3dc198a292
commit 59faa92e1e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
generate_svn_version.sh
View File

@ -13,7 +13,10 @@ elif [ -d .git ]; then
GIT_LOG=`git log -n1 --pretty="format:%H"` GIT_LOG=`git log -n1 --pretty="format:%H"`
HOST=`hostname` HOST=`hostname`
BRANCH=`git branch | sed -n 's/^\* *//p'` BRANCH=`git branch | sed -n 's/^\* *//p'`
remote=`git config --get branch.$BRANCH.remote` remote=`git config --get branch.$BRANCH.remote 2>/dev/null`
if [ "$?" != "0" ]; then
remote="origin"
fi
URL=`git config --get remote.$remote.url` URL=`git config --get remote.$remote.url`
DATE=`git log -n1 --pretty="format:%ct"` DATE=`git log -n1 --pretty="format:%ct"`
elif [ -d .svn ]; then elif [ -d .svn ]; then
@ -32,7 +35,7 @@ if [ "x$GIT_LOG" != "x" ]; then
y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/; y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;
s/^/#define REPOSITORY_/;s/$/ 1/' >> $TMPFILE s/^/#define REPOSITORY_/;s/$/ 1/' >> $TMPFILE
elif [ "x$CMD" != "x" ]; then elif [ "x$CMD" != "x" ]; then
LANG=C LANG=C
URL=`$CMD | awk ' URL=`$CMD | awk '
/^URL/ { url = $2; }; /^URL/ { url = $2; };
/^Rev/ { rev = $2; }; /^Rev/ { rev = $2; };
@ -41,7 +44,7 @@ elif [ "x$CMD" != "x" ]; then
print "#define SVN_REPOSITORY \"" url "\"" >> "'"$TMPFILE"'"; print "#define SVN_REPOSITORY \"" url "\"" >> "'"$TMPFILE"'";
print "#define SVN_REVISION " rev >> "'"$TMPFILE"'"; print "#define SVN_REVISION " rev >> "'"$TMPFILE"'";
print url };'` print url };'`
echo $URL | echo $URL |
sed 's%.*://%%;s/[^/]*@//;s/[^a-zA-Z0-9]/_/g;s/__*/_/g; sed 's%.*://%%;s/[^/]*@//;s/[^a-zA-Z0-9]/_/g;s/__*/_/g;
y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/; y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;
s/^/#define REPOSITORY_/;s/$/ 1/' >> $TMPFILE s/^/#define REPOSITORY_/;s/$/ 1/' >> $TMPFILE