mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-27 17:00:27 +00:00
Code Issues 1 Releases Wiki Activity

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

Browse Source
This commit is contained in:
Calvin Rose 2021-03-11 18:37:54 -06:00
commit 0d42506cde
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jpm
View File

@ -44,7 +44,7 @@
(defn- try-real [path] (defn- try-real [path]
"If os/realpath fails just use normal path." "If os/realpath fails just use normal path."
(try (os/realpath) ([_] path))) (try (os/realpath path) ([_] path)))
(defn- install-paths [] (defn- install-paths []
{:headerpath (try-real (string exe-dir "/../include/janet")) {:headerpath (try-real (string exe-dir "/../include/janet"))

2
meson.build
View File

@ -19,7 +19,7 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
project('janet', 'c', project('janet', 'c',
default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'], default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'],
version : '1.15.3') version : '1.15.3')
# Global settings # Global settings

4
src/core/os.c
View File

@ -2085,7 +2085,7 @@ static const JanetReg os_cfuns[] = {
#ifndef JANET_NO_PROCESSES #ifndef JANET_NO_PROCESSES
{ {
"os/execute", os_execute, "os/execute", os_execute,
JDOC("(os/execute args &opts flags env)\n\n" JDOC("(os/execute args &opt flags env)\n\n"
"Execute a program on the system and pass it string arguments. `flags` " "Execute a program on the system and pass it string arguments. `flags` "
"is a keyword that modifies how the program will execute.\n\n" "is a keyword that modifies how the program will execute.\n\n"
"* :e - enables passing an environment to the program. Without :e, the " "* :e - enables passing an environment to the program. Without :e, the "
@ -2105,7 +2105,7 @@ static const JanetReg os_cfuns[] = {
}, },
{ {
"os/spawn", os_spawn, "os/spawn", os_spawn,
JDOC("(os/spawn args &opts flags env)\n\n" JDOC("(os/spawn args &opt flags env)\n\n"
"Execute a program on the system and return a handle to the process. Otherwise, the " "Execute a program on the system and return a handle to the process. Otherwise, the "
"same arguments as os/execute. Does not wait for the process.") "same arguments as os/execute. Does not wait for the process.")
}, },