From a04dada93d1a0b989849feeede408dd7fb69b685 Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Mon, 14 Oct 2024 23:43:41 +0800 Subject: [PATCH] fixes ci_generate produces unnecessary spaces on Windows (#24309) follow up https://github.com/nim-lang/Nim/pull/17899 (cherry picked from commit 3e8f44b232bf6a5108e8abd6f00d208d7e1eb2d8) --- build_all.bat | 6 +++--- tools/ci_generate.nim | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build_all.bat b/build_all.bat index ef4a5f6a4e..bef7956f28 100644 --- a/build_all.bat +++ b/build_all.bat @@ -24,6 +24,6 @@ if not exist %nim_csources% ( cd .. copy /y bin\nim.exe %nim_csources% ) - bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch - koch boot -d:release --skipUserCfg --skipParentCfg --hints:off - koch tools --skipUserCfg --skipParentCfg --hints:off +bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch +koch boot -d:release --skipUserCfg --skipParentCfg --hints:off +koch tools --skipUserCfg --skipParentCfg --hints:off diff --git a/tools/ci_generate.nim b/tools/ci_generate.nim index 46bc39470f..a461be5915 100644 --- a/tools/ci_generate.nim +++ b/tools/ci_generate.nim @@ -42,9 +42,9 @@ triggers: proc genBuildExtras(echoRun, koch, nim: string): string = result = fmt""" -{echoRun} {nim} c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch -{echoRun} {koch} boot -d:release --skipUserCfg --skipParentCfg --hints:off -{echoRun} {koch} tools --skipUserCfg --skipParentCfg --hints:off +{echoRun}{nim} c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch +{echoRun}{koch} boot -d:release --skipUserCfg --skipParentCfg --hints:off +{echoRun}{koch} tools --skipUserCfg --skipParentCfg --hints:off """ proc genWindowsScript(buildAll: bool): string = @@ -95,7 +95,7 @@ set -e # exit on first error . ci/funs.sh nimBuildCsourcesIfNeeded "$@" -{genBuildExtras("echo_run", "./koch", "bin/nim")} +{genBuildExtras("echo_run ", "./koch", "bin/nim")} """ proc main()=