Merge branch 'master' into make

This commit is contained in:
Calvin Rose 2022-04-05 20:18:12 -05:00 committed by GitHub
commit f74df41fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -1,7 +1,7 @@
# Changelog
All notable changes to this project will be documented in this file.
## 1.21.1 - 2022-03-27
## 1.21.2 - 2022-04-01
- C functions `janet_dobytes` and `janet_dostring` will now enter the event loop if it is enabled.
- Fix hashing regression - hash of negative 0 must be the same as positive 0 since they are equal.
- The `flycheck` function no longer pollutes the module/cache

View File

@ -167,9 +167,9 @@ build/c/janet.c: build/janet_boot src/boot/boot.janet
########################
ifeq ($(UNAME), Darwin)
SONAME=libjanet.1.20.dylib
SONAME=libjanet.1.21.dylib
else
SONAME=libjanet.so.1.20
SONAME=libjanet.so.1.21
endif
build/c/shell.c: src/mainclient/shell.c

View File

@ -20,7 +20,7 @@
project('janet', 'c',
default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'],
version : '1.21.1')
version : '1.21.2')
# Global settings
janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')

View File

@ -5,9 +5,9 @@
#define JANET_VERSION_MAJOR 1
#define JANET_VERSION_MINOR 21
#define JANET_VERSION_PATCH 1
#define JANET_VERSION_PATCH 2
#define JANET_VERSION_EXTRA ""
#define JANET_VERSION "1.21.1"
#define JANET_VERSION "1.21.2"
/* #define JANET_BUILD "local" */