diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2020-09-07 15:28:46 -0500 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2020-09-07 15:28:46 -0500 |
| commit | 93602ad9ea868a539377430615343a2f4fcf0969 (patch) | |
| tree | e0b1ccb6bb248d54c60f8324a6e87b799c1c65a8 | |
| parent | Make zero?, one?, neg? and pos? polymorphic. (diff) | |
Prepare 1.12.0 Release.v1.12.0
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | meson_options.txt | 1 | ||||
| -rw-r--r-- | src/conf/janetconf.h | 8 |
5 files changed, 10 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 84ff4741..12ff4a11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog All notable changes to this project will be documented in this file. -## Unreleased - ??? +## 1.12.0 - 2020-09-07 +- Make `zero?`, `one?`, `pos?`, and `neg?` polymorphic. - Add C++ support to jpm and improve C++ interop in janet.h. - Add `%t` formatter to `printf`, `string/format`, and other formatter functions. - Expose `janet_cfuns_prefix` in C API. @@ -156,7 +156,7 @@ build/janet.c: build/janet_boot src/boot/boot.janet ##### Amalgamation ##### ######################## -SONAME=libjanet.so.1.11 +SONAME=libjanet.so.1.12 build/shell.c: src/mainclient/shell.c cp $< $@ diff --git a/meson.build b/meson.build index ec8efbce..8db66938 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.11.4') + version : '1.12.0') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') @@ -71,6 +71,7 @@ conf.set('JANET_STACK_MAX', get_option('stack_max')) conf.set('JANET_NO_UMASK', not get_option('umask')) conf.set('JANET_NO_REALPATH', not get_option('realpath')) conf.set('JANET_NO_PROCESSES', not get_option('processes')) +conf.set('JANET_SIMPLE_GETLINE', get_option('simple_getline')) if get_option('os_name') != '' conf.set('JANET_OS_NAME', get_option('os_name')) endif diff --git a/meson_options.txt b/meson_options.txt index eb068126..7dc1174e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,6 +15,7 @@ option('net', type : 'boolean', value : true) option('processes', type : 'boolean', value : true) option('umask', type : 'boolean', value : true) option('realpath', type : 'boolean', value : true) +option('simple_getline', type : 'boolean', value : false) option('recursion_guard', type : 'integer', min : 10, max : 8000, value : 1024) option('max_proto_depth', type : 'integer', min : 10, max : 8000, value : 200) diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index 33ae4ab4..e58b399e 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -27,10 +27,10 @@ #define JANETCONF_H #define JANET_VERSION_MAJOR 1 -#define JANET_VERSION_MINOR 11 -#define JANET_VERSION_PATCH 4 -#define JANET_VERSION_EXTRA "-dev" -#define JANET_VERSION "1.11.4-dev" +#define JANET_VERSION_MINOR 12 +#define JANET_VERSION_PATCH 0 +#define JANET_VERSION_EXTRA "" +#define JANET_VERSION "1.12.0" /* #define JANET_BUILD "local" */ |