aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild-packages.sh6
-rw-r--r--lua-cjson-2.1devel-1.rockspec (renamed from lua-cjson-2.0devel-1.rockspec)4
-rw-r--r--lua-cjson.spec2
-rw-r--r--lua_cjson.c2
-rw-r--r--manual.txt8
-rwxr-xr-xruntests.sh2
-rwxr-xr-xtests/test.lua2
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 @@
5# Build packages. Use current checked out version, or a specific tag/commit. 5# Build packages. Use current checked out version, or a specific tag/commit.
6 6
7# Files requiring a version bump 7# Files requiring a version bump
8VERSION_FILES="lua-cjson-2.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" 8VERSION_FILES="lua-cjson-2.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua"
9 9
10[ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '[1-3].[0-9]*'`" 10[ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '[1-3].[0-9]*'`"
11VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`" 11VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`"
@@ -25,8 +25,8 @@ git archive --prefix="$PREFIX/" "$BRANCH" | tar xf - -C "$BUILDROOT"
25cd "$BUILDROOT" 25cd "$BUILDROOT"
26 26
27cd "$PREFIX" 27cd "$PREFIX"
28rename 2.0devel "$VERSION" $VERSION_FILES 28rename 2.1devel "$VERSION" $VERSION_FILES
29perl -pi -e "s/\\b2.0devel\\b/$VERSION/g" ${VERSION_FILES/2.0devel/$VERSION}; 29perl -pi -e "s/\\b2.1devel\\b/$VERSION/g" ${VERSION_FILES/2.1devel/$VERSION};
30cd .. 30cd ..
31 31
32make -C "$PREFIX" doc 32make -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 @@
1package = "lua-cjson" 1package = "lua-cjson"
2version = "2.0devel-1" 2version = "2.1devel-1"
3 3
4source = { 4source = {
5 url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.0devel.zip", 5 url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.1devel.zip",
6} 6}
7 7
8description = { 8description = {
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 @@
3%define luadatadir %{_datadir}/lua/%{luaver} 3%define luadatadir %{_datadir}/lua/%{luaver}
4 4
5Name: lua-cjson 5Name: lua-cjson
6Version: 2.0devel 6Version: 2.1devel
7Release: 1%{?dist} 7Release: 1%{?dist}
8Summary: A fast JSON encoding/parsing module for Lua 8Summary: A fast JSON encoding/parsing module for Lua
9 9
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 @@
51#endif 51#endif
52 52
53#ifndef CJSON_VERSION 53#ifndef CJSON_VERSION
54#define CJSON_VERSION "2.0devel" 54#define CJSON_VERSION "2.1devel"
55#endif 55#endif
56 56
57/* Workaround for Solaris platforms missing isinf() */ 57/* Workaround for Solaris platforms missing isinf() */
diff --git a/manual.txt b/manual.txt
index afd9528..757ec39 100644
--- a/manual.txt
+++ b/manual.txt
@@ -1,4 +1,4 @@
1= Lua CJSON 2.0devel Manual = 1= Lua CJSON 2.1devel Manual =
2Mark Pulford <mark@kyne.com.au> 2Mark Pulford <mark@kyne.com.au>
3:revdate: January 22, 2012 3:revdate: January 22, 2012
4 4
@@ -102,7 +102,7 @@ has been installed.
102Build and install the module via RPM: 102Build and install the module via RPM:
103 103
104[source,sh] 104[source,sh]
105rpmbuild -tb lua-cjson-2.0devel.tar.gz 105rpmbuild -tb lua-cjson-2.1devel.tar.gz
106rpm -Uvh $LUA_CJSON_RPM 106rpm -Uvh $LUA_CJSON_RPM
107 107
108 108
@@ -117,7 +117,7 @@ First, extract the Lua CJSON source package.
117Next, install the module: 117Next, install the module:
118 118
119[source,sh] 119[source,sh]
120cd lua-cjson-2.0devel 120cd lua-cjson-2.1devel
121luarocks make 121luarocks make
122 122
123[NOTE] 123[NOTE]
@@ -590,7 +590,7 @@ The name of the Lua CJSON module (+"cjson"+).
590_VERSION 590_VERSION
591~~~~~~~~ 591~~~~~~~~
592 592
593The version number of the Lua CJSON module (+"2.0devel"+). 593The version number of the Lua CJSON module (+"2.1devel"+).
594 594
595 595
596null 596null
diff --git a/runtests.sh b/runtests.sh
index e660db9..87db0bc 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3PLATFORM="`uname -s`" 3PLATFORM="`uname -s`"
4[ "$1" ] && VERSION="$1" || VERSION="2.0devel" 4[ "$1" ] && VERSION="$1" || VERSION="2.1devel"
5 5
6set -e 6set -e
7 7
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 = {
93 -- Test API variables 93 -- Test API variables
94 { "Check module name, version", 94 { "Check module name, version",
95 function () return json._NAME, json._VERSION end, { }, 95 function () return json._NAME, json._VERSION end, { },
96 true, { "cjson", "2.0devel" } }, 96 true, { "cjson", "2.1devel" } },
97 97
98 -- Test decoding simple types 98 -- Test decoding simple types
99 { "Decode string", 99 { "Decode string",