Merge branch 'master' into struct-proto

5 files changed, 1 insertions, 44 deletions

diff --git a/tools/jpm.bat b/tools/jpm.bat
deleted file mode 100644
index 075b0220..00000000
--- a/tools/jpm.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-@rem Wrapper around jpm
-
-janet "%~dp0\jpm.janet" %*
diff --git a/tools/msi/LICENSE.rtf b/tools/msi/LICENSE.rtf
index e45ced57..f9bfc457 100644
--- a/tools/msi/LICENSE.rtf
+++ b/tools/msi/LICENSE.rtf
diff --git a/tools/msi/janet.wxs b/tools/msi/janet.wxs
index 80a0b7e4..bbf62066 100644
--- a/tools/msi/janet.wxs
+++ b/tools/msi/janet.wxs
@@ -115,12 +115,6 @@
                 </File>
                 <RemoveFolder Id="RemoveBinDir" On="uninstall" />
             </Component>
-            <Component Directory="BinDir">
-                <File Source="jpm" Name="jpm.janet"/>
-            </Component>
-            <Component Directory="BinDir">
-                <File Source="tools\jpm.bat"/>
-            </Component>
 
             <Component Directory="CDir">
                 <File Source="dist\janet.h"/>
diff --git a/tools/patch-jpm.janet b/tools/patch-jpm.janet
deleted file mode 100644
index b0f812f3..00000000
--- a/tools/patch-jpm.janet
+++ /dev/null
@@ -1,33 +0,0 @@
-# Patch jpm to have the correct paths for the current install.
-# usage: janet patch-jpm.janet output --libdir=/usr/local/lib/x64-linux/ --binpath
-
-(def- argpeg
-  (peg/compile
-    '(* "--" '(to "=") "=" '(any 1))))
-
-(def- args (tuple/slice (dyn :args) 3))
-(def- len (length args))
-(var i :private 0)
-
-(def install-paths @{})
-
-# Get flags
-(each a args
-  (if-let [m (peg/match argpeg a)]
-    (let [[key value] m]
-      (put install-paths (keyword key) value))))
-
-(def- replace-peg
-  (peg/compile
-    ~(% (* '(to "###START###")
-           (constant ,(string/format "# Inserted by tools/patch-jpm.janet\n(defn- install-paths [] %j)" install-paths))
-           (thru "###END###")
-           '(any 1)))))
-
-(def source (slurp ((dyn :args) 1)))
-(def newsource (0 (peg/match replace-peg source)))
-
-(spit ((dyn :args) 2) newsource)
-
-(unless (= :windows (os/which))
-  (os/shell (string `chmod +x "` ((dyn :args) 2) `"`)))
diff --git a/tools/symcharsgen.c b/tools/symcharsgen.c
index 4e3c7965..5d86c25b 100644
--- a/tools/symcharsgen.c
+++ b/tools/symcharsgen.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2020 Calvin Rose
+* Copyright (c) 2021 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to