correccions en makefile i version.h

This commit is contained in:
2025-11-01 09:44:31 +01:00
parent 66c7c9dfe6
commit 5c5151c032
4 changed files with 17 additions and 2 deletions

1
.gitignore vendored
View File

@@ -16,3 +16,4 @@ todo
build/ build/
linux_utils/ linux_utils/
.claude/ .claude/
source/version.h

View File

@@ -50,6 +50,10 @@ windows_release:
@$(MAKE) pack_tool @$(MAKE) pack_tool
@$(MAKE) resources.pack @$(MAKE) resources.pack
# Generate version.h from version.h.in
@echo "Generating version.h..."
@powershell -Command "$$GIT_HASH = (git rev-parse --short=7 HEAD 2>$$null); if (-not $$GIT_HASH) { $$GIT_HASH = 'unknown' }; (Get-Content source/version.h.in) -replace '@GIT_HASH@', $$GIT_HASH | Set-Content source/version.h"
# Create release folder # Create release folder
powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force} powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force}
powershell if (-not (Test-Path "$(releaseFolder)")) {New-Item "$(releaseFolder)" -ItemType Directory} powershell if (-not (Test-Path "$(releaseFolder)")) {New-Item "$(releaseFolder)" -ItemType Directory}
@@ -86,6 +90,11 @@ macos_release:
@$(MAKE) resources.pack @$(MAKE) resources.pack
@echo "Creating macOS release - Version: $(VERSION)" @echo "Creating macOS release - Version: $(VERSION)"
# Generate version.h from version.h.in
@echo "Generating version.h..."
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
sed "s/@GIT_HASH@/$$GIT_HASH/g" source/version.h.in > source/version.h
# Verify and install create-dmg if necessary # Verify and install create-dmg if necessary
@which create-dmg > /dev/null || (echo "Installing create-dmg..." && brew install create-dmg) @which create-dmg > /dev/null || (echo "Installing create-dmg..." && brew install create-dmg)
@@ -177,6 +186,11 @@ linux_release:
@$(MAKE) pack_tool @$(MAKE) pack_tool
@$(MAKE) resources.pack @$(MAKE) resources.pack
# Generate version.h from version.h.in
@echo "Generating version.h..."
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
sed "s/@GIT_HASH@/$$GIT_HASH/g" source/version.h.in > source/version.h
# Remove data # Remove data
rm -rdf "$(releaseFolder)" rm -rdf "$(releaseFolder)"

Binary file not shown.

View File

@@ -2,5 +2,5 @@
namespace Version { namespace Version {
constexpr const char* GIT_HASH = "@GIT_HASH@"; constexpr const char* GIT_HASH = "@GIT_HASH@";
constexpr const char* APP_NAME = "Coffee Crisis Arcade Edition"; constexpr const char* APP_NAME = "JailDoctor's Dilemma";
} // namespace Version } // namespace Version