Skip to content

Commit 40e3016

Browse files
FunkyFr3shFunkyFr3sh
committedSep 2, 2024·
simplify git code
·
v7.1.0.0experimental
1 parent 4d58824 commit 40e3016

File tree

5 files changed

+49
-49
lines changed

5 files changed

+49
-49
lines changed
 

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
inc/version_tmp.h
2+
inc/git.h
33

44
# C++ Builder
55

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ LIBS = -lgdi32 -lwinmm -ldbghelp -lole32
77

88
COMMIT := $(shell git describe --match=NeVeRmAtCh --always --dirty || echo "UNKNOWN")
99
BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo "UNKNOWN")
10-
ECOMMIT := $(shell echo "#define GIT_COMMIT" $(COMMIT) > inc/version_tmp.h)
11-
EBRANCH := $(shell echo "#define GIT_BRANCH" $(BRANCH) >> inc/version_tmp.h)
10+
ECOMMIT := $(shell echo "#define GIT_COMMIT" \"$(COMMIT)\" > inc/git.h)
11+
EBRANCH := $(shell echo "#define GIT_BRANCH" \"$(BRANCH)\" >> inc/git.h)
1212

1313
CC = i686-w64-mingw32-gcc
1414
WINDRES ?= i686-w64-mingw32-windres

‎cnc-ddraw.vcxproj

+40-40
Original file line numberDiff line numberDiff line change
@@ -232,17 +232,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
232232
</PostBuildEvent>
233233
<PreBuildEvent>
234234
<Command>
235-
SET DST_FILE="inc/version_tmp.h"
236-
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
235+
set DST_FILE="inc/git.h"
236+
set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
237237

238-
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
239-
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
238+
if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
239+
if not exist %GIT_PATH% set GIT_PATH=git.exe
240240

241-
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE%
242-
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
241+
for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
242+
for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
243243

244-
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE%
245-
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
244+
echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
245+
echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
246246

247247
SET ERRORLEVEL = 0
248248
</Command>
@@ -276,17 +276,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
276276
</PostBuildEvent>
277277
<PreBuildEvent>
278278
<Command>
279-
SET DST_FILE="inc/version_tmp.h"
280-
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
279+
set DST_FILE="inc/git.h"
280+
set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
281281

282-
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
283-
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
282+
if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
283+
if not exist %GIT_PATH% set GIT_PATH=git.exe
284284

285-
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE%
286-
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
285+
for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
286+
for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
287287

288-
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE%
289-
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
288+
echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
289+
echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
290290

291291
SET ERRORLEVEL = 0
292292
</Command>
@@ -320,17 +320,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
320320
</PostBuildEvent>
321321
<PreBuildEvent>
322322
<Command>
323-
SET DST_FILE="inc/version_tmp.h"
324-
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
323+
set DST_FILE="inc/git.h"
324+
set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
325325

326-
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
327-
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
326+
if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
327+
if not exist %GIT_PATH% set GIT_PATH=git.exe
328328

329-
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE%
330-
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
329+
for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
330+
for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
331331

332-
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE%
333-
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
332+
echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
333+
echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
334334

335335
SET ERRORLEVEL = 0
336336
</Command>
@@ -364,17 +364,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
364364
</PostBuildEvent>
365365
<PreBuildEvent>
366366
<Command>
367-
SET DST_FILE="inc/version_tmp.h"
368-
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
367+
set DST_FILE="inc/git.h"
368+
set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
369369

370-
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
371-
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
370+
if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
371+
if not exist %GIT_PATH% set GIT_PATH=git.exe
372372

373-
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE%
374-
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
373+
for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
374+
for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
375375

376-
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE%
377-
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
376+
echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
377+
echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
378378

379379
SET ERRORLEVEL = 0
380380
</Command>
@@ -408,17 +408,17 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe
408408
</PostBuildEvent>
409409
<PreBuildEvent>
410410
<Command>
411-
SET DST_FILE="inc/version_tmp.h"
412-
SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
411+
set DST_FILE="inc/git.h"
412+
set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe"
413413

414-
if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
415-
if not exist %GIT_PATH% SET GIT_PATH="git.exe"
414+
if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe"
415+
if not exist %GIT_PATH% set GIT_PATH=git.exe
416416

417-
echo | set /p dummyName=#define GIT_COMMIT &gt; %DST_FILE%
418-
%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
417+
for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT="%%I"
418+
for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH="%%I"
419419

420-
echo | set /p dummyName=#define GIT_BRANCH &gt;&gt; %DST_FILE%
421-
%GIT_PATH% rev-parse --abbrev-ref HEAD &gt;&gt; %DST_FILE% || echo UNKNOWN &gt;&gt; %DST_FILE%
420+
echo #define GIT_COMMIT %GIT_COMMIT% &gt; %DST_FILE%
421+
echo #define GIT_BRANCH %GIT_BRANCH% &gt;&gt; %DST_FILE%
422422

423423
SET ERRORLEVEL = 0
424424
</Command>

‎res.rc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "inc/version.h"
2-
#include "inc/version_tmp.h"
2+
#include "inc/git.h"
33

44

55
1 VERSIONINFO
@@ -12,13 +12,13 @@ PRODUCTVERSION VERSION
1212
{
1313
VALUE "CompanyName", "github.com/FunkyFr3sh"
1414
VALUE "FileDescription", "DirectDraw replacement"
15-
VALUE "FileVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ", " git_str(GIT_BRANCH) ")"
15+
VALUE "FileVersion", VERSION_STRING " (git~" GIT_COMMIT ", " GIT_BRANCH ")"
1616
VALUE "InternalName", "ddraw"
1717
VALUE "LegalCopyright", "Copyright (c) 2010-2024"
1818
VALUE "LegalTrademarks", ""
1919
VALUE "OriginalFileName", "ddraw.dll"
2020
VALUE "ProductName", "cnc-ddraw"
21-
VALUE "ProductVersion", VERSION_STRING " (git~" git_str(GIT_COMMIT) ", " git_str(GIT_BRANCH) ")"
21+
VALUE "ProductVersion", VERSION_STRING " (git~" GIT_COMMIT ", " GIT_BRANCH ")"
2222
VALUE "Comments", "https://github.com/FunkyFr3sh/cnc-ddraw"
2323
}
2424
}

‎src/debug.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "debug.h"
99
#include "hook.h"
1010
#include "version.h"
11-
#include "version_tmp.h"
11+
#include "git.h"
1212
#include "versionhelpers.h"
1313

1414

@@ -158,8 +158,8 @@ void dbg_init()
158158
VERSION_MINOR,
159159
VERSION_BUILD,
160160
VERSION_REVISION,
161-
git_str(GIT_COMMIT),
162-
git_str(GIT_BRANCH));
161+
GIT_COMMIT,
162+
GIT_BRANCH);
163163

164164
HKEY hkey;
165165
LONG status =

0 commit comments

Comments
 (0)
Please sign in to comment.