ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dropped "dev-" prefix from version tag

Browse Source 
In commit c3a31666, "dev-" prefix was dropped unintentionally. This commit fixes
that.
This commit is contained in:
Hasan Yasin Ozturk
2023-07-31 17:46:45 +03:00
parent c3a316664a
commit 963eeee361
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.bat
+1 -1
View File
@@ -52,7 +52,7 @@ set compiler_defines= -DODIN_VERSION_RAW=\"%odin_version_raw%\"
if not exist .git\ goto skip_git_hash if not exist .git\ goto skip_git_hash
for /f "tokens=1,2" %%i IN ('git show "--pretty=%%cd %%h" "--date=format:%%Y-%%m" --no-patch --no-notes HEAD') do ( for /f "tokens=1,2" %%i IN ('git show "--pretty=%%cd %%h" "--date=format:%%Y-%%m" --no-patch --no-notes HEAD') do (
set odin_version_raw=%%i set odin_version_raw=dev-%%i
set GIT_SHA=%%j set GIT_SHA=%%j
) )
if %ERRORLEVEL% equ 0 set compiler_defines=%compiler_defines% -DGIT_SHA=\"%GIT_SHA%\" if %ERRORLEVEL% equ 0 set compiler_defines=%compiler_defines% -DGIT_SHA=\"%GIT_SHA%\"
build_odin.sh
+1 -1
View File
@@ -14,7 +14,7 @@ LDFLAGS="$LDFLAGS -pthread -lm -lstdc++"
if [ -d ".git" ] && [ $(which git) ]; then if [ -d ".git" ] && [ $(which git) ]; then
versionTag=( $(git show --pretty='%cd %h' --date=format:%Y-%m --no-patch --no-notes HEAD) ) versionTag=( $(git show --pretty='%cd %h' --date=format:%Y-%m --no-patch --no-notes HEAD) )
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
ODIN_VERSION="${versionTag[0]}" ODIN_VERSION="dev-${versionTag[0]}"
GIT_SHA="${versionTag[1]}" GIT_SHA="${versionTag[1]}"
CPPFLAGS="$CPPFLAGS -DGIT_SHA=\"$GIT_SHA\"" CPPFLAGS="$CPPFLAGS -DGIT_SHA=\"$GIT_SHA\""
fi fi