diff options
author | Mark Pulford <mark@kyne.com.au> | 2012-03-01 13:42:19 +0400 |
---|---|---|
committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 12:24:36 +0400 |
commit | 5300ecb4e8f8ce9ec200b91c7273dae1947e431c (patch) | |
tree | a14983ba2331dee93197a75636fe975e363eb920 | |
parent | 6a8c434e38f3035d04bf17696353cf0bb93abec6 (diff) |
Bump version to 2.1devel
-rwxr-xr-x | build-packages.sh | 6 | ||||
-rw-r--r-- | lua-cjson-2.1devel-1.rockspec (renamed from lua-cjson-2.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 f8b47a7..23a6f2e 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-2.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" +VERSION_FILES="lua-cjson-2.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" [ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '[1-3].[0-9]*'`" VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`" @@ -25,8 +25,8 @@ git archive --prefix="$PREFIX/" "$BRANCH" | tar xf - -C "$BUILDROOT" cd "$BUILDROOT" cd "$PREFIX" -rename 2.0devel "$VERSION" $VERSION_FILES -perl -pi -e "s/\\b2.0devel\\b/$VERSION/g" ${VERSION_FILES/2.0devel/$VERSION}; +rename 2.1devel "$VERSION" $VERSION_FILES +perl -pi -e "s/\\b2.1devel\\b/$VERSION/g" ${VERSION_FILES/2.1devel/$VERSION}; cd .. make -C "$PREFIX" doc diff --git a/lua-cjson-2.0devel-1.rockspec b/lua-cjson-2.1devel-1.rockspec index 9ef18cb..154e333 100644 --- a/lua-cjson-2.0devel-1.rockspec +++ b/lua-cjson-2.1devel-1.rockspec @@ -1,8 +1,8 @@ package = "lua-cjson" -version = "2.0devel-1" +version = "2.1devel-1" source = { - url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.0devel.zip", + url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.1devel.zip", } description = { diff --git a/lua-cjson.spec b/lua-cjson.spec index 823f7d8..824051d 100644 --- a/lua-cjson.spec +++ b/lua-cjson.spec @@ -3,7 +3,7 @@ %define luadatadir %{_datadir}/lua/%{luaver} Name: lua-cjson -Version: 2.0devel +Version: 2.1devel Release: 1%{?dist} Summary: A fast JSON encoding/parsing module for Lua diff --git a/lua_cjson.c b/lua_cjson.c index afa5266..ca5b88d 100644 --- a/lua_cjson.c +++ b/lua_cjson.c @@ -51,7 +51,7 @@ #endif #ifndef CJSON_VERSION -#define CJSON_VERSION "2.0devel" +#define CJSON_VERSION "2.1devel" #endif /* Workaround for Solaris platforms missing isinf() */ @@ -1,4 +1,4 @@ -= Lua CJSON 2.0devel Manual = += Lua CJSON 2.1devel Manual = Mark Pulford <mark@kyne.com.au> :revdate: January 22, 2012 @@ -102,7 +102,7 @@ has been installed. Build and install the module via RPM: [source,sh] -rpmbuild -tb lua-cjson-2.0devel.tar.gz +rpmbuild -tb lua-cjson-2.1devel.tar.gz rpm -Uvh $LUA_CJSON_RPM @@ -117,7 +117,7 @@ First, extract the Lua CJSON source package. Next, install the module: [source,sh] -cd lua-cjson-2.0devel +cd lua-cjson-2.1devel luarocks make [NOTE] @@ -590,7 +590,7 @@ The name of the Lua CJSON module (+"cjson"+). _VERSION ~~~~~~~~ -The version number of the Lua CJSON module (+"2.0devel"+). +The version number of the Lua CJSON module (+"2.1devel"+). null diff --git a/runtests.sh b/runtests.sh index e660db9..87db0bc 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,7 +1,7 @@ #!/bin/sh PLATFORM="`uname -s`" -[ "$1" ] && VERSION="$1" || VERSION="2.0devel" +[ "$1" ] && VERSION="$1" || VERSION="2.1devel" set -e diff --git a/tests/test.lua b/tests/test.lua index 96b47ff..96a3201 100755 --- a/tests/test.lua +++ b/tests/test.lua @@ -93,7 +93,7 @@ local cjson_tests = { -- Test API variables { "Check module name, version", function () return json._NAME, json._VERSION end, { }, - true, { "cjson", "2.0devel" } }, + true, { "cjson", "2.1devel" } }, -- Test decoding simple types { "Decode string", |