diff options
author | Mark Pulford <mark@kyne.com.au> | 2012-01-18 18:20:05 +0400 |
---|---|---|
committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 12:24:35 +0400 |
commit | 3040931d6bb7331b130fd4c34a7b17bc5d226039 (patch) | |
tree | 507a7278b36049db0ee2ec6053b26662280bbda9 | |
parent | 88bb249473db4e4923e4c27a8e3ece7a77e738ce (diff) |
Bump development version to 1.1devel
-rwxr-xr-x | build-packages.sh | 6 | ||||
-rw-r--r-- | lua-cjson-1.1devel-1.rockspec (renamed from lua-cjson-1.0devel-1.rockspec) | 4 | ||||
-rw-r--r-- | lua-cjson.spec | 2 | ||||
-rw-r--r-- | lua_cjson.c | 2 | ||||
-rw-r--r-- | manual.txt | 8 | ||||
-rwxr-xr-x | runtests.sh | 2 | ||||
-rwxr-xr-x | tests/test.lua | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/build-packages.sh b/build-packages.sh index 1664531..db5903b 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.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" +VERSION_FILES="lua-cjson-1.1devel-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.0devel "$VERSION" $VERSION_FILES -perl -pi -e "s/\\b1.0devel\\b/$VERSION/g" ${VERSION_FILES/1.0devel/$VERSION}; +rename 1.1devel "$VERSION" $VERSION_FILES +perl -pi -e "s/\\b1.1devel\\b/$VERSION/g" ${VERSION_FILES/1.1devel/$VERSION}; cd .. make -C "$PREFIX" doc diff --git a/lua-cjson-1.0devel-1.rockspec b/lua-cjson-1.1devel-1.rockspec index cc17f5a..c8c4367 100644 --- a/lua-cjson-1.0devel-1.rockspec +++ b/lua-cjson-1.1devel-1.rockspec @@ -1,8 +1,8 @@ package = "lua-cjson" -version = "1.0devel-1" +version = "1.1devel-1" source = { - url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-1.0devel.zip", + url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-1.1devel.zip", } description = { diff --git a/lua-cjson.spec b/lua-cjson.spec index f7b91e5..0c0aea4 100644 --- a/lua-cjson.spec +++ b/lua-cjson.spec @@ -3,7 +3,7 @@ %define luadatadir %{_datadir}/lua/%{luaver} Name: lua-cjson -Version: 1.0devel +Version: 1.1devel Release: 1%{?dist} Summary: A fast JSON encoding/parsing library for Lua diff --git a/lua_cjson.c b/lua_cjson.c index 118ca27..7f0bbb1 100644 --- a/lua_cjson.c +++ b/lua_cjson.c @@ -51,7 +51,7 @@ #endif #ifndef CJSON_VERSION -#define CJSON_VERSION "1.0devel" +#define CJSON_VERSION "1.1devel" #endif /* Workaround for Solaris platforms missing isinf() */ @@ -1,4 +1,4 @@ -= Lua CJSON 1.0devel Manual = += Lua CJSON 1.1devel Manual = Mark Pulford <mark@kyne.com.au> :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.0devel.tar.gz +rpmbuild -tb lua-cjson-1.1devel.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.0devel +cd lua-cjson-1.1devel 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.0devel"+). +The version number of the Lua CJSON module (Eg, +"1.1devel"+). null diff --git a/runtests.sh b/runtests.sh index d313db3..777ef01 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,7 +1,7 @@ #!/bin/sh PLATFORM="`uname -s`" -[ "$1" ] && VERSION="$1" || VERSION="1.0devel" +[ "$1" ] && VERSION="$1" || VERSION="1.1devel" set -e diff --git a/tests/test.lua b/tests/test.lua index 152579e..2941a91 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, json.version end, { }, - true, { "cjson", "1.0devel", "1.0devel" } }, + true, { "cjson", "1.1devel", "1.1devel" } }, -- Test decoding simple types { "Decode string", |