diff options
| author | Mark Pulford <mark@kyne.com.au> | 2012-01-20 00:36:35 +1030 |
|---|---|---|
| committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 18:54:35 +1030 |
| commit | aaed0e6a8f1bdacb13f7d89f4eaea76c322edb65 (patch) | |
| tree | d23527fb3ec997694aa142e45e60907cabb8a0c6 | |
| parent | 31bf122c1d1d9e3812b9ef2555d537f509ae3f05 (diff) | |
| download | lua-cjson-aaed0e6a8f1bdacb13f7d89f4eaea76c322edb65.tar.gz lua-cjson-aaed0e6a8f1bdacb13f7d89f4eaea76c322edb65.tar.bz2 lua-cjson-aaed0e6a8f1bdacb13f7d89f4eaea76c322edb65.zip | |
Bump version to 2.0devel
Bump version to 2.0devel due to significant changes and updated API
(runtime config not fully backwards compatible).
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | build-packages.sh | 6 | ||||
| -rw-r--r-- | lua-cjson-2.0devel-1.rockspec (renamed from lua-cjson-1.1devel-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 |
8 files changed, 14 insertions, 14 deletions
| @@ -1,4 +1,4 @@ | |||
| 1 | Version 1.0.5 (?) | 1 | Version 2.0.0 (Jan ? 2012) |
| 2 | * Added support for Lua 5.2 | 2 | * Added support for Lua 5.2 |
| 3 | * Added HTML reference manual | 3 | * Added HTML reference manual |
| 4 | * Added CMake build support | 4 | * Added CMake build support |
diff --git a/build-packages.sh b/build-packages.sh index db5903b..2dacb8c 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-1.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua" | 8 | VERSION_FILES="lua-cjson-2.0devel-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]*'`" |
| 11 | VERSION="`git describe --match '1.[0-9]*' $BRANCH`" | 11 | VERSION="`git describe --match '1.[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 1.1devel "$VERSION" $VERSION_FILES | 28 | rename 2.0devel "$VERSION" $VERSION_FILES |
| 29 | perl -pi -e "s/\\b1.1devel\\b/$VERSION/g" ${VERSION_FILES/1.1devel/$VERSION}; | 29 | perl -pi -e "s/\\b2.0devel\\b/$VERSION/g" ${VERSION_FILES/2.0devel/$VERSION}; |
| 30 | cd .. | 30 | cd .. |
| 31 | 31 | ||
| 32 | make -C "$PREFIX" doc | 32 | make -C "$PREFIX" doc |
diff --git a/lua-cjson-1.1devel-1.rockspec b/lua-cjson-2.0devel-1.rockspec index c8c4367..9a2ac04 100644 --- a/lua-cjson-1.1devel-1.rockspec +++ b/lua-cjson-2.0devel-1.rockspec | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | package = "lua-cjson" | 1 | package = "lua-cjson" |
| 2 | version = "1.1devel-1" | 2 | version = "2.0devel-1" |
| 3 | 3 | ||
| 4 | source = { | 4 | source = { |
| 5 | url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-1.1devel.zip", | 5 | url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.0devel.zip", |
| 6 | } | 6 | } |
| 7 | 7 | ||
| 8 | description = { | 8 | description = { |
diff --git a/lua-cjson.spec b/lua-cjson.spec index 4642857..108651c 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: 1.1devel | 6 | Version: 2.0devel |
| 7 | Release: 1%{?dist} | 7 | Release: 1%{?dist} |
| 8 | Summary: A fast JSON encoding/parsing library for Lua | 8 | Summary: A fast JSON encoding/parsing library for Lua |
| 9 | 9 | ||
diff --git a/lua_cjson.c b/lua_cjson.c index f5af350..b14c242 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.1devel" | 54 | #define CJSON_VERSION "2.0devel" |
| 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 1.1devel Manual = | 1 | = Lua CJSON 2.0devel Manual = |
| 2 | Mark Pulford <mark@kyne.com.au> | 2 | Mark 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 | |||
| 84 | similar) then: | 84 | similar) then: |
| 85 | 85 | ||
| 86 | [source,sh] | 86 | [source,sh] |
| 87 | rpmbuild -tb lua-cjson-1.1devel.tar.gz | 87 | rpmbuild -tb lua-cjson-2.0devel.tar.gz |
| 88 | rpm -Uvh $newly_built_lua_cjson_rpm | 88 | rpm -Uvh $newly_built_lua_cjson_rpm |
| 89 | 89 | ||
| 90 | 90 | ||
| @@ -97,7 +97,7 @@ modules on a wide range of platforms (including Windows). | |||
| 97 | Extract the Lua CJSON source package into a directory and run: | 97 | Extract the Lua CJSON source package into a directory and run: |
| 98 | 98 | ||
| 99 | [source,sh] | 99 | [source,sh] |
| 100 | cd lua-cjson-1.1devel | 100 | cd lua-cjson-2.0devel |
| 101 | luarocks make | 101 | luarocks 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 | ||
| 539 | The version number of the Lua CJSON module (Eg, +"1.1devel"+). | 539 | The version number of the Lua CJSON module (Eg, +"2.0devel"+). |
| 540 | 540 | ||
| 541 | 541 | ||
| 542 | null | 542 | null |
diff --git a/runtests.sh b/runtests.sh index a301488..cdc33e6 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="1.1devel" | 4 | [ "$1" ] && VERSION="$1" || VERSION="2.0devel" |
| 5 | 5 | ||
| 6 | set -e | 6 | set -e |
| 7 | 7 | ||
diff --git a/tests/test.lua b/tests/test.lua index 8c50b02..ac6419a 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 end, { }, | 94 | function () return json._NAME, json._VERSION end, { }, |
| 95 | true, { "cjson", "1.1devel" } }, | 95 | true, { "cjson", "2.0devel" } }, |
| 96 | 96 | ||
| 97 | -- Test decoding simple types | 97 | -- Test decoding simple types |
| 98 | { "Decode string", | 98 | { "Decode string", |
