Compare commits

...

17 Commits

Author SHA1 Message Date
ae74836236 mainline version 1.4.2.9. 2013-09-29 23:53:48 -07:00
b0d3505b31 upgraded ngx_lua to 0.9.0. 2013-09-29 20:40:02 -07:00
9d2ae2e217 upgraded ngx_devel_kit to 0.2.19. 2013-09-29 18:55:59 -07:00
6bb19476b4 updated tests to reflect recent changes. 2013-09-27 15:43:44 -07:00
f0a2f6543e bundled the new lua-resty-lock library. 2013-09-27 15:42:33 -07:00
937985fc03 bundled new library lua-resty-websocket. 2013-09-27 15:37:00 -07:00
457d0526ea upgraded lua-resty-memcached to 0.12. 2013-09-23 22:46:00 -07:00
f0243eb2aa upgraded lua-resty-redis to 0.16. 2013-09-22 23:22:42 -07:00
76a803640a bumped version to 1.4.2.8 and also updated tests accordingly. 2013-09-22 15:06:53 -07:00
5fe07d1df5 upgraded ngx_lua to 0.8.10. 2013-09-22 14:54:37 -07:00
2c23a0859e bumped version to 1.4.2.7 and also updated the test suite accordingly. 2013-09-15 14:01:20 -07:00
8012da1f61 upgraded ngx_lua to 0.8.9 and ngx_echo to 0.48. 2013-09-15 13:55:01 -07:00
e0d777bb5d ./configure: always remove exising Makefile before trying to generate a new one. 2013-09-08 20:57:08 -07:00
37737082dd updated tests to reflect recent changes. 2013-09-08 16:28:10 -07:00
5c77ae9d4a bumped version to 1.4.2.5. 2013-09-08 16:27:28 -07:00
2d2132d232 upgraded ngx_lua to 0.8.8. 2013-09-08 16:16:47 -07:00
559f187c3c upgraded ngx_set_misc to 0.22. 2013-09-08 16:08:51 -07:00
4 changed files with 370 additions and 256 deletions

File diff suppressed because it is too large Load Diff

18
util/configure vendored
View File

@ -22,6 +22,10 @@ my $OS = $^O;
my $ngx_dir;
if (-f 'Makefile') {
unlink 'Makefile' or die "ERROR: failed to remove existing Makefile: $!\n";
}
for my $opt (@ARGV) {
if ($opt =~ /^--platform=(.*)/) {
$OS = $1;
@ -172,6 +176,12 @@ for my $opt (@ARGV) {
} elsif ($opt eq '--without-lua_resty_string') {
$resty_opts{no_lua_resty_string} = 1;
} elsif ($opt eq '--without-lua_resty_websocket') {
$resty_opts{no_lua_resty_websocket} = 1;
} elsif ($opt eq '--without-lua_resty_lock') {
$resty_opts{no_lua_resty_lock} = 1;
} elsif ($opt eq '--without-lua_rds_parser') {
$resty_opts{no_lua_rds_parser} = 1;
@ -304,7 +314,7 @@ sub shell ($@) {
unless ($dry_run) {
system($cmd) == 0 or
die "failed to run command: ", trim($cmd), "\n";
die "ERROR: failed to run command: ", trim($cmd), "\n";
}
}
@ -776,7 +786,9 @@ _EOC_
"\$(MAKE) install$extra_opts";
}
for my $key (qw(dns memcached redis mysql string upload)) {
for my $key (qw(dns memcached redis mysql string upload websocket
lock))
{
unless ($opts->{"no_lua_resty_$key"}) {
my $name = "lua-resty-$key";
my $dir = auto_complete $name;
@ -897,6 +909,8 @@ _EOC_
--without-lua_resty_mysql disable the lua-resty-mysql library
--without-lua_resty_upload disable the lua-resty-upload library
--without-lua_resty_string disable the lua-resty-string library
--without-lua_resty_websocket disable the lua-resty-websocket library
--without-lua_resty_lock disable the lua-resty-lock library
--without-lua51 disable the bundled Lua 5.1 interpreter
--with-lua51=PATH specify the external installation of Lua 5.1 by PATH

View File

@ -193,7 +193,7 @@ rm -rf no-pool-nginx-$ver
#################################
ver=0.47
ver=0.48
$root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1
tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
@ -207,14 +207,14 @@ mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
#################################
ver=0.2.18
ver=0.2.19
$root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O ngx_devel_kit-$ver.tar.gz
tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
#################################
ver=0.22rc8
ver=0.22
$root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/v$ver" -O set-misc-nginx-module-$ver.tar.gz || exit 1
tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
@ -249,7 +249,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.8.7
ver=0.9.0
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
@ -422,14 +422,14 @@ mv agentzh-lua-resty-dns-* lua-resty-dns-$ver || exit 1
#################################
ver=0.11
ver=0.12
$root/util/get-tarball "http://github.com/agentzh/lua-resty-memcached/tarball/v$ver" -O "lua-resty-memcached-$ver.tar.gz" || exit 1
tar -xzf lua-resty-memcached-$ver.tar.gz || exit 1
mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
#################################
ver=0.15
ver=0.16
$root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
@ -457,6 +457,20 @@ mv agentzh-lua-resty-string-* lua-resty-string-$ver || exit 1
#################################
ver=0.01
$root/util/get-tarball "http://github.com/agentzh/lua-resty-websocket/tarball/v$ver" -O "lua-resty-websocket-$ver.tar.gz" || exit 1
tar -xzf lua-resty-websocket-$ver.tar.gz || exit 1
mv agentzh-lua-resty-websocket-* lua-resty-websocket-$ver || exit 1
#################################
ver=0.01
$root/util/get-tarball "http://github.com/agentzh/lua-resty-lock/tarball/v$ver" -O "lua-resty-lock-$ver.tar.gz" || exit 1
tar -xzf lua-resty-lock-$ver.tar.gz || exit 1
mv agentzh-lua-resty-lock-* lua-resty-lock-$ver || exit 1
#################################
rm *.tar.gz
cd ..

View File

@ -2,7 +2,7 @@
#main_ver=1.5.4
main_ver=1.4.2
minor_ver=3
minor_ver=9
version=$main_ver.$minor_ver
echo $version