mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-14 22:03:27 +01:00
add git branch to logs
This commit is contained in:
FunkyFr3sh
parent
7c85e9c494
commit
0f2a367c36
7
Makefile
7
Makefile
@ -1,12 +1,15 @@
|
||||
-include config.mk
|
||||
|
||||
TARGET = ddraw.dll
|
||||
GIT_REV := $(shell git rev-parse --short @{0} || echo "UNKNOWN")
|
||||
GIT_FILE := $(shell echo "#define GIT_COMMIT" $(GIT_REV) > inc/version_tmp.h)
|
||||
LDFLAGS = -Wl,--enable-stdcall-fixup -s -static -shared
|
||||
CFLAGS = -Iinc -O2 -march=i486 -Wall
|
||||
LIBS = -lgdi32 -lwinmm -ldbghelp -lole32
|
||||
|
||||
REV := $(shell git rev-parse --short HEAD || echo "UNKNOWN")
|
||||
BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo "UNKNOWN")
|
||||
EREV := $(shell echo "#define GIT_COMMIT" $(REV) > inc/version_tmp.h)
|
||||
EBRANCH := $(shell echo "#define GIT_BRANCH" $(BRANCH) >> inc/version_tmp.h)
|
||||
|
||||
CC = i686-w64-mingw32-gcc
|
||||
WINDRES ?= i686-w64-mingw32-windres
|
||||
|
||||
|
||||
@ -232,8 +232,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
|
||||
</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
echo | set /p dummyName=#define GIT_COMMIT > inc/version_tmp.h
|
||||
"$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || "$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || git rev-parse --short HEAD >> inc/version_tmp.h || echo UNKNOWN >> inc/version_tmp.h
|
||||
SET DST_FILE="inc/version_tmp.h"
|
||||
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
|
||||
|
||||
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
|
||||
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
|
||||
|
||||
echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE%
|
||||
%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE%
|
||||
%GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
SET ERRORLEVEL = 0
|
||||
</Command>
|
||||
@ -267,8 +276,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
|
||||
</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
echo | set /p dummyName=#define GIT_COMMIT > inc/version_tmp.h
|
||||
"$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || "$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || git rev-parse --short HEAD >> inc/version_tmp.h || echo UNKNOWN >> inc/version_tmp.h
|
||||
SET DST_FILE="inc/version_tmp.h"
|
||||
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
|
||||
|
||||
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
|
||||
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
|
||||
|
||||
echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE%
|
||||
%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE%
|
||||
%GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
SET ERRORLEVEL = 0
|
||||
</Command>
|
||||
@ -302,8 +320,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
|
||||
</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
echo | set /p dummyName=#define GIT_COMMIT > inc/version_tmp.h
|
||||
"$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || "$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || git rev-parse --short HEAD >> inc/version_tmp.h || echo UNKNOWN >> inc/version_tmp.h
|
||||
SET DST_FILE="inc/version_tmp.h"
|
||||
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
|
||||
|
||||
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
|
||||
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
|
||||
|
||||
echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE%
|
||||
%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE%
|
||||
%GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
SET ERRORLEVEL = 0
|
||||
</Command>
|
||||
@ -337,8 +364,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
|
||||
</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
echo | set /p dummyName=#define GIT_COMMIT > inc/version_tmp.h
|
||||
"$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || "$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || git rev-parse --short HEAD >> inc/version_tmp.h || echo UNKNOWN >> inc/version_tmp.h
|
||||
SET DST_FILE="inc/version_tmp.h"
|
||||
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
|
||||
|
||||
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
|
||||
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
|
||||
|
||||
echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE%
|
||||
%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE%
|
||||
%GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
SET ERRORLEVEL = 0
|
||||
</Command>
|
||||
@ -372,8 +408,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
|
||||
</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
echo | set /p dummyName=#define GIT_COMMIT > inc/version_tmp.h
|
||||
"$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || "$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git" rev-parse --short HEAD >> inc/version_tmp.h || git rev-parse --short HEAD >> inc/version_tmp.h || echo UNKNOWN >> inc/version_tmp.h
|
||||
SET DST_FILE="inc/version_tmp.h"
|
||||
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
|
||||
|
||||
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
|
||||
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
|
||||
|
||||
echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE%
|
||||
%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE%
|
||||
%GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%
|
||||
|
||||
SET ERRORLEVEL = 0
|
||||
</Command>
|
||||
|
||||
4
res.rc
4
res.rc
@ -12,13 +12,13 @@ PRODUCTVERSION VERSION
|
||||
{
|
||||
VALUE "CompanyName", "github.com/FunkyFr3sh"
|
||||
VALUE "FileDescription", "DirectDraw replacement"
|
||||
VALUE "FileVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ")"
|
||||
VALUE "FileVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ", " git_str(GIT_BRANCH) ")"
|
||||
VALUE "InternalName", "ddraw"
|
||||
VALUE "LegalCopyright", "Copyright (c) 2010-2024"
|
||||
VALUE "LegalTrademarks", ""
|
||||
VALUE "OriginalFileName", "ddraw.dll"
|
||||
VALUE "ProductName", "cnc-ddraw"
|
||||
VALUE "ProductVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ")"
|
||||
VALUE "ProductVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ", " git_str(GIT_BRANCH) ")"
|
||||
VALUE "Comments", "https://github.com/FunkyFr3sh/cnc-ddraw"
|
||||
}
|
||||
}
|
||||
|
||||
@ -153,12 +153,13 @@ void dbg_init()
|
||||
}
|
||||
|
||||
TRACE(
|
||||
"cnc-ddraw version = %d.%d.%d.%d (git~%s)\n",
|
||||
"cnc-ddraw version = %d.%d.%d.%d (git~%s, %s)\n",
|
||||
VERSION_MAJOR,
|
||||
VERSION_MINOR,
|
||||
VERSION_BUILD,
|
||||
VERSION_REVISION,
|
||||
git_str(GIT_COMMIT));
|
||||
git_str(GIT_COMMIT),
|
||||
git_str(GIT_BRANCH));
|
||||
|
||||
HKEY hkey;
|
||||
LONG status =
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user