diff --git a/.builds/meson.yml b/.builds/meson.yml new file mode 100644 index 00000000..04e9152f --- /dev/null +++ b/.builds/meson.yml @@ -0,0 +1,12 @@ +image: openbsd/latest +sources: +- https://git.sr.ht/~bakpakin/janet +packages: +- meson +tasks: +- build: | + cd janet + meson setup build --buildtype=release + cd build + ninja + ninja test diff --git a/.builds/meson_min.yml b/.builds/meson_min.yml new file mode 100644 index 00000000..0d4a34c9 --- /dev/null +++ b/.builds/meson_min.yml @@ -0,0 +1,22 @@ +image: openbsd/latest +sources: +- https://git.sr.ht/~bakpakin/janet +packages: +- meson +tasks: +- build: | + cd janet + meson setup build --buildtype=release + cd build + meson configure -Dsingle_threaded=true + meson configure -Dnanbox=false + meson configure -Ddynamic_modules=false + meson configure -Ddocstrings=false + meson configure -Dnet=false + meson configure -Dsourcemaps=false + meson configure -Dpeg=false + meson configure -Dassembler=false + meson configure -Dint_types=false + meson configure -Dtyped_arrays=false + meson configure -Dreduced_os=true + ninja # will not pass tests but should build diff --git a/jpm b/jpm index 1543bd0c..6954041b 100755 --- a/jpm +++ b/jpm @@ -835,8 +835,8 @@ int main(int argc, const char **argv) { (defn declare-source "Create a Janet modules. This does not actually build the module(s), but registers it for packaging and installation." - [&keys {:source sources}] - (def path (dyn :modpath JANET_MODPATH)) + [&keys {:source sources :prefix prefix}] + (def path (string (dyn :modpath JANET_MODPATH) (or prefix ""))) (if (bytes? sources) (install-rule sources path) (each s sources diff --git a/meson.build b/meson.build index 49226d08..2681ae49 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.9.1-dev') + version : '1.9.1') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/boot/boot.janet b/src/boot/boot.janet index fd44638a..9f1d5205 100644 --- a/src/boot/boot.janet +++ b/src/boot/boot.janet @@ -2131,11 +2131,12 @@ (defn- find-prefix [pre] (or (find-index |(and (string? ($ 0)) (string/has-prefix? pre ($ 0))) module/paths) 0)) - (array/insert module/paths 0 [(string ":cur:/:all:" ext) loader check-.]) (def all-index (find-prefix ":all:")) (array/insert module/paths all-index [(string ":all:" ext) loader not-check-.]) (def sys-index (find-prefix ":sys:")) (array/insert module/paths sys-index [(string ":sys:/:all:" ext) loader not-check-.]) + (def curall-index (find-prefix ":cur:/:all:")) + (array/insert module/paths curall-index [(string ":cur:/:all:" ext) loader check-.]) module/paths) (module/add-paths ":native:" :native) diff --git a/src/core/corelib.c b/src/core/corelib.c index 19c70ffd..3e17e918 100644 --- a/src/core/corelib.c +++ b/src/core/corelib.c @@ -687,7 +687,7 @@ static const JanetReg corelib_cfuns[] = { "\t:dir:\tthe directory containing the current file\n" "\t:name:\tthe name component of path, with extension if given\n" "\t:native:\tthe extension used to load natives, .so or .dll\n" - "\t:sys:\tthe system path, or (syn :syspath)") + "\t:sys:\tthe system path, or (dyn :syspath)") }, { "int?", janet_core_check_int,