refactor(core): Move profiler to where both CLIs and also library mod…

…e can use it

.luacheckrc

@@ -27,6 +27,7 @@ globals = {
   "pl",
   "fluent",
   "extendSilePath",
+  "executablePath",
   "SYSTEM_SILE_PATH",
   "SHARED_LIB_EXT"
 }

.luarc.json

@@ -8,6 +8,7 @@
         "pl",
         "fluent",
         "extendSilePath",
+        "executablePath",
         "SYSTEM_SILE_PATH",
         "SHARED_LIB_EXT"
     ],

core/pathsetup.lua.in

@@ -69,5 +69,4 @@ else
 end
 
 _G.extendSilePath = extendPaths
-
-return executable
+_G.executablePath = executable

core/sile.lua

@@ -29,6 +29,9 @@ fluent = require("fluent")()
 -- Includes for _this_ scope
 local lfs = require("lfs")
 
+-- Developer tooling profiler
+local ProFi
+
 SILE.utilities = require("core.utilities")
 SU = SILE.utilities -- regrettable global alias
 
@@ -131,6 +134,14 @@ SILE.init = function ()
     SILE.outputter = SILE.outputters.dummy()
   end
   SILE.pagebuilder = SILE.pagebuilders.base()
+  io.stdout:setvbuf("no")
+  if SU.debugging("profile") then
+    ProFi = require("ProFi")
+    ProFi:start()
+  end
+  if SILE.makeDeps then
+    SILE.makeDeps:add(_G.executablePath)
+  end
   runEvals(SILE.input.evaluates, "evaluate")
 end
 
@@ -316,7 +327,7 @@ function SILE.processFile (filename, format, options)
       SILE.masterDir = SILE.masterFilename:match("(.-)[^%/]+$")
     end
     if SILE.masterDir and SILE.masterDir:len() >= 1 then
-      extendSilePath(SILE.masterDir)
+      _G.extendSilePath(SILE.masterDir)
     end
     filename = SILE.resolveFile(filename)
     if not filename then
@@ -449,6 +460,13 @@ function SILE.finish ()
   if not SILE.quiet then
     io.stderr:write("\n")
   end
+  if SU.debugging("profile") then
+    ProFi:stop()
+    ProFi:writeReport(SILE.masterFilename..'.profile.txt')
+  end
+  if SU.debugging("versions") then
+    SILE.shaper:debugVersions()
+  end
 end
 
 -- Internal libraries that run core SILE functions on load

sile.in

@@ -6,46 +6,31 @@ SHARED_LIB_EXT = "@SHARED_LIB_EXT@"
 
 -- At this point at run time we may or may not have anything useful in package.path,
 -- so require() isn't something we can rely on.
-local status, executable = pcall(dofile, "@SILE_PATH@/core/pathsetup.lua")
+local status = pcall(dofile, "@SILE_PATH@/core/pathsetup.lua")
 if not status then
-  executable = dofile("./core/pathsetup.lua")
+  dofile("./core/pathsetup.lua")
 end
 
 -- On FreeBSD, Lua's debug module doesn't give us info above the top of the stack.
 -- Since our detection is currently burried in a module it doesn't tell us the executable.
-if executable ~= "=[C]" then
-  executable = debug.getinfo(1, "S").source
+if _G.executablePath == "=[C]" then
+  _G.executablePath = debug.getinfo(1, "S").source
 end
 
 -- This global is set here and *also* in the core library, since this
 -- effectively passes the same table they are interchangeable (for now).
 SILE = require("core.sile")
 
-io.stdout:setvbuf 'no'
-
 SILE.cli:parseArguments()
 
 if not os.getenv 'LUA_REPL_RLWRAP' and not SILE.quiet then
   io.stderr:write(SILE.full_version .. '\n')
 end
 
-local ProFi
-if SU.debugging("profile") then
-  ProFi = require("ProFi")
-end
-
-if SILE.makeDeps then
-  SILE.makeDeps:add(executable)
-end
-
 SILE.init()
 
 if SILE.input.filename and SILE.input.filename:len() > 0 then
 
-  if SU.debugging("profile") then
-    ProFi:start()
-  end
-
   -- Deprecated, notice given in core.cli when argument used
   for _, path in ipairs(SILE.input.includes) do
     if not SILE.quiet then
@@ -78,15 +63,6 @@ if SILE.input.filename and SILE.input.filename:len() > 0 then
 
   SILE.finish()
 
-  if SU.debugging("profile") then
-    ProFi:stop()
-    ProFi:writeReport(SILE.masterFilename..'.profile.txt')
-  end
-
-  if SU.debugging("versions") then
-    SILE.shaper:debugVersions()
-  end
-
 else
   SILE.repl:enter()
 end