corregida la ubicació de project.h
All checks were successful
Release / build-linux (push) Successful in 3m15s
Release / build-windows (push) Successful in 4m0s
Release / create-release (push) Successful in 3s

This commit is contained in:
2025-11-24 20:07:32 +01:00
parent 58369fbf22
commit 45ea8636f1
4 changed files with 14 additions and 16 deletions

3
.gitignore vendored
View File

@@ -20,6 +20,9 @@ pollo_release/
tools/pack_resources/pack_resources tools/pack_resources/pack_resources
tools/pack_resources/pack_resources.exe tools/pack_resources/pack_resources.exe
# Archivos generados
source/project.h
# CI/CD runner data (local) # CI/CD runner data (local)
docker/runner-data/ docker/runner-data/
docker/config.yaml docker/config.yaml

View File

@@ -1,7 +1,7 @@
# CMakeLists.txt # CMakeLists.txt
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(pollo VERSION 0.1) project(pollo VERSION 0.1.0)
# Info del proyecto para version.h # Info del proyecto para version.h
set(PROJECT_LONG_NAME "Los pollos hermanos") set(PROJECT_LONG_NAME "Los pollos hermanos")
@@ -36,7 +36,7 @@ else()
endif() endif()
# Configurar archivo de versión # Configurar archivo de versión
configure_file(${CMAKE_SOURCE_DIR}/source/project.h.in ${CMAKE_SOURCE_DIR}/source/project.h @ONLY) configure_file(${CMAKE_SOURCE_DIR}/source/project.h.in ${CMAKE_BINARY_DIR}/project.h @ONLY)
# --- 1. LISTA EXPLÍCITA DE FUENTES --- # --- 1. LISTA EXPLÍCITA DE FUENTES ---
set(APP_SOURCES set(APP_SOURCES

View File

@@ -118,7 +118,7 @@ ALL_SOURCES := $(APP_SOURCES)
# ============================================================================== # ==============================================================================
# INCLUDES # INCLUDES
# ============================================================================== # ==============================================================================
INCLUDES := -Isource INCLUDES := -Isource -Ibuild
# ============================================================================== # ==============================================================================
# COMPILER FLAGS (OS-specific) # COMPILER FLAGS (OS-specific)
@@ -196,7 +196,8 @@ windows_release:
# Generate project.h from project.h.in # Generate project.h from project.h.in
@echo "Generando project.h..." @echo "Generando project.h..."
@powershell -Command "$$GIT_HASH = (git rev-parse --short=7 HEAD 2>$$null); if (-not $$GIT_HASH) { $$GIT_HASH = 'unknown' }; $$RAW_VERSION = '$(VERSION)' -replace '^v', ''; $$COPYRIGHT = (Select-String -Path 'CMakeLists.txt' -Pattern 'set\(PROJECT_COPYRIGHT \"(.+?)\"').Matches.Groups[1].Value; (Get-Content source/project.h.in) -replace '@PROJECT_NAME@', '$(TARGET_NAME)' -replace '@PROJECT_LONG_NAME@', '$(LONG_NAME)' -replace '@PROJECT_VERSION@', $$RAW_VERSION -replace '@PROJECT_COPYRIGHT@', $$COPYRIGHT -replace '@GIT_HASH@', $$GIT_HASH | Set-Content source/project.h" @powershell if (-not (Test-Path "build")) {New-Item "build" -ItemType Directory}
@powershell -Command "$$GIT_HASH = (git rev-parse --short=7 HEAD 2>$$null); if (-not $$GIT_HASH) { $$GIT_HASH = 'unknown' }; $$RAW_VERSION = '$(VERSION)' -replace '^v', ''; $$COPYRIGHT = (Select-String -Path 'CMakeLists.txt' -Pattern 'set\(PROJECT_COPYRIGHT \"(.+?)\"').Matches.Groups[1].Value; (Get-Content source/project.h.in) -replace '@PROJECT_NAME@', '$(TARGET_NAME)' -replace '@PROJECT_LONG_NAME@', '$(LONG_NAME)' -replace '@PROJECT_VERSION@', $$RAW_VERSION -replace '@PROJECT_COPYRIGHT@', $$COPYRIGHT -replace '@GIT_HASH@', $$GIT_HASH | Set-Content build/project.h"
# Crea carpeta temporal 'RELEASE_FOLDER' # Crea carpeta temporal 'RELEASE_FOLDER'
powershell if (Test-Path "$(RELEASE_FOLDER)") {Remove-Item "$(RELEASE_FOLDER)" -Recurse -Force} powershell if (Test-Path "$(RELEASE_FOLDER)") {Remove-Item "$(RELEASE_FOLDER)" -Recurse -Force}
@@ -245,6 +246,7 @@ macos_release:
# Generate project.h from project.h.in # Generate project.h from project.h.in
@echo "Generando project.h..." @echo "Generando project.h..."
@$(MKDIR) build
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \ @GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \ RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \
COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \ COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \
@@ -253,7 +255,7 @@ macos_release:
-e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \ -e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \
-e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \ -e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \
-e "s/@GIT_HASH@/$$GIT_HASH/g" \ -e "s/@GIT_HASH@/$$GIT_HASH/g" \
source/project.h.in > source/project.h source/project.h.in > build/project.h
# Elimina datos de compilaciones anteriores # Elimina datos de compilaciones anteriores
$(RMDIR) "$(RELEASE_FOLDER)" $(RMDIR) "$(RELEASE_FOLDER)"
@@ -358,6 +360,7 @@ linux_release:
# Generate project.h from project.h.in # Generate project.h from project.h.in
@echo "Generando project.h..." @echo "Generando project.h..."
@$(MKDIR) build
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \ @GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \ RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \
COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \ COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \
@@ -366,7 +369,7 @@ linux_release:
-e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \ -e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \
-e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \ -e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \
-e "s/@GIT_HASH@/$$GIT_HASH/g" \ -e "s/@GIT_HASH@/$$GIT_HASH/g" \
source/project.h.in > source/project.h source/project.h.in > build/project.h
# Elimina carpetas previas # Elimina carpetas previas
$(RMDIR) "$(RELEASE_FOLDER)" $(RMDIR) "$(RELEASE_FOLDER)"
@@ -407,6 +410,7 @@ rpi_release:
# Generate project.h from project.h.in # Generate project.h from project.h.in
@echo "Generando project.h..." @echo "Generando project.h..."
@$(MKDIR) build
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \ @GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \ RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \
COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \ COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \
@@ -415,7 +419,7 @@ rpi_release:
-e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \ -e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \
-e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \ -e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \
-e "s/@GIT_HASH@/$$GIT_HASH/g" \ -e "s/@GIT_HASH@/$$GIT_HASH/g" \
source/project.h.in > source/project.h source/project.h.in > build/project.h
# Elimina carpetas previas # Elimina carpetas previas
$(RMDIR) "$(RELEASE_FOLDER)" $(RMDIR) "$(RELEASE_FOLDER)"

View File

@@ -1,9 +0,0 @@
#pragma once
namespace Project {
constexpr const char* NAME = "pollo";
constexpr const char* LONG_NAME = "Los pollos hermanos";
constexpr const char* VERSION = "0.1";
constexpr const char* COPYRIGHT = "@2025 JailDesigner";
constexpr const char* GIT_HASH = "dd09471";
} // namespace Project