Brief: Fix missing dynamic :syspath inside binscript main.

Remove need for PEG for defn main in binscripts.

Summary: Rather than try to add code into a main in a binscript,
this change removes the extra line added to all binscripts
that remove the dynamic :syspath, if it was added at the top.

I'm not sure why it needs to be removed but certainly, removing
it means it is not defined when main runs which means janet-pm
tries to install into the system syspath, even when a dynamic
syspath is set.

Author: rwtolbert

spork/declare-cc.janet

@@ -383,19 +383,6 @@
   [&named main]
   (install-rule main "bin" 8r755 (mkbin)))
 
-(defn- main-replacer [dynamic-syspath hardcode-syspath l2 l3 l4]
-  (def parts @[])
-  (if (or dynamic-syspath hardcode-syspath) (array/push parts (string "\n  " l2)))
-  (if hardcode-syspath (array/push parts (string "  " l3)))
-  (if hardcode-syspath (array/push parts (string "  " l4)))
-  (fn [m & args] (string m (string/join parts "") "\n")))
-
-(defn- hardcode-syspath-in-main [dynamic-syspath hardcode-syspath contents l2 l3 l4]
-  (def patt (peg/compile '{:ws (some (choice :a :d :s "[" "&"))
-                           :defn (sequence "(defn" (any "-") :s "main" :ws "]" (any (choice " " "\n")))
-                           :main :defn}))
-  (peg/replace patt (main-replacer dynamic-syspath hardcode-syspath l2 l3 l4) contents))
-
 (defn declare-binscript
   ``Declare a janet file to be installed as an executable script. Creates
   a shim on windows. If hardcode is true, will insert code into the script
@@ -420,10 +407,7 @@
               (if (or dynamic-syspath hardcode-syspath) second-line)
               (if hardcode-syspath third-line)
               (if hardcode-syspath fourth-line)
-              (if hardcode-syspath
-                (hardcode-syspath-in-main dynamic-syspath hardcode-syspath rest second-line third-line fourth-line)
-                rest)
-              (if dynamic-syspath last-line))))
+              rest)))
   (install-buffer contents dest 8r755 (mkbin))
   (when (is-win-or-mingw)
     (def absdest (path/join (dyn *syspath*) dest))

test-project/bin/bin-no-hardcode

@@ -4,4 +4,4 @@
 
 (defn- main
   [&]
-  (printf "hello"))
+  (printf (root-env :syspath)))

test-project/bin/bin-with-main

@@ -17,16 +17,6 @@
   :hardcode-syspath true
   :is-janet true)
 
-(declare-binscript
-  :main "bin/bin-with-oneline-main"
-  :hardcode-syspath true
-  :is-janet true)
-
-(declare-binscript
-  :main "bin/bin-no-hardcode"
-  :hardcode-syspath false
-  :is-janet true)
-
 (task "pre-build" ["pre-build-test"])
 (task "post-build" ["post-build-test"])
 

test-project/bin/bin-with-oneline-main

@@ -33,6 +33,15 @@
 (defn divider [title]
   (printf "------------------------------------------\n%s" title))
 
+(defn dump-file [filename]
+  (let [contents (slurp filename)]
+    (printf "---------- %s -------------" filename)
+    (var count 0)
+    (loop [line :in (string/split "\n" contents)]
+      (set count (inc count))
+      (printf "%5d %s" count line))
+    (print "----------------------------")))
+
 (defn dump-out [output]
   (let [out (string/split "\n" (output :out))
         err (string/split "\n" (output :err))]
@@ -45,18 +54,6 @@
 
 (def bat (if (= (os/which) :windows) ".bat" ""))
 
-(defn- test-binscript [filename syscount printcount]
-  (assert (sh/exists? filename))
-  (let [contents (slurp filename)]
-    (printf "---------- %s -------------" filename)
-    (loop [line :in (string/split "\n" contents)]
-      (print line))
-    (print "----------------------------")
-    (assert (= syscount (length (string/find-all "put root-env :install-time-syspath" contents))))
-    (assert (= printcount (length (string/find-all "print" contents)))))
-  # and finally make sure the script actually runs
-  (assert (= "hello" (sh/exec-slurp (string filename bat)))))
-
 # Create a temporary directory for our janet tree
 (math/seedrandom (os/cryptorand 16))
 (def syspath (randdir))
@@ -84,15 +81,8 @@
        (def binpath (path/join (dyn *syspath*) "bin"))
        (def janet-pm (path/join binpath (string "janet-pm")))
        (assert (sh/exists? janet-pm))
-       (assert (= 2 (length (string/find-all "put root-env :install-time-syspath" (slurp janet-pm)))))
-
-       (def janet-format (path/join binpath (string "janet-format")))
-       (assert (sh/exists? janet-format))
-       (assert (= 2 (length (string/find-all "put root-env :install-time-syspath" (slurp janet-format)))))
-
-       (def janet-netrepl (path/join binpath (string "janet-netrepl")))
-       (assert (sh/exists? janet-netrepl))
-       (assert (= 2 (length (string/find-all "put root-env :install-time-syspath" (slurp janet-netrepl)))))
+       (dump-out (sh/exec-slurp-all janet-pm "show-config"))
+       (assert (= 1 (length (string/find-all "put root-env :install-time-syspath" (slurp janet-pm)))))
 
        # check sub commands work, even without defining pre-/post-
 
@@ -131,22 +121,11 @@
        (assert (after? "pre-install" "post-build" (install-out :out)))
        (assert (after? "post-install" "pre-install" (install-out :out)))
 
-       # now we look at the binscripts installed from the test-project
-       # bin-no-main should only have one instance of the hardcoded syspath
-       (def bin-no-main (path/join binpath (string "bin-no-main")))
-       (test-binscript bin-no-main 1 1)
-
-       # bin-with-main should have 2 instances of hardcoded path
+       # check that syspath is correctly set inside a main in a binscript
        (def bin-with-main (path/join binpath (string "bin-with-main")))
-       (test-binscript bin-with-main 2 1)
-
-       # bin-with-oneline-main could be tricky
-       (def bin-with-oneline-main (path/join binpath (string "bin-with-oneline-main")))
-       (test-binscript bin-with-oneline-main 2 1)
-
-       # bin-no-hardcode should have zero instances of hardcoded paths
-       (def bin-no-hardcode (path/join binpath (string "bin-no-hardcode")))
-       (test-binscript bin-no-hardcode 0 1)
+       (def bin-out (sh/exec-slurp-all (string bin-with-main bat)))
+       (dump-out bin-out)
+       (assert (string/find (dyn *syspath*) (bin-out :out)))
 
        # check "test"
        (divider "Running janet-pm test")