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

Merge branch 'master' of github.com:agentzh/ngx_openresty

Browse Source
This commit is contained in:
agentzh (章亦春)
2011-06-10 21:31:40 +08:00
parent 04709aa2e6 70d58760ef
commit 3702d98b4a
6 changed files with 137 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
util/fix-tests
View File

@ -42,9 +42,20 @@ for my $t_file (@t_files) {
if (s{\.\./$pat\S+}{../$dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";
warn "+ $_";
} elsif (s{\bbuild/$pat\S+}{build/$dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";
warn "+ $_";
} elsif (s{^cd $pat\S+}{cd $dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";
warn "+ $_";
}
}
print $out $_;
@ -57,7 +68,7 @@ for my $t_file (@t_files) {
close $in;
}
print join "\n", map { " $_" } sort @dirs;
print join("\n", map { " $_" } sort @dirs), "\n";
sub cd ($) {
my $dir = shift;

10
util/mirror-tarballs
View File

@ -40,7 +40,7 @@ rm -f *.patch || exit 1
cd .. || exit 1
ver=0.36rc2
ver=0.36rc3
$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
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver
@ -79,7 +79,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.1.6rc4
ver=0.1.6rc10
$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
@ -100,7 +100,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
#################################
ver=0.12rc2
ver=0.12rc4
$root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@ -177,10 +177,12 @@ rm lua-makefile-fix.patch
#################################
ver=2.0.0-beta6
ver=2.0.0-beta7
$root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
tar -xzf LuaJIT-$ver.tar.gz || exit 1
patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1
#################################
ver=0.8

2
util/ver
View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=0.8.54
minor_ver=4rc2
minor_ver=6rc2
version=$main_ver.$minor_ver
echo $version