From 81daf725d5c82972dcc440d762777755b345ec62 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 23 Mar 2026 08:37:40 +0100 Subject: [PATCH] arreglada la carpeta tools eliminat frameworks sobrants (reduix prou el executable de macos) --- .gitignore | 4 ++-- Makefile | 6 +++--- .../linter}/build_time_tracker.sh | 0 {linux_utils => tools/linter}/ccae.desktop | 0 .../linter}/check_all_includes.sh | 0 .../linter}/check_all_includes_with_pause.sh | 0 .../linter}/check_one_file_includes.sh | 0 .../linter}/com_usar_clang-tidy.txt | 0 .../linter}/cppcheck_suppressions | 0 .../linter}/generate_compile_commands_json.sh | 0 {linux_utils => tools/linter}/iwyu_tool.py | 0 .../linter}/no-overview-at-startup.desktop | 0 .../linter}/no-overview-at-startup.sh | 0 {linux_utils => tools/linter}/run_clang-tidy.sh | 0 {linux_utils => tools/linter}/run_cppcheck.sh | 0 {linux_utils => tools/linter}/run_iwyu.sh | 0 {linux_utils => tools/linter}/run_iwyu_dry_run.sh | 0 {linux_utils => tools/linter}/run_valgrind.sh | 0 {linux_utils => tools/linter}/sdl3_mapping.imp | 0 {linux_utils => tools/linter}/splash.png | Bin {linux_utils => tools/linter}/splash.txt | 0 {linux_utils => tools/linter}/valgrind_exceptions | 0 tools/{ => pack_resources}/Makefile | 14 +++++++------- tools/{ => pack_resources}/README.md | 0 tools/{ => pack_resources}/pack_resources.cpp | 0 25 files changed, 12 insertions(+), 12 deletions(-) rename {linux_utils => tools/linter}/build_time_tracker.sh (100%) rename {linux_utils => tools/linter}/ccae.desktop (100%) rename {linux_utils => tools/linter}/check_all_includes.sh (100%) rename {linux_utils => tools/linter}/check_all_includes_with_pause.sh (100%) rename {linux_utils => tools/linter}/check_one_file_includes.sh (100%) rename {linux_utils => tools/linter}/com_usar_clang-tidy.txt (100%) rename {linux_utils => tools/linter}/cppcheck_suppressions (100%) rename {linux_utils => tools/linter}/generate_compile_commands_json.sh (100%) rename {linux_utils => tools/linter}/iwyu_tool.py (100%) rename {linux_utils => tools/linter}/no-overview-at-startup.desktop (100%) rename {linux_utils => tools/linter}/no-overview-at-startup.sh (100%) rename {linux_utils => tools/linter}/run_clang-tidy.sh (100%) rename {linux_utils => tools/linter}/run_cppcheck.sh (100%) rename {linux_utils => tools/linter}/run_iwyu.sh (100%) rename {linux_utils => tools/linter}/run_iwyu_dry_run.sh (100%) rename {linux_utils => tools/linter}/run_valgrind.sh (100%) rename {linux_utils => tools/linter}/sdl3_mapping.imp (100%) rename {linux_utils => tools/linter}/splash.png (100%) rename {linux_utils => tools/linter}/splash.txt (100%) rename {linux_utils => tools/linter}/valgrind_exceptions (100%) rename tools/{ => pack_resources}/Makefile (85%) rename tools/{ => pack_resources}/README.md (100%) rename tools/{ => pack_resources}/pack_resources.cpp (100%) diff --git a/.gitignore b/.gitignore index a21f596..c6bcee7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,5 @@ release/windows/coffee.res resources.pack # Herramienta pack_resources (todas las plataformas) -tools/pack_resources -tools/pack_resources.exe +tools/pack_resources/pack_resources +tools/pack_resources/pack_resources.exe diff --git a/Makefile b/Makefile index febe360..c2712d5 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ RESOURCE_FILE := release/windows/coffee.res # Variables para herramienta de empaquetado ifeq ($(OS),Windows_NT) - PACK_TOOL := $(DIR_TOOLS)pack_resources.exe + PACK_TOOL := $(DIR_TOOLS)pack_resources/pack_resources.exe PACK_CXX := $(CXX) else - PACK_TOOL := $(DIR_TOOLS)pack_resources + PACK_TOOL := $(DIR_TOOLS)pack_resources/pack_resources PACK_CXX := $(CXX) endif -PACK_SOURCES := $(DIR_TOOLS)pack_resources.cpp $(DIR_SOURCES)resource_pack.cpp +PACK_SOURCES := $(DIR_TOOLS)pack_resources/pack_resources.cpp $(DIR_SOURCES)resource_pack.cpp PACK_INCLUDES := -I$(DIR_ROOT) -I$(DIR_BUILD) # Versión automática basada en la fecha actual (específica por SO) diff --git a/linux_utils/build_time_tracker.sh b/tools/linter/build_time_tracker.sh similarity index 100% rename from linux_utils/build_time_tracker.sh rename to tools/linter/build_time_tracker.sh diff --git a/linux_utils/ccae.desktop b/tools/linter/ccae.desktop similarity index 100% rename from linux_utils/ccae.desktop rename to tools/linter/ccae.desktop diff --git a/linux_utils/check_all_includes.sh b/tools/linter/check_all_includes.sh similarity index 100% rename from linux_utils/check_all_includes.sh rename to tools/linter/check_all_includes.sh diff --git a/linux_utils/check_all_includes_with_pause.sh b/tools/linter/check_all_includes_with_pause.sh similarity index 100% rename from linux_utils/check_all_includes_with_pause.sh rename to tools/linter/check_all_includes_with_pause.sh diff --git a/linux_utils/check_one_file_includes.sh b/tools/linter/check_one_file_includes.sh similarity index 100% rename from linux_utils/check_one_file_includes.sh rename to tools/linter/check_one_file_includes.sh diff --git a/linux_utils/com_usar_clang-tidy.txt b/tools/linter/com_usar_clang-tidy.txt similarity index 100% rename from linux_utils/com_usar_clang-tidy.txt rename to tools/linter/com_usar_clang-tidy.txt diff --git a/linux_utils/cppcheck_suppressions b/tools/linter/cppcheck_suppressions similarity index 100% rename from linux_utils/cppcheck_suppressions rename to tools/linter/cppcheck_suppressions diff --git a/linux_utils/generate_compile_commands_json.sh b/tools/linter/generate_compile_commands_json.sh similarity index 100% rename from linux_utils/generate_compile_commands_json.sh rename to tools/linter/generate_compile_commands_json.sh diff --git a/linux_utils/iwyu_tool.py b/tools/linter/iwyu_tool.py similarity index 100% rename from linux_utils/iwyu_tool.py rename to tools/linter/iwyu_tool.py diff --git a/linux_utils/no-overview-at-startup.desktop b/tools/linter/no-overview-at-startup.desktop similarity index 100% rename from linux_utils/no-overview-at-startup.desktop rename to tools/linter/no-overview-at-startup.desktop diff --git a/linux_utils/no-overview-at-startup.sh b/tools/linter/no-overview-at-startup.sh similarity index 100% rename from linux_utils/no-overview-at-startup.sh rename to tools/linter/no-overview-at-startup.sh diff --git a/linux_utils/run_clang-tidy.sh b/tools/linter/run_clang-tidy.sh similarity index 100% rename from linux_utils/run_clang-tidy.sh rename to tools/linter/run_clang-tidy.sh diff --git a/linux_utils/run_cppcheck.sh b/tools/linter/run_cppcheck.sh similarity index 100% rename from linux_utils/run_cppcheck.sh rename to tools/linter/run_cppcheck.sh diff --git a/linux_utils/run_iwyu.sh b/tools/linter/run_iwyu.sh similarity index 100% rename from linux_utils/run_iwyu.sh rename to tools/linter/run_iwyu.sh diff --git a/linux_utils/run_iwyu_dry_run.sh b/tools/linter/run_iwyu_dry_run.sh similarity index 100% rename from linux_utils/run_iwyu_dry_run.sh rename to tools/linter/run_iwyu_dry_run.sh diff --git a/linux_utils/run_valgrind.sh b/tools/linter/run_valgrind.sh similarity index 100% rename from linux_utils/run_valgrind.sh rename to tools/linter/run_valgrind.sh diff --git a/linux_utils/sdl3_mapping.imp b/tools/linter/sdl3_mapping.imp similarity index 100% rename from linux_utils/sdl3_mapping.imp rename to tools/linter/sdl3_mapping.imp diff --git a/linux_utils/splash.png b/tools/linter/splash.png similarity index 100% rename from linux_utils/splash.png rename to tools/linter/splash.png diff --git a/linux_utils/splash.txt b/tools/linter/splash.txt similarity index 100% rename from linux_utils/splash.txt rename to tools/linter/splash.txt diff --git a/linux_utils/valgrind_exceptions b/tools/linter/valgrind_exceptions similarity index 100% rename from linux_utils/valgrind_exceptions rename to tools/linter/valgrind_exceptions diff --git a/tools/Makefile b/tools/pack_resources/Makefile similarity index 85% rename from tools/Makefile rename to tools/pack_resources/Makefile index e6c0d84..3a2add0 100644 --- a/tools/Makefile +++ b/tools/pack_resources/Makefile @@ -3,8 +3,8 @@ # Variables CXX := g++ -CXXFLAGS := -std=c++20 -Wall -Os -I../ -SOURCES := pack_resources.cpp ../source/resource_pack.cpp +CXXFLAGS := -std=c++20 -Wall -Os -I../../ +SOURCES := pack_resources.cpp ../../source/resource_pack.cpp TARGET := pack_resources CLEAN_FILES := pack_resources *.pack *.o @@ -41,9 +41,9 @@ clean: test_pack: pack_tool @echo "Creando pack de recursos de prueba..." ifeq ($(OS),Windows_NT) - .\$(TARGET) ..\data test_resources.pack + .\$(TARGET) ..\..\data test_resources.pack else - ./$(TARGET) ../data test_resources.pack + ./$(TARGET) ../../data test_resources.pack endif @echo "✓ Pack de prueba creado: test_resources.pack" @@ -51,11 +51,11 @@ endif create_pack: pack_tool @echo "Creando pack de recursos final..." ifeq ($(OS),Windows_NT) - .\$(TARGET) ..\data ..\resources.pack + .\$(TARGET) ..\..\data ..\..\resources.pack else - ./$(TARGET) ../data ../resources.pack + ./$(TARGET) ../../data ../../resources.pack endif - @echo "✓ Pack final creado: ../resources.pack" + @echo "✓ Pack final creado: ../../resources.pack" # Mostrar ayuda help: diff --git a/tools/README.md b/tools/pack_resources/README.md similarity index 100% rename from tools/README.md rename to tools/pack_resources/README.md diff --git a/tools/pack_resources.cpp b/tools/pack_resources/pack_resources.cpp similarity index 100% rename from tools/pack_resources.cpp rename to tools/pack_resources/pack_resources.cpp