From a0e9984dc5869cd2e65064fe2a6c8a022d5c030a Mon Sep 17 00:00:00 2001 From: Shiz Date: Mon, 1 May 2023 16:28:28 +0200 Subject: [PATCH 1/3] build: add volatile_$module variable for targets that need to be always rebuilt --- GNUmakefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 140afe5..be0bd9b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -37,6 +37,8 @@ ldflags := -Wl,--gc-sections -static-libgcc all: build +FORCE: + .PHONY: \ build-docker \ clean \ @@ -44,7 +46,8 @@ code-format \ print-building \ print-release \ run-tests \ -version +version \ +FORCE release: \ print-release \ @@ -193,6 +196,8 @@ $$(depdir_$1_$2_$3): $$(objdir_$1_$2_$3): $(V)mkdir -p $$@ +$$(volatile_$3:%.c=$$(objdir_$1_$2_$3)/%.o): FORCE + $$(objdir_$1_$2_$3)/%.o: $$(srcdir_$3)/%.c \ | $$(depdir_$1_$2_$3) $$(objdir_$1_$2_$3) $(V)echo ... $$@ -- 2.54.0 From 2d0e4257621c55cd0d03ff9dae2b57f9161e7b0a Mon Sep 17 00:00:00 2001 From: Shiz Date: Mon, 1 May 2023 16:30:14 +0200 Subject: [PATCH 2/3] inject: mark version.c as volatile --- src/main/inject/Module.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/inject/Module.mk b/src/main/inject/Module.mk index c04cb3b..549f179 100644 --- a/src/main/inject/Module.mk +++ b/src/main/inject/Module.mk @@ -13,3 +13,7 @@ src_inject := \ logger.c \ options.c \ version.c \ + +volatile_inject := \ + version.c \ + -- 2.54.0 From e0d75ce3d65f0a56f99be5aea4a3b0dcb2d2f5b0 Mon Sep 17 00:00:00 2001 From: Shiz Date: Sun, 30 Apr 2023 19:25:02 +0200 Subject: [PATCH 3/3] launcher: print build info at startup --- src/main/launcher/Module.mk | 4 ++++ src/main/launcher/main.c | 5 +++++ src/main/launcher/version.c | 4 ++++ src/main/launcher/version.h | 4 ++++ 4 files changed, 17 insertions(+) create mode 100644 src/main/launcher/version.c create mode 100644 src/main/launcher/version.h diff --git a/src/main/launcher/Module.mk b/src/main/launcher/Module.mk index 96f735c..c9dfd07 100644 --- a/src/main/launcher/Module.mk +++ b/src/main/launcher/Module.mk @@ -20,4 +20,8 @@ src_launcher := \ options.c \ property.c \ stubs.c \ + version.c \ + +volatile_launcher := \ + version.c \ diff --git a/src/main/launcher/main.c b/src/main/launcher/main.c index 4d935d7..70c5184 100644 --- a/src/main/launcher/main.c +++ b/src/main/launcher/main.c @@ -14,6 +14,7 @@ #include "launcher/options.h" #include "launcher/property.h" #include "launcher/stubs.h" +#include "launcher/version.h" #include "util/codepage.h" #include "util/defs.h" @@ -139,6 +140,10 @@ int main(int argc, const char **argv) struct property_node *ea3_config_root; log_to_writer(log_writer_file, stdout); + log_info( + "launcher build date %s, gitrev %s", + launcher_build_date, + launcher_gitrev); /* Read command line */ diff --git a/src/main/launcher/version.c b/src/main/launcher/version.c new file mode 100644 index 0000000..c71d5ff --- /dev/null +++ b/src/main/launcher/version.c @@ -0,0 +1,4 @@ +#include "util/defs.h" + +const char *launcher_build_date = __DATE__ " " __TIME__; +const char *launcher_gitrev = STRINGIFY(GITREV); diff --git a/src/main/launcher/version.h b/src/main/launcher/version.h new file mode 100644 index 0000000..fe7f0d3 --- /dev/null +++ b/src/main/launcher/version.h @@ -0,0 +1,4 @@ +#pragma once + +extern const char *launcher_build_date; +extern const char *launcher_gitrev; -- 2.54.0