aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild-packages.sh6
-rw-r--r--lua-cjson-1.1devel-1.rockspec (renamed from lua-cjson-1.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 1664531..db5903b 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-1.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" 8VERSION_FILES="lua-cjson-1.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.[0-9]*'`" 10[ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '1.[0-9]*'`"
11VERSION="`git describe --match '1.[0-9]*' $BRANCH`" 11VERSION="`git describe --match '1.[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 1.0devel "$VERSION" $VERSION_FILES 28rename 1.1devel "$VERSION" $VERSION_FILES
29perl -pi -e "s/\\b1.0devel\\b/$VERSION/g" ${VERSION_FILES/1.0devel/$VERSION}; 29perl -pi -e "s/\\b1.1devel\\b/$VERSION/g" ${VERSION_FILES/1.1devel/$VERSION};
30cd .. 30cd ..
31 31
32make -C "$PREFIX" doc 32make -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 @@
1package = "lua-cjson" 1package = "lua-cjson"
2version = "1.0devel-1" 2version = "1.1devel-1"
3 3
4source = { 4source = {
5 url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-1.0devel.zip", 5 url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-1.1devel.zip",
6} 6}
7 7
8description = { 8description = {
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 @@
3%define luadatadir %{_datadir}/lua/%{luaver} 3%define luadatadir %{_datadir}/lua/%{luaver}
4 4
5Name: lua-cjson 5Name: lua-cjson
6Version: 1.0devel 6Version: 1.1devel
7Release: 1%{?dist} 7Release: 1%{?dist}
8Summary: A fast JSON encoding/parsing library for Lua 8Summary: A fast JSON encoding/parsing library for Lua
9 9
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 @@
51#endif 51#endif
52 52
53#ifndef CJSON_VERSION 53#ifndef CJSON_VERSION
54#define CJSON_VERSION "1.0devel" 54#define CJSON_VERSION "1.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 62485fd..35b2c2e 100644
--- a/manual.txt
+++ b/manual.txt
@@ -1,4 +1,4 @@
1= Lua CJSON 1.0devel Manual = 1= Lua CJSON 1.1devel Manual =
2Mark Pulford <mark@kyne.com.au> 2Mark Pulford <mark@kyne.com.au>
3:revdate: November 30, 2011 3:revdate: November 30, 2011
4 4
@@ -84,7 +84,7 @@ the included RPM spec file. Install the +rpm-build+ package (or
84similar) then: 84similar) then:
85 85
86[source,sh] 86[source,sh]
87rpmbuild -tb lua-cjson-1.0devel.tar.gz 87rpmbuild -tb lua-cjson-1.1devel.tar.gz
88rpm -Uvh $newly_built_lua_cjson_rpm 88rpm -Uvh $newly_built_lua_cjson_rpm
89 89
90 90
@@ -97,7 +97,7 @@ modules on a wide range of platforms (including Windows).
97Extract the Lua CJSON source package into a directory and run: 97Extract the Lua CJSON source package into a directory and run:
98 98
99[source,sh] 99[source,sh]
100cd lua-cjson-1.0devel 100cd lua-cjson-1.1devel
101luarocks make 101luarocks make
102 102
103[NOTE] 103[NOTE]
@@ -536,7 +536,7 @@ The name of the Lua CJSON module (+"cjson"+).
536_VERSION 536_VERSION
537~~~~~~~~ 537~~~~~~~~
538 538
539The version number of the Lua CJSON module (Eg, +"1.0devel"+). 539The version number of the Lua CJSON module (Eg, +"1.1devel"+).
540 540
541 541
542null 542null
diff --git a/runtests.sh b/runtests.sh
index d313db3..777ef01 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="1.0devel" 4[ "$1" ] && VERSION="$1" || VERSION="1.1devel"
5 5
6set -e 6set -e
7 7
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 = {
92 -- Test API variables 92 -- Test API variables
93 { "Check module name, version", 93 { "Check module name, version",
94 function () return json._NAME, json._VERSION, json.version end, { }, 94 function () return json._NAME, json._VERSION, json.version end, { },
95 true, { "cjson", "1.0devel", "1.0devel" } }, 95 true, { "cjson", "1.1devel", "1.1devel" } },
96 96
97 -- Test decoding simple types 97 -- Test decoding simple types
98 { "Decode string", 98 { "Decode string",