186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

upgraded ngx_lua to v0.2.1rc2 and ngx_redis2 to v0.07; also released ngx_openresty 1.0.4.1rc2.

Browse Source
This commit is contained in:
agentzh (章亦春)
2011-07-23 11:55:35 +08:00
parent d2c3802134
commit 68aac430ae
5 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
util/configure vendored
View File

@ -278,7 +278,9 @@ sub build_resty_opts {
#unshift @ngx_cc_opts, '-O2';
}
$opts_line .= " \\\n --with-cc-opt='@ngx_cc_opts'";
if (@ngx_cc_opts) {
$opts_line .= " \\\n --with-cc-opt='@ngx_cc_opts'";
}
if (-d 'build') {
system("rm -rf build");
@ -596,7 +598,7 @@ sub gen_makefile {
open my $out, ">Makefile" or
die "Cannot open Makefile for writing: $!\n";
print $out ".PHONY: all install\n\n";
print $out ".PHONY: all install clean\n\n";
print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";

4
util/fix-tests
View File

@ -44,12 +44,12 @@ for my $t_file (@t_files) {
warn "\n- $orig";
warn "+ $_";
} elsif (s{\bbuild/$pat\S+}{build/$dir}g && $orig ne $_) {
} elsif (s{\bbuild/$pat[^/ \t\n]*\d[^/ \t\n]*}{build/$dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";
warn "+ $_";
} elsif (s{^cd $pat\S+}{cd $dir}g && $orig ne $_) {
} elsif (s{^cd $pat[^/ \t\n]+}{cd $dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";

4
util/mirror-tarballs
View File

@ -87,7 +87,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.2.1rc1
ver=0.2.1rc2
$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
@ -158,7 +158,7 @@ mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
#################################
ver=0.07rc6
ver=0.07
$root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1

2
util/ver
View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.0.4
minor_ver=1rc1
minor_ver=1rc2
version=$main_ver.$minor_ver
echo $version