Skip to content

Commit

Permalink
[guile-json] upgrade to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherlam committed Apr 4, 2019
1 parent 492539e commit d39f180
Show file tree
Hide file tree
Showing 18 changed files with 1,285 additions and 483 deletions.
5 changes: 4 additions & 1 deletion borrowed/guile-json/AUTHORS
@@ -1,8 +1,11 @@
Aleix Conchillo Flaque <aconchillo@gmail.com> is the author and current
maintainer of guile-json. More details at <http://hacks-galore.org/aleix>.
maintainer of guile-json.

List of contributors (in alphabetical order):

Ludovic Courtès <ludo@gnu.org>
Jason Douglas Earl <jearl@notengoamigos.org>
Christopher Lam <christopher.lck@gmail.com>
Jan Nieuwenhuizen <janneke@gnu.org>
Ian Price <ianprice90@googlemail.com>
David Thompson <dthompson2@worcester.edu>
Expand Down
165 changes: 0 additions & 165 deletions borrowed/guile-json/COPYING.LESSER

This file was deleted.

51 changes: 51 additions & 0 deletions borrowed/guile-json/Makefile.am
@@ -0,0 +1,51 @@
#
# Makefile.am
#
# Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
#
# This file is part of guile-json.
#
# guile-json is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# guile-json is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with guile-json. If not, see https://www.gnu.org/licenses/.
#

SUBDIRS = json tests

ACLOCAL_AMFLAGS = -I build-aux

PKG_LIST_VERSION=$(shell echo $(PACKAGE_VERSION) | sed "s/\./ /g")

dist-hook:
$(SHELL) $(top_srcdir)/ChangeLog > $(top_distdir)/ChangeLog
cp $(top_srcdir)/pkg-list.scm.in $(top_distdir)/pkg-list.scm
# '' is to make OS X happy
sed -i '' "s/%VERSION%/$(PKG_LIST_VERSION)/g" $(top_distdir)/pkg-list.scm

GOBJECTS = $(SOURCES:%.scm=%.go)

moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)
objdir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache

nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
nobase_nodist_obj_DATA = $(GOBJECTS)

GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
SUFFIXES = .scm .go
.scm.go:
$(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"

SOURCES = json.scm

CLEANFILES = $(GOBJECTS)

EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
92 changes: 92 additions & 0 deletions borrowed/guile-json/NEWS
@@ -1,4 +1,96 @@


* Version ?? (??)

- Complex numbers, inf and nan are not allowed anymore as valid numbers when
building JSON.
(Fixes #32)


* Version 3.1.0 (Dec 31, 2018)

- scm->json and scm->json-string now support an additional key argument
#:unicode. If #:unicode is set to true unicode characters will be escaped
when needed, otherwise characters won't be escaped (which now becomes the
default).


* Version 3.0.0 (Dec 29, 2018)

- This is another breaking change release.

- JSON objects are now defined as alists (instead of hash tables) and JSON
arrays are now defined as vectors (instead of lists). Both of these
changes are mainly to use types that have read syntax. This will simplify
things for the user when defining JSON objects which is probably the most
common case.

- Fixed and issue when parsing only JSON numbers.

- Added unit tests.


* Version 2.0.0 (Dec 12, 2018)

- This is a breaking change release. It is not possible anymore to specify a
JSON object using alists. Instead alist->hash-table needs to be explicitly
used. This makes the bidirectional mapping between Guile hash-tables and
JSON objects consistent.


* Version 1.3.2 (Dec 2, 2018)

- Don't use GUILE_SITE and GUILE_SITE_CCACHE, build them as before. Print a
helper message at the end of configure output to help users to install in
Guile system's directory.


* Version 1.3.1 (Dec 1, 2018)

- Fix guile.m4 to allow multiple candidates for guild, guile-config and
guile-tools.

- Use GUILE_SITE as the variable instead of GUILE_SITE_DIR.
(Fixes #20)


* Version 1.3.0 (Nov 28, 2018)

- Properly use guile.m4 macros to install to the right paths.
(thanks to Jason Douglas Earl)


* Version 1.2.0 (Aug 22, 2018)

- Switch to GPLv3.


* Version 1.1.1 (Aug 14, 2018)

- Don't output extra spaces except with pretty printing.


* Version 1.1.0 (Jul 26, 2018)

- Install .go files to $(libdir)/guile.
(thanks to Ludovic Courtès)


* Version 1.0.1 (May 24, 2018)

- Fixes an issue while handling alists with #nil at the beginning.


* Version 1.0.0 (May 23, 2018)

- Support 4-byte unicode characters.
(thanks to Christopher Lam)

- Remove deprecated `json` macro.

- Dual GPLv3 and LGPLv3 license.


* Version 0.6.0 (Jan 16, 2017)

- Deprecate json macro in favor of scheme data types.
Expand Down

0 comments on commit d39f180

Please sign in to comment.