Improvements

Author: firasuke

src/bootstrap.nim

@@ -28,7 +28,7 @@ proc prepareCross*() =
 
 proc setEnvBootstrap*() =
   const env = [
-    ("CORD", "../core"),
+    ("REPO", "../core"),
     ("CRSD", "../cross"),
     ("TMPD", "../tmp"),
     ("TLCD", "../toolchain"),
@@ -76,7 +76,6 @@ proc setEnvNative*() =
     ("AR", "gcc-ar"),
     ("AWK", "mawk"),
     ("CC", "gcc"),
-    ("CORD", pathCoreRepo),
     ("CPP", "gcc -E"),
     ("CXX", "g++"),
     ("CXXCPP", "g++ -E"),
@@ -85,6 +84,7 @@ proc setEnvNative*() =
     ("NM", "gcc-nm"),
     ("PKG_CONFIG", "u-config"),
     ("RANLIB", "gcc-ranlib"),
+    ("REPO", pathCoreRepo),
     ("TMPD", pathTmp),
     ("YACC", "byacc"),
   ]

src/options.nim

@@ -16,29 +16,27 @@ USAGE:
   rad [ COMMAND ]
 
 COMMANDS:
+  bootstrap  Bootstrap glaucus
   build      Build packages
-  clean      Clean cache
+  clean      Clean build cache
   contents   List package contents
-  help       Display this help message
+  help       Show help message
   info       Show package information
-  install    Install packages
-  list       List installed packages
-  orphan     List orphaned packages
-  remove     Remove packages
+  list       List built packages
   search     Search for packages
   update     Update repositories
-  upgrade    Upgrade packages
-  version    Display rad version"""
+  version    Show rad version"""
     helpBootstrap =
       """
 USAGE:
   rad bootstrap [ COMMAND ]
 
 COMMANDS:
-  clean      Clean cache
-  cross      Bootstrap cross glaucus (stage 2)
-  native     Bootstrap native glaucus (stage 3)
-  toolchain  Bootstrap toolchain (stage 1)"""
+  clean      Clean bootstrap cache
+  help       Show help message
+  1, stage1  Bootstrap stage 1 (toolchain)
+  2, stage2  Bootstrap stage 2 (cross)
+  3, stage3  Bootstrap stage 3 (native)"""
     version =
       """
 rad version 0.1.0
@@ -72,7 +70,22 @@ Copyright © 2018-2025 Firas Khana"""
           cleanBootstrap()
 
           echo "clean complete"
-        of "cross":
+        of "--help", "help":
+          echo helpBootstrap
+        of "1", "stage1", "toolchain":
+          require()
+          setEnvArch()
+          setEnvBootstrap()
+          cleanBootstrap()
+          prepareBootstrap()
+
+          buildPackages(
+            parsePackage("toolchain").run.split(), resolve = false, stage = $toolchain
+          )
+
+          echo ""
+          echo "stage 1 (toolchain) complete"
+        of "2", "stage2", "cross":
           setEnvArch()
           setEnvBootstrap()
           setEnvCross()
@@ -83,28 +96,15 @@ Copyright © 2018-2025 Firas Khana"""
           )
 
           echo ""
-          echo "cross complete"
-        of "native":
+          echo "stage 2 (cross) complete"
+        of "3", "stage3", "native":
           setEnvArch()
           setEnvNative()
 
           buildPackages(parsePackage("native").run.split(), resolve = false)
 
           echo ""
-          echo "native complete"
-        of "toolchain":
-          require()
-          setEnvArch()
-          setEnvBootstrap()
-          cleanBootstrap()
-          prepareBootstrap()
-
-          buildPackages(
-            parsePackage("toolchain").run.split(), resolve = false, stage = $toolchain
-          )
-
-          echo ""
-          echo "toolchain complete"
+          echo "stage 3 (native) complete"
         else:
           exit(helpBootstrap, QuitFailure)
     of "build":
@@ -126,31 +126,13 @@ Copyright © 2018-2025 Firas Khana"""
       echo help
     of "info":
       showInfo(remainingArgs(p))
-    of "install":
-      setEnvArch()
-      setEnvNative()
-      cleanPackages()
-      installPackages(remainingArgs(p))
-
-      echo ""
-      echo "install complete"
     of "list":
       listPackages()
-    of "orphan":
-      listOrphans()
-    of "remove":
-      removePackages(remainingArgs(p))
-
-      echo ""
-      echo "remove complete"
     of "search":
       searchPackages(remainingArgs(p))
     of "update":
       echo ""
       echo "update complete"
-    of "upgrade":
-      echo ""
-      echo "upgrade complete"
     of "--version", "version":
       echo version
     else:

src/packages.nim

@@ -7,7 +7,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 import
-  std/[algorithm, os, osproc, sequtils, strformat, strutils, tables, terminal, times],
+  std/[algorithm, os, osproc, sequtils, strformat, strutils, tables, times],
   constants,
   flags,
   tools,
@@ -17,9 +17,8 @@ type Package = object
   nom, ver, url, sum, bld, run*, opt = "nil"
 
 proc cleanPackages*() =
-  for i in [pathLog, pathTmp]:
-    removeDir(i)
-    createDir(i)
+  removeDir(pathTmp)
+  createDir(pathTmp)
 
 proc parsePackage*(nom: string): Package =
   let path = pathCoreRepo / nom
@@ -33,9 +32,9 @@ proc printContent(idx: int, nom, ver, cmd: string) =
   echo &"""{idx + 1:<8}{nom:24}{ver:24}{cmd:8}""" & now().format("hh:mm tt")
 
 proc printHeader() =
-  echo &"""
+  echo """
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-{"idx":8}{"nom":24}{"ver":24}{"cmd":8}fin
+idx     nom                     ver                     cmd     fin     
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"""
 
 proc fetchPackages(packages: openArray[string]) =
@@ -196,8 +195,6 @@ proc buildPackages*(
 
     if "no-parallel" in package.opt:
       setEnvFlags(parallel = false)
-    else:
-      putEnv("MAKEFLAGS", "parallel")
 
     if dirExists(tmp):
       setCurrentDir(tmp)
@@ -206,7 +203,7 @@ proc buildPackages*(
 
     let shell = execCmdEx(
       &"""sh -efu -c '
-        nom={package} ver={package.ver} . {pathCoreRepo / package.nom / (if stage == $native: "build" else: "build" & '-' & stage)}
+        nom={package.nom} ver={package.ver} . {pathCoreRepo / package.nom / (if stage == $native: "build" else: "build" & '-' & stage)}
 
         for i in prepare configure build; do
           if command -v $i {shellRedirect}; then
@@ -334,67 +331,6 @@ proc listContents*(packages: openArray[string]) =
     for line in lines(pathLocalLib / package.nom / "contents"):
       echo &"/{line}"
 
-proc listOrphans*(pkgLib = pathLocalLib) =
-  let
-    installed = walkDir(pathLocalLib, true, skipSpecial = true).toSeq().unzip()[1]
-    skel = parsePackage("skel").run
-
-  for nom in installed:
-    if nom notin skel and fileExists(pkgLib / $nom / "implicit"):
-      if not dirExists(pkgLib / $nom / "run"):
-        styledEcho fgYellow,
-          styleBright, &"""{$QuitFailure:8}{&"\{nom\} is an orphan":48}"""
-
-proc removePackages*(packages: openArray[string], pkgLib = pathLocalLib) =
-  let
-    installed = walkDir(pathLocalLib, true, skipSpecial = true).toSeq().unzip()[1]
-    skel = parsePackage("skel").run
-  var shouldAbort: bool
-
-  for nom in packages:
-    if nom notin installed:
-      abort(&"""{$QuitFailure:8}{&"\{nom\} not installed":48}""")
-    if nom in skel:
-      abort(&"""{$QuitFailure:8}{&"\{nom\} is a skel package":48}""")
-    if dirExists(pkgLib / $nom / "run"):
-      let runDeps = walkDir(pkgLib / $nom / "run", true, skipSpecial = true)
-      .toSeq()
-      .unzip()[1].sorted()
-      if runDeps.len() > 0:
-        for dep in runDeps:
-          if dep notin packages:
-            styledEcho fgYellow,
-              styleBright, &"""{$QuitFailure:8}{&"\{dep\} depends on \{nom\}":48}"""
-            shouldAbort = true
-
-    if shouldAbort:
-      abort(&"""{$QuitFailure:8}{&"\{nom\} is a dependency":48}""")
-
-  printHeader()
-
-  for idx, nom in packages:
-    let package = parsePackage(nom)
-
-    printContent(idx, package.nom, package.ver, "remove")
-
-    for line in lines(pathLocalLib / package.nom / "contents"):
-      if not line.endsWith("/"):
-        removeFile(&"/{line}")
-
-    for line in lines(pathLocalLib / package.nom / "contents"):
-      if line.endsWith("/"):
-        let path = &"/{line}"
-
-        if path.isEmpty():
-          removeDir(path)
-
-    removeDir(pathLocalLib / package.nom)
-
-    for installedPackage in walkDir(pkgLib, true, skipSpecial = true).toSeq().unzip()[1].sorted():
-      removeFile(pkgLib / $installedPackage / "run" / package.nom)
-      if isEmpty(pkgLib / $installedPackage / "run"):
-        removeDir(pkgLib / $installedPackage / "run")
-
 proc searchPackages*(pattern: openArray[string]) =
   var packages: seq[string]