Lines 1-19
Link Here
|
1 |
--- koch.nim.orig 2024-10-02 01:48:48 UTC |
1 |
--- koch.nim.orig 2025-02-06 01:49:40 UTC |
2 |
+++ koch.nim |
2 |
+++ koch.nim |
3 |
@@ -11,9 +11,9 @@ const |
3 |
@@ -150,31 +150,31 @@ proc csource(args: string) = |
4 |
|
|
|
5 |
const |
6 |
# examples of possible values for repos: Head, ea82b54 |
7 |
- NimbleStableCommit = "4fb6f8e6c33963f6f510fe82d09ad2a61b5e4265" # 0.16.1 |
8 |
- AtlasStableCommit = "5faec3e9a33afe99a7d22377dd1b45a5391f5504" |
9 |
- ChecksumsStableCommit = "bd9bf4eaea124bf8d01e08f92ac1b14c6879d8d3" |
10 |
+ NimbleStableCommit = "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667" # master |
11 |
+ AtlasStableCommit = "7b780811a168f3f32bff4822369dda46a7f87f9a" |
12 |
+ ChecksumsStableCommit = "b4c73320253f78e3a265aec6d9e8feb83f97c77b" |
13 |
SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01" |
14 |
|
15 |
# examples of possible values for fusion: #head, #ea82b54, 1.2.3 |
16 |
@@ -150,32 +150,32 @@ proc csource(args: string) = |
17 |
"--main:compiler/nim.nim compiler/installer.ini $1") % |
4 |
"--main:compiler/nim.nim compiler/installer.ini $1") % |
18 |
[args, VersionAsString, compileNimInst]) |
5 |
[args, VersionAsString, compileNimInst]) |
19 |
|
6 |
|
Lines 30-53
Link Here
|
30 |
- let commit = if latest: "HEAD" else: NimbleStableCommit |
17 |
- let commit = if latest: "HEAD" else: NimbleStableCommit |
31 |
- cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", |
18 |
- cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", |
32 |
- commit = commit, allowBundled = true) |
19 |
- commit = commit, allowBundled = true) |
33 |
- cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", |
20 |
- updateSubmodules(distDir / "nimble", allowBundled = true) |
34 |
- commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? |
|
|
35 |
- cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/sat.git", |
36 |
- commit = SatStableCommit, allowBundled = true) |
37 |
- # installer.ini expects it under $nim/bin |
38 |
- nimCompile("dist/nimble/src/nimble.nim", |
21 |
- nimCompile("dist/nimble/src/nimble.nim", |
39 |
- options = "-d:release -d:nimNimbleBootstrap --noNimblePath " & args) |
22 |
- options = "-d:release --noNimblePath " & args) |
|
|
23 |
- const zippyTests = "dist/nimble/vendor/zippy/tests" |
24 |
- if dirExists(zippyTests): |
25 |
- removeDir(zippyTests) |
40 |
+#proc bundleNimbleExe(latest: bool, args: string) = |
26 |
+#proc bundleNimbleExe(latest: bool, args: string) = |
41 |
+# let commit = if latest: "HEAD" else: NimbleStableCommit |
27 |
+# let commit = if latest: "HEAD" else: NimbleStableCommit |
42 |
+# cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", |
28 |
+# cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", |
43 |
+# commit = commit, allowBundled = true) |
29 |
+# commit = commit, allowBundled = true) |
44 |
+# cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", |
30 |
+# updateSubmodules(distDir / "nimble", allowBundled = true) |
45 |
+# commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? |
|
|
46 |
+# cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/sat.git", |
47 |
+# commit = SatStableCommit, allowBundled = true) |
48 |
+# # installer.ini expects it under $nim/bin |
49 |
+# nimCompile("dist/nimble/src/nimble.nim", |
31 |
+# nimCompile("dist/nimble/src/nimble.nim", |
50 |
+# options = "-d:release -d:nimNimbleBootstrap --noNimblePath " & args) |
32 |
+# options = "-d:release --noNimblePath " & args) |
|
|
33 |
+# const zippyTests = "dist/nimble/vendor/zippy/tests" |
34 |
+# if dirExists(zippyTests): |
35 |
+# removeDir(zippyTests) |
51 |
|
36 |
|
52 |
-proc bundleAtlasExe(latest: bool, args: string) = |
37 |
-proc bundleAtlasExe(latest: bool, args: string) = |
53 |
- let commit = if latest: "HEAD" else: AtlasStableCommit |
38 |
- let commit = if latest: "HEAD" else: AtlasStableCommit |
Lines 70-76
Link Here
|
70 |
|
55 |
|
71 |
proc bundleNimsuggest(args: string) = |
56 |
proc bundleNimsuggest(args: string) = |
72 |
nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", |
57 |
nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", |
73 |
@@ -206,14 +206,14 @@ proc bundleWinTools(args: string) = |
58 |
@@ -205,14 +205,14 @@ proc bundleWinTools(args: string) = |
74 |
nimCompile(r"tools\downloader.nim", |
59 |
nimCompile(r"tools\downloader.nim", |
75 |
options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args) |
60 |
options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args) |
76 |
|
61 |
|
Lines 91-97
Link Here
|
91 |
bundleNimsuggest(args) |
76 |
bundleNimsuggest(args) |
92 |
bundleNimpretty(args) |
77 |
bundleNimpretty(args) |
93 |
bundleWinTools(args) |
78 |
bundleWinTools(args) |
94 |
@@ -222,15 +222,15 @@ proc zip(latest: bool; args: string) = |
79 |
@@ -221,15 +221,15 @@ proc zip(latest: bool; args: string) = |
95 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" % |
80 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" % |
96 |
["tools/niminst/niminst".exe, VersionAsString]) |
81 |
["tools/niminst/niminst".exe, VersionAsString]) |
97 |
|
82 |
|
Lines 114-120
Link Here
|
114 |
nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % |
99 |
nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % |
115 |
[VersionAsString, compileNimInst]) |
100 |
[VersionAsString, compileNimInst]) |
116 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" % |
101 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" % |
117 |
@@ -265,9 +265,9 @@ proc nsis(latest: bool; args: string) = |
102 |
@@ -264,9 +264,9 @@ proc nsis(latest: bool; args: string) = |
118 |
nimCompileFold("Compile testament", "testament/testament.nim", options = "-d:release " & args) |
103 |
nimCompileFold("Compile testament", "testament/testament.nim", options = "-d:release " & args) |
119 |
|
104 |
|
120 |
proc nsis(latest: bool; args: string) = |
105 |
proc nsis(latest: bool; args: string) = |
Lines 127-133
Link Here
|
127 |
bundleNimsuggest(args) |
112 |
bundleNimsuggest(args) |
128 |
bundleWinTools(args) |
113 |
bundleWinTools(args) |
129 |
# make sure we have generated the niminst executables: |
114 |
# make sure we have generated the niminst executables: |
130 |
@@ -287,21 +287,21 @@ proc install(args: string) = |
115 |
@@ -286,21 +286,21 @@ proc install(args: string) = |
131 |
geninstall() |
116 |
geninstall() |
132 |
exec("sh ./install.sh $#" % args) |
117 |
exec("sh ./install.sh $#" % args) |
133 |
|
118 |
|
Lines 164-170
Link Here
|
164 |
|
149 |
|
165 |
# -------------- boot --------------------------------------------------------- |
150 |
# -------------- boot --------------------------------------------------------- |
166 |
|
151 |
|
167 |
@@ -345,11 +345,11 @@ proc boot(args: string, skipIntegrityCheck: bool) = |
152 |
@@ -344,11 +344,11 @@ proc boot(args: string, skipIntegrityCheck: bool) = |
168 |
let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") & |
153 |
let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") & |
169 |
hostOS & "_" & hostCPU |
154 |
hostOS & "_" & hostCPU |
170 |
|
155 |
|
Lines 179-185
Link Here
|
179 |
|
164 |
|
180 |
let nimStart = findStartNim().quoteShell() |
165 |
let nimStart = findStartNim().quoteShell() |
181 |
let times = 2 - ord(skipIntegrityCheck) |
166 |
let times = 2 - ord(skipIntegrityCheck) |
182 |
@@ -508,7 +508,7 @@ proc temp(args: string) = |
167 |
@@ -507,7 +507,7 @@ proc temp(args: string) = |
183 |
result[1].add " " & quoteShell(args[i]) |
168 |
result[1].add " " & quoteShell(args[i]) |
184 |
inc i |
169 |
inc i |
185 |
|
170 |
|
Lines 188-194
Link Here
|
188 |
|
173 |
|
189 |
let d = getAppDir() |
174 |
let d = getAppDir() |
190 |
let output = d / "compiler" / "nim".exe |
175 |
let output = d / "compiler" / "nim".exe |
191 |
@@ -552,27 +552,27 @@ proc icTest(args: string) = |
176 |
@@ -551,27 +551,27 @@ proc icTest(args: string) = |
192 |
exec(cmd) |
177 |
exec(cmd) |
193 |
inc i |
178 |
inc i |
194 |
|
179 |
|
Lines 237-243
Link Here
|
237 |
|
222 |
|
238 |
|
223 |
|
239 |
proc hostInfo(): string = |
224 |
proc hostInfo(): string = |
240 |
@@ -620,14 +620,14 @@ proc runCI(cmd: string) = |
225 |
@@ -619,14 +619,14 @@ proc runCI(cmd: string) = |
241 |
# BUG: with initOptParser, `--batch:'' all` interprets `all` as the argument of --batch, pending bug #14343 |
226 |
# BUG: with initOptParser, `--batch:'' all` interprets `all` as the argument of --batch, pending bug #14343 |
242 |
execFold("Run tester", "nim c -r --putenv:NIM_TESTAMENT_REMOTE_NETWORKING:1 -d:nimStrictMode testament/testament $# all -d:nimCoroutines" % batchParam) |
227 |
execFold("Run tester", "nim c -r --putenv:NIM_TESTAMENT_REMOTE_NETWORKING:1 -d:nimStrictMode testament/testament $# all -d:nimCoroutines" % batchParam) |
243 |
|
228 |
|
Lines 260-266
Link Here
|
260 |
|
245 |
|
261 |
execFold("Run nimdoc tests", "nim r nimdoc/tester") |
246 |
execFold("Run nimdoc tests", "nim r nimdoc/tester") |
262 |
execFold("Run rst2html tests", "nim r nimdoc/rsttester") |
247 |
execFold("Run rst2html tests", "nim r nimdoc/rsttester") |
263 |
@@ -699,18 +699,18 @@ proc showHelp(success: bool) = |
248 |
@@ -698,18 +698,18 @@ proc showHelp(success: bool) = |
264 |
quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)), |
249 |
quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)), |
265 |
CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure) |
250 |
CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure) |
266 |
|
251 |
|
Lines 286-292
Link Here
|
286 |
localDocsOut = "" |
271 |
localDocsOut = "" |
287 |
skipIntegrityCheck = false |
272 |
skipIntegrityCheck = false |
288 |
while true: |
273 |
while true: |
289 |
@@ -746,34 +746,34 @@ when isMainModule: |
274 |
@@ -745,34 +745,34 @@ when isMainModule: |
290 |
of "distrohelper": geninstall() |
275 |
of "distrohelper": geninstall() |
291 |
of "install": install(op.cmdLineRest) |
276 |
of "install": install(op.cmdLineRest) |
292 |
of "testinstall": testUnixInstall(op.cmdLineRest) |
277 |
of "testinstall": testUnixInstall(op.cmdLineRest) |