From aaed0e6a8f1bdacb13f7d89f4eaea76c322edb65 Mon Sep 17 00:00:00 2001 From: Mark Pulford Date: Fri, 20 Jan 2012 00:36:35 +1030 Subject: Bump version to 2.0devel Bump version to 2.0devel due to significant changes and updated API (runtime config not fully backwards compatible). --- NEWS | 2 +- build-packages.sh | 6 ++--- lua-cjson-1.1devel-1.rockspec | 56 ------------------------------------------- lua-cjson-2.0devel-1.rockspec | 56 +++++++++++++++++++++++++++++++++++++++++++ lua-cjson.spec | 2 +- lua_cjson.c | 2 +- manual.txt | 8 +++---- runtests.sh | 2 +- tests/test.lua | 2 +- 9 files changed, 68 insertions(+), 68 deletions(-) delete mode 100644 lua-cjson-1.1devel-1.rockspec create mode 100644 lua-cjson-2.0devel-1.rockspec diff --git a/NEWS b/NEWS index ba48b9c..50057e6 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Version 1.0.5 (?) +Version 2.0.0 (Jan ? 2012) * Added support for Lua 5.2 * Added HTML reference manual * Added CMake build support diff --git a/build-packages.sh b/build-packages.sh index db5903b..2dacb8c 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -5,7 +5,7 @@ # Build packages. Use current checked out version, or a specific tag/commit. # Files requiring a version bump -VERSION_FILES="lua-cjson-1.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" +VERSION_FILES="lua-cjson-2.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" [ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '1.[0-9]*'`" VERSION="`git describe --match '1.[0-9]*' $BRANCH`" @@ -25,8 +25,8 @@ git archive --prefix="$PREFIX/" "$BRANCH" | tar xf - -C "$BUILDROOT" cd "$BUILDROOT" cd "$PREFIX" -rename 1.1devel "$VERSION" $VERSION_FILES -perl -pi -e "s/\\b1.1devel\\b/$VERSION/g" ${VERSION_FILES/1.1devel/$VERSION}; +rename 2.0devel "$VERSION" $VERSION_FILES +perl -pi -e "s/\\b2.0devel\\b/$VERSION/g" ${VERSION_FILES/2.0devel/$VERSION}; cd .. make -C "$PREFIX" doc diff --git a/lua-cjson-1.1devel-1.rockspec b/lua-cjson-1.1devel-1.rockspec deleted file mode 100644 index c8c4367..0000000 --- a/lua-cjson-1.1devel-1.rockspec +++ /dev/null @@ -1,56 +0,0 @@ -package = "lua-cjson" -version = "1.1devel-1" - -source = { - url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-1.1devel.zip", -} - -description = { - summary = "A fast JSON encoding/parsing library", - detailed = [[ - The Lua CJSON library provides JSON support for Lua. It features: - - Fast, standards compliant encoding/parsing routines - - Full support for JSON with UTF-8, including decoding surrogate pairs - - Optional run-time support for common exceptions to the JSON specification - (NaN, Infinity,..) - - No external dependencies - ]], - homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php", - license = "MIT" -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "builtin", - modules = { - cjson = { - sources = { "lua_cjson.c", "strbuf.c", "fpconv.c" }, - defines = { --- LuaRocks does not support platform specific configuration for Solaris. --- Uncomment the line below on Solaris platforms if required. --- "USE_INTERNAL_ISINF" - } - } - }, - install = { - lua = { - ["cjson.util"] = "lua/cjson/util.lua" - }, - bin = { - json2lua = "lua/json2lua.lua", - lua2json = "lua/lua2json.lua" - } - }, - -- Override default build options (per platform) - platforms = { - win32 = { modules = { cjson = { defines = { - "DISABLE_INVALID_NUMBERS" - } } } } - }, - copy_directories = { "tests" } -} - --- vi:ai et sw=4 ts=4: diff --git a/lua-cjson-2.0devel-1.rockspec b/lua-cjson-2.0devel-1.rockspec new file mode 100644 index 0000000..9a2ac04 --- /dev/null +++ b/lua-cjson-2.0devel-1.rockspec @@ -0,0 +1,56 @@ +package = "lua-cjson" +version = "2.0devel-1" + +source = { + url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.0devel.zip", +} + +description = { + summary = "A fast JSON encoding/parsing library", + detailed = [[ + The Lua CJSON library provides JSON support for Lua. It features: + - Fast, standards compliant encoding/parsing routines + - Full support for JSON with UTF-8, including decoding surrogate pairs + - Optional run-time support for common exceptions to the JSON specification + (NaN, Infinity,..) + - No external dependencies + ]], + homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php", + license = "MIT" +} + +dependencies = { + "lua >= 5.1" +} + +build = { + type = "builtin", + modules = { + cjson = { + sources = { "lua_cjson.c", "strbuf.c", "fpconv.c" }, + defines = { +-- LuaRocks does not support platform specific configuration for Solaris. +-- Uncomment the line below on Solaris platforms if required. +-- "USE_INTERNAL_ISINF" + } + } + }, + install = { + lua = { + ["cjson.util"] = "lua/cjson/util.lua" + }, + bin = { + json2lua = "lua/json2lua.lua", + lua2json = "lua/lua2json.lua" + } + }, + -- Override default build options (per platform) + platforms = { + win32 = { modules = { cjson = { defines = { + "DISABLE_INVALID_NUMBERS" + } } } } + }, + copy_directories = { "tests" } +} + +-- vi:ai et sw=4 ts=4: diff --git a/lua-cjson.spec b/lua-cjson.spec index 4642857..108651c 100644 --- a/lua-cjson.spec +++ b/lua-cjson.spec @@ -3,7 +3,7 @@ %define luadatadir %{_datadir}/lua/%{luaver} Name: lua-cjson -Version: 1.1devel +Version: 2.0devel Release: 1%{?dist} Summary: A fast JSON encoding/parsing library for Lua diff --git a/lua_cjson.c b/lua_cjson.c index f5af350..b14c242 100644 --- a/lua_cjson.c +++ b/lua_cjson.c @@ -51,7 +51,7 @@ #endif #ifndef CJSON_VERSION -#define CJSON_VERSION "1.1devel" +#define CJSON_VERSION "2.0devel" #endif /* Workaround for Solaris platforms missing isinf() */ diff --git a/manual.txt b/manual.txt index 35b2c2e..8ca4778 100644 --- a/manual.txt +++ b/manual.txt @@ -1,4 +1,4 @@ -= Lua CJSON 1.1devel Manual = += Lua CJSON 2.0devel Manual = Mark Pulford :revdate: November 30, 2011 @@ -84,7 +84,7 @@ the included RPM spec file. Install the +rpm-build+ package (or similar) then: [source,sh] -rpmbuild -tb lua-cjson-1.1devel.tar.gz +rpmbuild -tb lua-cjson-2.0devel.tar.gz rpm -Uvh $newly_built_lua_cjson_rpm @@ -97,7 +97,7 @@ modules on a wide range of platforms (including Windows). Extract the Lua CJSON source package into a directory and run: [source,sh] -cd lua-cjson-1.1devel +cd lua-cjson-2.0devel luarocks make [NOTE] @@ -536,7 +536,7 @@ The name of the Lua CJSON module (+"cjson"+). _VERSION ~~~~~~~~ -The version number of the Lua CJSON module (Eg, +"1.1devel"+). +The version number of the Lua CJSON module (Eg, +"2.0devel"+). null diff --git a/runtests.sh b/runtests.sh index a301488..cdc33e6 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,7 +1,7 @@ #!/bin/sh PLATFORM="`uname -s`" -[ "$1" ] && VERSION="$1" || VERSION="1.1devel" +[ "$1" ] && VERSION="$1" || VERSION="2.0devel" set -e diff --git a/tests/test.lua b/tests/test.lua index 8c50b02..ac6419a 100755 --- a/tests/test.lua +++ b/tests/test.lua @@ -92,7 +92,7 @@ local cjson_tests = { -- Test API variables { "Check module name, version", function () return json._NAME, json._VERSION end, { }, - true, { "cjson", "1.1devel" } }, + true, { "cjson", "2.0devel" } }, -- Test decoding simple types { "Decode string", -- cgit v1.2.3