Improvements

Author: firasuke

src/bootstrap.nim

@@ -6,39 +6,34 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-import std/[os, strformat, strutils], constants, tools
+import std/[os, strformat, strutils], packages, tools
 
 proc cleanBootstrap*() =
   const dirs = ["../cross", "../log", "../tmp", "../toolchain"]
 
   for i in dirs:
     removeDir(i)
 
-proc prepareBootstrap*() =
-  const dirs = ["../cross", "../log", "../pkg", "../src", "../tmp", "../toolchain"]
-
-  for i in dirs:
-    createDir(i)
-
-proc prepareCross*() =
-  const dir = "../tmp"
-
-  removeDir(dir)
-  createDir(dir)
-
-proc require*() =
-  const exes = [
-    "autoconf", "automake", "autopoint", "awk", "bash", "booster", "bzip2", "curl",
-    "diff", "find", "gcc", "git", "grep", "gzip", "ld.bfd", "lex", "libtool", "limine",
-    "m4", "make", "meson", "mkfs.erofs", "mkfs.fat", "ninja", "patch", "perl",
-    "pkg-config", "sed", "tar", "xz", "yacc", "zstd",
-  ]
+proc prepareToolchain() =
+  const
+    dirs = ["../cross", "../log", "../pkg", "../src", "../tmp", "../toolchain"]
+    exes = [
+      "autoconf", "automake", "autopoint", "awk", "bash", "booster", "bzip2", "curl",
+      "diff", "find", "gcc", "git", "grep", "gzip", "ld.bfd", "lex", "libtool",
+      "limine", "m4", "make", "meson", "mkfs.erofs", "mkfs.fat", "ninja", "patch",
+      "perl", "pkg-config", "sed", "tar", "xz", "yacc", "zstd",
+    ]
 
   for i in exes:
     if findExe(i).isEmptyOrWhitespace():
-      abort(&"""{127:8}{&"\{i\} not found":48}""")
+      abort(&"""{127:<8}{&"\{i\} not found":48}""")
+
+  cleanBootstrap()
 
-proc setEnvBootstrap*() =
+  for i in dirs:
+    createDir(i)
+
+proc configureToolchain() =
   const env = [
     ("REPO", "../core"),
     ("CRSD", "../cross"),
@@ -51,7 +46,20 @@ proc setEnvBootstrap*() =
 
   putEnv("PATH", getEnv("TLCD") / "usr/bin" & PathSep & getEnv("PATH"))
 
-proc setEnvCross*() =
+proc bootstrapToolchain*() =
+  prepareToolchain()
+  configureToolchain()
+  buildPackages(
+    parsePackage("toolchain").run.split(), resolve = false, stage = toolchain
+  )
+
+proc prepareCross() =
+  const dir = "../tmp"
+
+  removeDir(dir)
+  createDir(dir)
+
+proc configureCross() =
   const
     env = [
       ("AR", "x86_64-glaucus-linux-musl-gcc-ar"),
@@ -83,23 +91,11 @@ proc setEnvCross*() =
   for (i, j) in envPkgConfig:
     putEnv(i, absolutePath(j))
 
-proc setEnvNative*() =
-  const env = [
-    ("AR", "gcc-ar"),
-    ("AWK", "mawk"),
-    ("CC", "gcc"),
-    ("CPP", "gcc -E"),
-    ("CXX", "g++"),
-    ("CXXCPP", "g++ -E"),
-    ("LEX", "reflex"),
-    ("LIBTOOL", "slibtool"),
-    ("NM", "gcc-nm"),
-    ("PKG_CONFIG", "u-config"),
-    ("RANLIB", "gcc-ranlib"),
-    ("REPO", pathCoreRepo),
-    ("TMPD", pathTmp),
-    ("YACC", "byacc"),
-  ]
+proc bootstrapCross*() =
+  prepareCross()
+  configureCross()
+  configureToolchain()
+  buildPackages(parsePackage("cross").run.split(), resolve = false, stage = cross)
 
-  for (i, j) in env:
-    putEnv(i, j)
+proc bootstrapNative*() =
+  buildPackages(parsePackage("native").run.split(), resolve = false)

src/constants.nim

@@ -6,7 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-import std/[os, parseopt, strutils], bootstrap, packages, constants, tools
+import std/[os, parseopt], bootstrap, packages, tools
 
 proc options*() =
   const
@@ -63,7 +63,7 @@ Copyright © 2018-2025 Firas Khana"""
 
       case p.kind
       of cmdEnd:
-        exit(helpBootstrap, QuitFailure)
+        exit(msg = helpBootstrap, status = QuitFailure)
       else:
         case p.key
         of "clean":
@@ -73,40 +73,24 @@ Copyright © 2018-2025 Firas Khana"""
         of "--help", "help":
           echo helpBootstrap
         of "1", "stage1", "toolchain":
-          require()
-          setEnvBootstrap()
-          cleanBootstrap()
-          prepareBootstrap()
-
-          let stage1 = parsePackage("toolchain").run.split()
-          buildPackages(stage1, resolve = false, stage = toolchain)
+          bootstrapToolchain()
 
           echo ""
           echo "stage 1 (toolchain) complete"
         of "2", "stage2", "cross":
-          setEnvBootstrap()
-          setEnvCross()
-          prepareCross()
-
-          let stage2 = parsePackage("cross").run.split()
-          buildPackages(stage2, resolve = false, stage = cross)
+          bootstrapCross()
 
           echo ""
           echo "stage 2 (cross) complete"
         of "3", "stage3", "native":
-          setEnvNative()
-
-          let stage3 = parsePackage("native").run.split()
-          buildPackages(stage3, resolve = false)
+          bootstrapNative()
 
           echo ""
           echo "stage 3 (native) complete"
         else:
-          exit(helpBootstrap, QuitFailure)
+          exit(msg = helpBootstrap, status = QuitFailure)
     of "build":
-      setEnvNative()
       cleanPackages()
-
       buildPackages(remainingArgs(p))
 
       echo ""
@@ -131,6 +115,6 @@ Copyright © 2018-2025 Firas Khana"""
     of "--version", "version":
       echo version
     else:
-      exit(help, QuitFailure)
+      exit(msg = help, status = QuitFailure)
 
     exit()