forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #670 from wilzbach/githash-windows 

Improve auto-versioning
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-06-29 15:31:49 +02:00 committed by GitHub
parent 0ec1e9557a d0a732113c
commit 83fb251d73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -29,10 +29,6 @@ obj
# debug build # debug build
dsc dsc
# Git hash
githash.txt
githash_.txt
# GDB history # GDB history
.gdb_history .gdb_history

13
build.bat
View File

@ -6,17 +6,18 @@ if "%DC%"=="ldc2" set DC="ldmd2"
:: git might not be installed, so we provide 0.0.0 as a fallback or use :: git might not be installed, so we provide 0.0.0 as a fallback or use
:: the existing githash file if existent :: the existing githash file if existent
git describe --tags > githash_.txt if not exist "bin" mkdir bin
for /f %%i in ("githash_.txt") do set githashsize=%%~zi git describe --tags > bin\githash_.txt
for /f %%i in ("bin\githash_.txt") do set githashsize=%%~zi
if %githashsize% == 0 ( if %githashsize% == 0 (
if not exist "githash.txt" ( if not exist "bin\githash.txt" (
echo v0.0.0 > githash.txt echo v0.0.0 > bin\githash.txt
) )
) else ( ) else (
move /y githash_.txt githash.txt move /y bin\githash_.txt bin\githash.txt
) )
set DFLAGS=-O -release -inline -version=StdLoggerDisableWarning -J. set DFLAGS=-O -release -inline -version=StdLoggerDisableWarning -Jbin
set TESTFLAGS=-g -w -version=StdLoggerDisableWarning set TESTFLAGS=-g -w -version=StdLoggerDisableWarning
set CORE= set CORE=
set LIBDPARSE= set LIBDPARSE=

2
release-windows.sh
View File

@ -19,7 +19,7 @@ fi
archiveName="dscanner-$VERSION-$OS-$ARCH_SUFFIX.zip" archiveName="dscanner-$VERSION-$OS-$ARCH_SUFFIX.zip"
echo "Building $archiveName" echo "Building $archiveName"
mkdir -p bin mkdir -p bin
git describe --tags > githash.txt # no git installed under Wine git describe --tags > bin/githash.txt # no git installed under Wine
DC="$DIR/dmd2/windows/bin/dmd.exe" wine cmd /C build.bat DC="$DIR/dmd2/windows/bin/dmd.exe" wine cmd /C build.bat
cd bin cd bin

6
src/dscanner/dscanner_version.d
View File

@ -5,18 +5,20 @@
module dscanner.dscanner_version; module dscanner.dscanner_version;
import std.string : strip;
/** /**
* Human-readable version number * Human-readable version number
*/ */
version (built_with_dub) version (built_with_dub)
{ {
enum DSCANNER_VERSION = import("dubhash.txt"); enum DSCANNER_VERSION = import("dubhash.txt").strip;
} }
else else
{ {
/** /**
* Current build's Git commit hash * Current build's Git commit hash
*/ */
enum DSCANNER_VERSION = import("githash.txt"); enum DSCANNER_VERSION = import("githash.txt").strip;
} }