backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-14 22:03:27 +01:00
Code Issues Projects Releases Activity

simplify git code

Browse Source
This commit is contained in:
FunkyFr3sh 2024-09-02 10:44:09 +02:00
parent 4d5882414c
commit 40e30163d1
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
inc/version_tmp.h inc/git.h
# C++ Builder # C++ Builder

4
Makefile
View File

@ -7,8 +7,8 @@ LIBS = -lgdi32 -lwinmm -ldbghelp -lole32
COMMIT := $(shell git describe --match=NeVeRmAtCh --always --dirty || echo "UNKNOWN") COMMIT := $(shell git describe --match=NeVeRmAtCh --always --dirty || echo "UNKNOWN")
BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo "UNKNOWN") BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo "UNKNOWN")
ECOMMIT := $(shell echo "#define GIT_COMMIT" $(COMMIT) > inc/version_tmp.h) ECOMMIT := $(shell echo "#define GIT_COMMIT" \"$(COMMIT)\" > inc/git.h)
EBRANCH := $(shell echo "#define GIT_BRANCH" $(BRANCH) >> inc/version_tmp.h) EBRANCH := $(shell echo "#define GIT_BRANCH" \"$(BRANCH)\" >> inc/git.h)
CC = i686-w64-mingw32-gcc CC = i686-w64-mingw32-gcc
WINDRES ?= i686-w64-mingw32-windres WINDRES ?= i686-w64-mingw32-windres

80
cnc-ddraw.vcxproj
View File

@ -232,17 +232,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
</PostBuildEvent> </PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
SET DST_FILE="inc/version_tmp.h" set DST_FILE="inc/git.h"
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" 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="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
if not exist %GIT_PATH% SET GIT_PATH="git.exe" if not exist %GIT_PATH% set GIT_PATH=git.exe
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE% echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
SET ERRORLEVEL = 0 SET ERRORLEVEL = 0
</Command> </Command>
@ -276,17 +276,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
</PostBuildEvent> </PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
SET DST_FILE="inc/version_tmp.h" set DST_FILE="inc/git.h"
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" 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="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
if not exist %GIT_PATH% SET GIT_PATH="git.exe" if not exist %GIT_PATH% set GIT_PATH=git.exe
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE% echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
SET ERRORLEVEL = 0 SET ERRORLEVEL = 0
</Command> </Command>
@ -320,17 +320,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
</PostBuildEvent> </PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
SET DST_FILE="inc/version_tmp.h" set DST_FILE="inc/git.h"
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" 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="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
if not exist %GIT_PATH% SET GIT_PATH="git.exe" if not exist %GIT_PATH% set GIT_PATH=git.exe
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE% echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
SET ERRORLEVEL = 0 SET ERRORLEVEL = 0
</Command> </Command>
@ -364,17 +364,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
</PostBuildEvent> </PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
SET DST_FILE="inc/version_tmp.h" set DST_FILE="inc/git.h"
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" 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="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
if not exist %GIT_PATH% SET GIT_PATH="git.exe" if not exist %GIT_PATH% set GIT_PATH=git.exe
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE% echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
SET ERRORLEVEL = 0 SET ERRORLEVEL = 0
</Command> </Command>
@ -408,17 +408,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
</PostBuildEvent> </PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
SET DST_FILE="inc/version_tmp.h" set DST_FILE="inc/git.h"
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" 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="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
if not exist %GIT_PATH% SET GIT_PATH="git.exe" if not exist %GIT_PATH% set GIT_PATH=git.exe
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE% echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE% echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
SET ERRORLEVEL = 0 SET ERRORLEVEL = 0
</Command> </Command>

6
res.rc
View File

@ -1,5 +1,5 @@
#include "inc/version.h" #include "inc/version.h"
#include "inc/version_tmp.h" #include "inc/git.h"
1 VERSIONINFO 1 VERSIONINFO
@ -12,13 +12,13 @@ PRODUCTVERSION VERSION
{ {
VALUE "CompanyName", "github.com/FunkyFr3sh" VALUE "CompanyName", "github.com/FunkyFr3sh"
VALUE "FileDescription", "DirectDraw replacement" VALUE "FileDescription", "DirectDraw replacement"
VALUE "FileVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ", " git_str(GIT_BRANCH) ")" VALUE "FileVersion", VERSION_STRING " (git~" GIT_COMMIT ", " GIT_BRANCH ")"
VALUE "InternalName", "ddraw" VALUE "InternalName", "ddraw"
VALUE "LegalCopyright", "Copyright (c) 2010-2024" VALUE "LegalCopyright", "Copyright (c) 2010-2024"
VALUE "LegalTrademarks", "" VALUE "LegalTrademarks", ""
VALUE "OriginalFileName", "ddraw.dll" VALUE "OriginalFileName", "ddraw.dll"
VALUE "ProductName", "cnc-ddraw" VALUE "ProductName", "cnc-ddraw"
VALUE "ProductVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ", " git_str(GIT_BRANCH) ")" VALUE "ProductVersion", VERSION_STRING " (git~" GIT_COMMIT ", " GIT_BRANCH ")"
VALUE "Comments", "https://github.com/FunkyFr3sh/cnc-ddraw" VALUE "Comments", "https://github.com/FunkyFr3sh/cnc-ddraw"
} }
} }

6
src/debug.c
View File

@ -8,7 +8,7 @@
#include "debug.h" #include "debug.h"
#include "hook.h" #include "hook.h"
#include "version.h" #include "version.h"
#include "version_tmp.h" #include "git.h"
#include "versionhelpers.h" #include "versionhelpers.h"
@ -158,8 +158,8 @@ void dbg_init()
VERSION_MINOR, VERSION_MINOR,
VERSION_BUILD, VERSION_BUILD,
VERSION_REVISION, VERSION_REVISION,
git_str(GIT_COMMIT), GIT_COMMIT,
git_str(GIT_BRANCH)); GIT_BRANCH);
HKEY hkey; HKEY hkey;
LONG status = LONG status =