1
0
mirror of https://github.com/janet-lang/janet synced 2024-09-29 07:20:41 +00:00

Merge branch 'master' of github.com:janet-lang/janet

This commit is contained in:
Calvin Rose 2019-08-27 18:11:22 -05:00
commit 7eb487d998
2 changed files with 5 additions and 5 deletions

View File

@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
## Unreleased ## Unreleased
- Add `buffer/format` and `string/format` format flags `Q` and `q` to print colored and - Add `buffer/format` and `string/format` format flags `Q` and `q` to print colored and
non-colored single-line values. non-colored single-line values, similar ti `P` and `p`.
- Change default repl to print long sequences on one line. - Change default repl to print long sequences on one line.
- Add `backmatch` pattern for PEGs. - Add `backmatch` pattern for PEGs.
- jpm detects if not in a Developer Command prompt on windows for a better error message. - jpm detects if not in a Developer Command prompt on windows for a better error message.

View File

@ -689,12 +689,12 @@ int main(int argc, const char **argv) {
# Create a dud batch file when on windows. # Create a dud batch file when on windows.
(when is-win (when is-win
(def name (last (string/split sep main))) (def name (last (string/split sep main)))
(def bat (string "@echo off\r\njanet %~dp0\\" name "%*")) (def fullname (string binpath sep name))
(def bat (string "@echo off\r\njanet \"" fullname "\" %*"))
(def newname (string binpath sep name ".bat")) (def newname (string binpath sep name ".bat"))
(array/push (dyn :installed-files) newname)
(add-body "install" (add-body "install"
(spit newname bat)) (spit newname bat))))
(add-body "uninstall"
(os/rm newname))))
(defn declare-archive (defn declare-archive
"Build a janet archive. This is a file that bundles together many janet "Build a janet archive. This is a file that bundles together many janet