From d3932e455b9dc59e377a69be3e8f9019e90cf802 Mon Sep 17 00:00:00 2001 From: Arnaud Date: Fri, 10 Oct 2025 07:35:27 +0200 Subject: [PATCH] Add specific chronicles_sinks for windows --- Makefile | 6 +++--- build.nims | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index dfa0b023..094eb414 100644 --- a/Makefile +++ b/Makefile @@ -260,12 +260,12 @@ libcodex: ifeq ($(STATIC), 1) echo -e $(BUILD_MSG) "build/$@.a" && \ - $(ENV_SCRIPT) nim libcodexStatic $(NIM_PARAMS) codex.nims + $(ENV_SCRIPT) nim libcodexStatic $(NIM_PARAMS) -d:chronicles_sinks=textlines[dynamic],json[dynamic],textlines[dynamic] codex.nims else ifeq ($(detected_OS),Windows) echo -e $(BUILD_MSG) "build/$@.dll" && \ - $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) codex.nims + $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) -d:chronicles_sinks=textlines,json[file],textlines[file] codex.nims else echo -e $(BUILD_MSG) "build/$@.so" && \ - $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) codex.nims + $(ENV_SCRIPT) nim libcodexDynamic $(NIM_PARAMS) -d:chronicles_sinks=textlines[dynamic],json[dynamic],textlines[dynamic] codex.nims endif endif # "variables.mk" was not included diff --git a/build.nims b/build.nims index a9080120..1d0f6c82 100644 --- a/build.nims +++ b/build.nims @@ -31,11 +31,20 @@ proc buildLibrary(name: string, srcDir = "./", params = "", `type` = "dynamic") if `type` == "dynamic": exec "nim c" & " --out:build/" & name & - ".so --threads:on --app:lib --opt:size --noMain --mm:refc --header --d:metrics --nimMainPrefix:libcodex --skipParentCfg:on -d:noSignalHandler -d:LeopardCmakeFlags=\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON\" -d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE -d:chronicles_sinks=textlines[dynamic],json[dynamic],textlines[dynamic] -d:libp2p_pki_schemes=secp256k1 " & + ".so --threads:on --app:lib --opt:size --noMain --mm:refc --header --d:metrics " & + "--nimMainPrefix:libcodex --skipParentCfg:on -d:noSignalHandler " & + "-d:LeopardCmakeFlags=\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON\" " & + "-d:chronicles_runtime_filtering " & + "-d:chronicles_log_level=TRACE " & + "-d:libp2p_pki_schemes=secp256k1 " params & " " & srcDir & name & ".nim" else: exec "nim c" & " --out:build/" & name & - ".a --threads:on --app:staticlib --opt:size --noMain --mm:refc --header --d:metrics --nimMainPrefix:libcodex --skipParentCfg:on -d:noSignalHandler -d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE -d:chronicles_sinks=textlines[dynamic],json[dynamic],textlines[dynamic] -d:libp2p_pki_schemes=secp256k1 " & + ".a --threads:on --app:staticlib --opt:size --noMain --mm:refc --header --d:metrics " & + "--nimMainPrefix:libcodex --skipParentCfg:on -d:noSignalHandler " & + "-d:chronicles_runtime_filtering " & + "-d:chronicles_log_level=TRACE " & + "-d:libp2p_pki_schemes=secp256k1 " & params & " " & srcDir & name & ".nim" proc test(name: string, srcDir = "tests/", params = "", lang = "c") =