From bbae43f259463c590b42c4b2d13779cbd4577cbe Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Mon, 31 May 2021 13:46:02 -0500
Subject: Update copyright dates.

---
 tools/msi/LICENSE.rtf | Bin 1272 -> 1272 bytes
 tools/symcharsgen.c   |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/msi/LICENSE.rtf b/tools/msi/LICENSE.rtf
index e45ced57..f9bfc457 100644
Binary files a/tools/msi/LICENSE.rtf and b/tools/msi/LICENSE.rtf differ
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
-- 
cgit v1.2.3


From 230b73466373a30e37a35030244ca2b9a11c6a5b Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Thu, 15 Jul 2021 20:49:41 -0500
Subject: Delete jpm and related testing from this repository.

JPM and related functionality has been moved to it's own repository
and will be versioned separately from Janet. The distribution process
could later be modified to bundle a version of jpm with Janet but this
is perhaps not needed.
---
 tools/jpm.bat         |  4 ----
 tools/msi/janet.wxs   |  6 ------
 tools/patch-jpm.janet | 33 ---------------------------------
 3 files changed, 43 deletions(-)
 delete mode 100644 tools/jpm.bat
 delete mode 100644 tools/patch-jpm.janet

(limited to 'tools')

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/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) `"`)))
-- 
cgit v1.2.3