aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorCalvin Rose <calsrose@gmail.com>2021-01-23 14:48:36 -0600
committerCalvin Rose <calsrose@gmail.com>2021-01-23 14:48:36 -0600
commit5cac8bcf9fb2dad25139466cd0e79728fb381a74 (patch)
tree4a98f10e37d61d6adf96c9e6d1ff4e2be0c81c63
parentFix #610 - POLLHUP should cause us to continue reading. (diff)
Prepare for patch release.v1.14.2
-rw-r--r--CHANGELOG.md4
-rw-r--r--meson.build2
-rw-r--r--src/conf/janetconf.h4
3 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70434837..bae373dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
# Changelog
All notable changes to this project will be documented in this file.
-## ??? - Unreleased
+## 1.14.2 - 2021-01-23
+- Allow `JANET_PROFILE` env variable to load a profile before loading the repl.
+- Update `tracev` macro to allow `def` and `var` inside to work as expected.
- Use `(dyn :peg-grammar)` for passing a default grammar to `peg/compile` instead of loading
`default-peg-grammar` directly from the root environment.
- Add `ev/thread` for combining threading with the event loop.
diff --git a/meson.build b/meson.build
index e95634c1..fc8fa7de 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.14.1')
+ version : '1.14.2')
# Global settings
janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')
diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h
index af612586..08aae128 100644
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -6,8 +6,8 @@
#define JANET_VERSION_MAJOR 1
#define JANET_VERSION_MINOR 14
#define JANET_VERSION_PATCH 2
-#define JANET_VERSION_EXTRA "-dev"
-#define JANET_VERSION "1.14.2-dev"
+#define JANET_VERSION_EXTRA ""
+#define JANET_VERSION "1.14.2"
/* #define JANET_BUILD "local" */