From f6796ac1d013af04c4512d602d804ef5ff49fb5d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tom=C3=A1=C5=A1=20Brada?= Date: Mon, 4 Apr 2016 18:40:48 +0200 Subject: [PATCH] Enhaced VersionString. The build script is too complex. --- ServerLoop.pas | 4 ++-- build.sh | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ServerLoop.pas b/ServerLoop.pas index 7187e1f..4749a13 100644 --- a/ServerLoop.pas +++ b/ServerLoop.pas @@ -457,8 +457,8 @@ var i:byte; var nb:array [0..0] of byte; {$I gitver.inc} BEGIN - writeln('ServerLoop: ',VersionBrand,' ',GIT_VERSION); - VersionString:=GIT_VERSION; + VersionString:=GIT_VERSION+'-'+IntToStr(BUILD_VERSION); + writeln('ServerLoop: ',VersionBrand,' ',VersionString); mNow:=0; Randomize; fpSignal(SigInt,@SignalHandler); diff --git a/build.sh b/build.sh index d42e2b1..1f1e0b2 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,15 @@ #!/bin/bash set -e mkdir -p bin -make -C ed25519 gitver=$(git describe --always --dirty --abbrev=16 --tags || true) -echo Git version: $gitver -echo "const GIT_VERSION='$gitver';" >gitver.inc +const(){ eval "$1"; } +BUILD_VERSION=0 +source gitver.inc||: 2>/dev/null +(( buildver= BUILD_VERSION + 1 )) +echo Git version: $gitver Build: $buildver +echo "const GIT_VERSION='$gitver'; +const BUILD_VERSION=$buildver;" >gitver.inc +make -C ed25519 fpc @fpopt.cfg bnprof.pas fpc @fpopt.cfg bnmut.pas fpc @fpopt.cfg bnc.pas -- 2.11.4.GIT