Refactor

Author: firasuke

src/arch.nim

@@ -6,14 +6,13 @@
 # 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, osproc, strformat, strutils, times], constants
+import std/[os, osproc, strformat, strutils], constants
 
-proc setEnvArch*(stage = native) =
-  putEnv($ARCH, $x86_64)
-  putEnv(
-    $BLD,
-    execCmdEx($radClustersPackagesLib / $slibtool / $files / $configGuess).output.strip(),
-  )
-  putEnv($CARCH, $x86_64_v3)
-  putEnv($PRETTY_NAME, &"""{glaucus} {s6} {x86_64_v3} {now().format("YYYYMMdd")}""")
-  putEnv($TGT, &"{x86_64Linux}-{(if stage == native: tupleNative else: tupleCross)}")
+proc setEnvArch*(vendor = "pc") =
+  for i in [
+    ("ARCH", "x86-64"),
+    ("BLDT", execCmdEx(pathCoreRepo / "slibtool/files/config.guess").output.strip()),
+    ("PRETTY_NAME", "glaucus s6 x86-64-v3"),
+    ("TGTT", &"x86_64-{vendor}-linux-musl"),
+  ]:
+    putEnv(i[0], i[1])

src/bootstrap.nim

@@ -6,87 +6,36 @@
 # 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], constants
+import std/os, constants
 
 proc cleanBootstrap*() =
-  removeDir(getEnv($CRSD))
-  removeDir(getEnv($LOGD))
-  removeDir(getEnv($TMPD))
-  removeDir(getEnv($TLCD))
-
-proc distcleanBootstrap*() =
-  cleanBootstrap()
-
-  removeDir(getEnv($PKGD))
-  removeDir(getEnv($SRCD))
+  for i in dirCleanBootstrap:
+    removeDir(ParDir / i)
 
 proc prepareBootstrap*() =
-  createDir(getEnv($CRSD))
-  createDir(getEnv($LOGD))
-  createDir(getEnv($PKGD))
-  createDir(getEnv($SRCD))
-  createDir(getEnv($TMPD))
-  createDir(getEnv($TLCD))
+  for i in dirPrepareBootstrap:
+    createDir(ParDir / i)
 
 proc prepareCross*() =
-  removeDir(getEnv($TMPD))
-  createDir(getEnv($TMPD))
+  removeDir(ParDir / "tmp")
+  createDir(ParDir / "tmp")
 
 proc setEnvBootstrap*() =
-  let path = parentDir(getCurrentDir())
-
-  putEnv($CERD, path / $cerata)
-  putEnv($CRSD, path / $cross)
-  putEnv($LOGD, path / $log)
-  putEnv($PKGD, path / $pkg)
-  putEnv($SRCD, path / $src)
-  putEnv($TMPD, path / $tmp)
-  putEnv($TLCD, path / $toolchain)
-
-  putEnv($PATH, getEnv($TLCD) / $usr / &"{bin}:{getEnv($PATH)}")
+  for i in envBootstrap:
+    putEnv(i[0], absolutePath(ParDir) / i[1])
 
-proc setEnvCrossTools*() =
-  let crossCompile = &"{getEnv($TGT)}-"
+  putEnv("PATH", getEnv("TLCD") / "usr/bin" & ':' & getEnv("PATH"))
 
-  putEnv($CROSS_COMPILE, crossCompile)
+proc setEnvCross*() =
+  for i in envCross:
+    putEnv(i[0], i[1])
 
-  putEnv($AR, &"{crossCompile}{ar}")
-  putEnv($radEnv.AS, &"{crossCompile}{radTools.As}")
-  putEnv($CC, &"{crossCompile}{gcc}")
-  putEnv($CPP, &"{getEnv($CC)} {cpp}")
-  putEnv($CXX, &"{crossCompile}{cxx}")
-  putEnv($CXXCPP, &"{getEnv($CXX)} {cpp}")
-  putEnv($HOSTCC, $gcc)
-  putEnv($NM, &"{crossCompile}{nm}")
-  putEnv($OBJCOPY, &"{crossCompile}{objcopy}")
-  putEnv($OBJDUMP, &"{crossCompile}{objdump}")
-  putEnv($PKG_CONFIG_LIBDIR, getEnv($CRSD) / $pkgConfigLibdir)
-  putEnv($PKG_CONFIG_PATH, getEnv($PKG_CONFIG_LIBDIR))
-  putEnv($PKG_CONFIG_SYSROOT_DIR, &"{getEnv($CRSD)}{root}")
-  putEnv($PKG_CONFIG_SYSTEM_INCLUDE_PATH, getEnv($CRSD) / $pkgConfigSystemIncludePath)
-  putEnv($PKG_CONFIG_SYSTEM_LIBRARY_PATH, getEnv($CRSD) / $pkgConfigSystemLibraryPath)
-  putEnv($RANLIB, &"{crossCompile}{ranlib}")
-  putEnv($READELF, &"{crossCompile}{readelf}")
-  putEnv($SIZE, &"{crossCompile}{size}")
-  putEnv($STRIP, &"{crossCompile}{strip}")
+  for i in envPkgConfig:
+    putEnv(i[0], getEnv("CRSD") / i[1])
 
-proc setEnvNativeDirs*() =
-  putEnv($CERD, $radClustersCerataLib)
-  putEnv($LOGD, $radLog)
-  putEnv($PKGD, $radPkgCache)
-  putEnv($SRCD, $radSrcCache)
-  putEnv($TMPD, $radTmp)
+proc setEnvNative*() =
+  for i in envNative:
+    putEnv(i[0], i[1])
 
-proc setEnvNativeTools*() =
-  putEnv($AR, $ar)
-  putEnv($AWK, $mawk)
-  putEnv($CC, $gcc)
-  putEnv($CPP, &"{gcc} {cpp}")
-  putEnv($CXX, $cxx)
-  putEnv($CXXCPP, &"{cxx} {cpp}")
-  putEnv($LEX, $reflex)
-  putEnv($LIBTOOL, $slibtool)
-  putEnv($NM, $nm)
-  putEnv($PKG_CONFIG, $uConfig)
-  putEnv($RANLIB, $ranlib)
-  putEnv($YACC, $byacc)
+  putEnv("CORD", pathCoreRepo)
+  putEnv("TMPD", pathTmp)