|
Lines 1-6
Link Here
|
| 1 |
--- koch.nim.orig 2023-08-01 01:01:01 UTC |
1 |
--- koch.nim.orig 2024-06-18 13:26:19 UTC |
| 2 |
+++ koch.nim |
2 |
+++ koch.nim |
| 3 |
@@ -145,28 +145,28 @@ proc csource(args: string) = |
3 |
@@ -146,30 +146,30 @@ proc csource(args: string) = |
| 4 |
"--main:compiler/nim.nim compiler/installer.ini $1") % |
4 |
"--main:compiler/nim.nim compiler/installer.ini $1") % |
| 5 |
[args, VersionAsString, compileNimInst]) |
5 |
[args, VersionAsString, compileNimInst]) |
| 6 |
|
6 |
|
|
Lines 19-36
Link Here
|
| 19 |
- commit = commit, allowBundled = true) |
19 |
- commit = commit, allowBundled = true) |
| 20 |
- cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", |
20 |
- cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", |
| 21 |
- commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? |
21 |
- commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? |
|
|
22 |
- cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/sat.git", |
| 23 |
- commit = SatStableCommit, allowBundled = true) |
| 22 |
- # installer.ini expects it under $nim/bin |
24 |
- # installer.ini expects it under $nim/bin |
| 23 |
- nimCompile("dist/nimble/src/nimble.nim", |
25 |
- nimCompile("dist/nimble/src/nimble.nim", |
| 24 |
- options = "-d:release --mm:refc --noNimblePath " & args) |
26 |
- options = "-d:release -d:nimNimbleBootstrap --mm:refc --noNimblePath " & args) |
| 25 |
+#proc bundleNimbleExe(latest: bool, args: string) = |
27 |
+#proc bundleNimbleExe(latest: bool, args: string) = |
| 26 |
+# let commit = if latest: "HEAD" else: NimbleStableCommit |
28 |
+# let commit = if latest: "HEAD" else: NimbleStableCommit |
| 27 |
+# cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", |
29 |
+# cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", |
| 28 |
+# commit = commit, allowBundled = true) |
30 |
+# commit = commit, allowBundled = true) |
| 29 |
+# cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", |
31 |
+# cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", |
| 30 |
+# commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? |
32 |
+# commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? |
|
|
33 |
+# cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/sat.git", |
| 34 |
+# commit = SatStableCommit, allowBundled = true) |
| 31 |
+# # installer.ini expects it under $nim/bin |
35 |
+# # installer.ini expects it under $nim/bin |
| 32 |
+# nimCompile("dist/nimble/src/nimble.nim", |
36 |
+# nimCompile("dist/nimble/src/nimble.nim", |
| 33 |
+# options = "-d:release --mm:refc --noNimblePath " & args) |
37 |
+# options = "-d:release -d:nimNimbleBootstrap --mm:refc --noNimblePath " & args) |
| 34 |
|
38 |
|
| 35 |
-proc bundleAtlasExe(latest: bool, args: string) = |
39 |
-proc bundleAtlasExe(latest: bool, args: string) = |
| 36 |
- let commit = if latest: "HEAD" else: AtlasStableCommit |
40 |
- let commit = if latest: "HEAD" else: AtlasStableCommit |
|
Lines 49-55
Link Here
|
| 49 |
|
53 |
|
| 50 |
proc bundleNimsuggest(args: string) = |
54 |
proc bundleNimsuggest(args: string) = |
| 51 |
nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", |
55 |
nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", |
| 52 |
@@ -203,8 +203,8 @@ proc bundleChecksums(latest: bool) = |
56 |
@@ -206,8 +206,8 @@ proc zip(latest: bool; args: string) = |
| 53 |
|
57 |
|
| 54 |
proc zip(latest: bool; args: string) = |
58 |
proc zip(latest: bool; args: string) = |
| 55 |
bundleChecksums(latest) |
59 |
bundleChecksums(latest) |
|
Lines 60-66
Link Here
|
| 60 |
bundleNimsuggest(args) |
64 |
bundleNimsuggest(args) |
| 61 |
bundleNimpretty(args) |
65 |
bundleNimpretty(args) |
| 62 |
bundleWinTools(args) |
66 |
bundleWinTools(args) |
| 63 |
@@ -213,15 +213,15 @@ proc zip(latest: bool; args: string) = |
67 |
@@ -216,15 +216,15 @@ proc zip(latest: bool; args: string) = |
| 64 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" % |
68 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" % |
| 65 |
["tools/niminst/niminst".exe, VersionAsString]) |
69 |
["tools/niminst/niminst".exe, VersionAsString]) |
| 66 |
|
70 |
|
|
Lines 83-89
Link Here
|
| 83 |
nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % |
87 |
nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % |
| 84 |
[VersionAsString, compileNimInst]) |
88 |
[VersionAsString, compileNimInst]) |
| 85 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" % |
89 |
exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" % |
| 86 |
@@ -257,8 +257,8 @@ proc testTools(args: string = "") = |
90 |
@@ -260,8 +260,8 @@ proc nsis(latest: bool; args: string) = |
| 87 |
|
91 |
|
| 88 |
proc nsis(latest: bool; args: string) = |
92 |
proc nsis(latest: bool; args: string) = |
| 89 |
bundleChecksums(latest) |
93 |
bundleChecksums(latest) |
|
Lines 94-100
Link Here
|
| 94 |
bundleNimsuggest(args) |
98 |
bundleNimsuggest(args) |
| 95 |
bundleWinTools(args) |
99 |
bundleWinTools(args) |
| 96 |
# make sure we have generated the niminst executables: |
100 |
# make sure we have generated the niminst executables: |
| 97 |
@@ -521,42 +521,42 @@ proc icTest(args: string) = |
101 |
@@ -524,43 +524,43 @@ proc icTest(args: string) = |
| 98 |
exec(cmd) |
102 |
exec(cmd) |
| 99 |
inc i |
103 |
inc i |
| 100 |
|
104 |
|
|
Lines 147-171
Link Here
|
| 147 |
[hostOS, hostCPU, $int.sizeof, $float.sizeof, $cpuEndian, getCurrentDir()] |
151 |
[hostOS, hostCPU, $int.sizeof, $float.sizeof, $cpuEndian, getCurrentDir()] |
| 148 |
|
152 |
|
| 149 |
-proc installDeps(dep: string, commit = "") = |
153 |
-proc installDeps(dep: string, commit = "") = |
| 150 |
+#proc installDeps(dep: string, commit = "") = |
154 |
- # the hashes/urls are version controlled here, so can be changed seamlessly |
| 151 |
# the hashes/urls are version controlled here, so can be changed seamlessly |
155 |
- # and tied to a nim release (mimicking git submodules) |
| 152 |
# and tied to a nim release (mimicking git submodules) |
|
|
| 153 |
- var commit = commit |
156 |
- var commit = commit |
| 154 |
- case dep |
157 |
- case dep |
| 155 |
- of "tinyc": |
158 |
- of "tinyc": |
| 156 |
- if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3" |
159 |
- if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3" |
| 157 |
- cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit) |
160 |
- cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit) |
| 158 |
- else: doAssert false, "unsupported: " & dep |
161 |
- else: doAssert false, "unsupported: " & dep |
|
|
162 |
- # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206 |
| 163 |
+#proc installDeps(dep: string, commit = "") = |
| 164 |
+# # the hashes/urls are version controlled here, so can be changed seamlessly |
| 165 |
+# # and tied to a nim release (mimicking git submodules) |
| 159 |
+# var commit = commit |
166 |
+# var commit = commit |
| 160 |
+# case dep |
167 |
+# case dep |
| 161 |
+ #of "tinyc": |
168 |
+# of "tinyc": |
| 162 |
+ # if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3" |
169 |
+# if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3" |
| 163 |
+ # cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit) |
170 |
+# cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit) |
| 164 |
+# else: doAssert false, "unsupported: " & dep |
171 |
+# else: doAssert false, "unsupported: " & dep |
| 165 |
# xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206 |
172 |
+# # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206 |
| 166 |
|
173 |
|
| 167 |
proc runCI(cmd: string) = |
174 |
proc runCI(cmd: string) = |
| 168 |
@@ -679,18 +679,18 @@ proc showHelp(success: bool) = |
175 |
doAssert cmd.len == 0, cmd # avoid silently ignoring |
|
|
176 |
@@ -682,18 +682,18 @@ proc showHelp(success: bool) = |
| 169 |
quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)), |
177 |
quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)), |
| 170 |
CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure) |
178 |
CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure) |
| 171 |
|
179 |
|
|
Lines 191-197
Link Here
|
| 191 |
localDocsOut = "" |
199 |
localDocsOut = "" |
| 192 |
skipIntegrityCheck = false |
200 |
skipIntegrityCheck = false |
| 193 |
while true: |
201 |
while true: |
| 194 |
@@ -726,34 +726,34 @@ when isMainModule: |
202 |
@@ -729,34 +729,34 @@ when isMainModule: |
| 195 |
of "distrohelper": geninstall() |
203 |
of "distrohelper": geninstall() |
| 196 |
of "install": install(op.cmdLineRest) |
204 |
of "install": install(op.cmdLineRest) |
| 197 |
of "testinstall": testUnixInstall(op.cmdLineRest) |
205 |
of "testinstall": testUnixInstall(op.cmdLineRest) |