diff options
author | Mark Pulford <mark@kyne.com.au> | 2012-03-01 20:12:19 +1030 |
---|---|---|
committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 18:54:36 +1030 |
commit | 5300ecb4e8f8ce9ec200b91c7273dae1947e431c (patch) | |
tree | a14983ba2331dee93197a75636fe975e363eb920 | |
parent | 6a8c434e38f3035d04bf17696353cf0bb93abec6 (diff) | |
download | lua-cjson-5300ecb4e8f8ce9ec200b91c7273dae1947e431c.tar.gz lua-cjson-5300ecb4e8f8ce9ec200b91c7273dae1947e431c.tar.bz2 lua-cjson-5300ecb4e8f8ce9ec200b91c7273dae1947e431c.zip |
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 @@ | |||
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 |
8 | VERSION_FILES="lua-cjson-2.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" | 8 | VERSION_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]*'`" |
11 | VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`" | 11 | VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`" |
@@ -25,8 +25,8 @@ git archive --prefix="$PREFIX/" "$BRANCH" | tar xf - -C "$BUILDROOT" | |||
25 | cd "$BUILDROOT" | 25 | cd "$BUILDROOT" |
26 | 26 | ||
27 | cd "$PREFIX" | 27 | cd "$PREFIX" |
28 | rename 2.0devel "$VERSION" $VERSION_FILES | 28 | rename 2.1devel "$VERSION" $VERSION_FILES |
29 | perl -pi -e "s/\\b2.0devel\\b/$VERSION/g" ${VERSION_FILES/2.0devel/$VERSION}; | 29 | perl -pi -e "s/\\b2.1devel\\b/$VERSION/g" ${VERSION_FILES/2.1devel/$VERSION}; |
30 | cd .. | 30 | cd .. |
31 | 31 | ||
32 | make -C "$PREFIX" doc | 32 | 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 @@ | |||
1 | package = "lua-cjson" | 1 | package = "lua-cjson" |
2 | version = "2.0devel-1" | 2 | version = "2.1devel-1" |
3 | 3 | ||
4 | source = { | 4 | source = { |
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 | ||
8 | description = { | 8 | 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 @@ | |||
3 | %define luadatadir %{_datadir}/lua/%{luaver} | 3 | %define luadatadir %{_datadir}/lua/%{luaver} |
4 | 4 | ||
5 | Name: lua-cjson | 5 | Name: lua-cjson |
6 | Version: 2.0devel | 6 | Version: 2.1devel |
7 | Release: 1%{?dist} | 7 | Release: 1%{?dist} |
8 | Summary: A fast JSON encoding/parsing module for Lua | 8 | Summary: 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() */ |
@@ -1,4 +1,4 @@ | |||
1 | = Lua CJSON 2.0devel Manual = | 1 | = Lua CJSON 2.1devel Manual = |
2 | Mark Pulford <mark@kyne.com.au> | 2 | Mark Pulford <mark@kyne.com.au> |
3 | :revdate: January 22, 2012 | 3 | :revdate: January 22, 2012 |
4 | 4 | ||
@@ -102,7 +102,7 @@ has been installed. | |||
102 | Build and install the module via RPM: | 102 | Build and install the module via RPM: |
103 | 103 | ||
104 | [source,sh] | 104 | [source,sh] |
105 | rpmbuild -tb lua-cjson-2.0devel.tar.gz | 105 | rpmbuild -tb lua-cjson-2.1devel.tar.gz |
106 | rpm -Uvh $LUA_CJSON_RPM | 106 | rpm -Uvh $LUA_CJSON_RPM |
107 | 107 | ||
108 | 108 | ||
@@ -117,7 +117,7 @@ First, extract the Lua CJSON source package. | |||
117 | Next, install the module: | 117 | Next, install the module: |
118 | 118 | ||
119 | [source,sh] | 119 | [source,sh] |
120 | cd lua-cjson-2.0devel | 120 | cd lua-cjson-2.1devel |
121 | luarocks make | 121 | luarocks 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 | ||
593 | The version number of the Lua CJSON module (+"2.0devel"+). | 593 | The version number of the Lua CJSON module (+"2.1devel"+). |
594 | 594 | ||
595 | 595 | ||
596 | null | 596 | null |
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 | ||
3 | PLATFORM="`uname -s`" | 3 | PLATFORM="`uname -s`" |
4 | [ "$1" ] && VERSION="$1" || VERSION="2.0devel" | 4 | [ "$1" ] && VERSION="$1" || VERSION="2.1devel" |
5 | 5 | ||
6 | set -e | 6 | set -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", |