Merge branch 'master' into next

.gitattributes

@@ -10,6 +10,7 @@
 /src/Make*.cfg text=auto
 /src/CMakeLists.txt text=auto
 *.mk -whitespace text=auto
+/comptime.sh text eol=lf
 # Windows EOL
 *.cs -crlf -whitespace
 *.bat -crlf -whitespace

comptime.bat

@@ -1,6 +1,7 @@
 @echo off
 set BRA=Unknown
 set REV=illegal
+set GL1=Dummy
 
 copy nul: /b +%1\comptime.c tmp.$$$ > nul
 move tmp.$$$ %1\comptime.c > nul
@@ -13,8 +14,9 @@ goto filwri
 :gitrev
 set GIT=%2
 if "%GIT%"=="" set GIT=git
-for /f "usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s
-for /f "usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s
+for /f "tokens=* usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s
+for /f "tokens=* usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s
+for /f "tokens=* usebackq" %%s in (`%GIT% log -1 --format^=%%s`) do @set GL1=%%s
 set REV=%REV:~0,8%
 goto filwri
 
@@ -30,3 +32,4 @@ echo // by the %0 batch file >> %1\comptime.h
 echo // >> %1\comptime.h
 echo const char* compbranch = "%BRA%"; >> %1\comptime.h
 echo const char* comprevision = "%REV%"; >> %1\comptime.h
+echo const char* compnote = "%GL1%"; >> %1\comptime.h

comptime.sh

@@ -12,24 +12,26 @@ version() {
 //
 const char* compbranch = "$1";
 const char* comprevision = "$2";
+const char* compnote = "$3";
 EOF
 }
 
 versiongit() {
 	gitbranch="$(git rev-parse --abbrev-ref HEAD)"
 	gitversion="$(git rev-parse HEAD | cut -c -8)"
-	version "$gitbranch" "$gitversion";
+	gitsubject="$(git log -1 --format=%s)"
+	version "$gitbranch" "$gitversion" "$gitsubject";
 	exit 0
 }
 
 versionsvn() {
 	svnrevision="$(svnversion -n "$1")"
-	version "Subversion" "r$svnrevision";
+	version "Subversion" "r$svnrevision" "dummy";
 	exit 0
 }
 
 versionfake() {
-	version "Unknown" "illegal";
+	version "Unknown" "illegal" "dummy";
 }
 
 compversion() {