Compare commits

...

8 Commits

5 changed files with 319 additions and 318 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
bin/openresty.fcgi bin/openresty.fcgi
demo/Admin/.rsync demo/Admin/.rsync
*~ *~
*.swo
*.json *.json
*.o *.o
*.hi *.hi

File diff suppressed because it is too large Load Diff

8
util/configure vendored
View File

@ -401,14 +401,14 @@ _END_
} }
if (-d 'build') { if (-d 'build') {
system("rm -rf build"); system("rm -rf build") == 0 or
die "failed to remove directory build/.\n";
} }
if (-f 'build') { if (-f 'build') {
die "build/ directory already exists\n"; die "file \"build\" already exists. please remove it first.\n";
} }
shell "cp -rp bundle/ build";
shell "cp -rp bundle/ build/";
cd 'build'; cd 'build';

View File

@ -68,7 +68,7 @@ $root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ve
tar -xzf 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 mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
ver=0.03rc7 ver=0.03rc8
$root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1 $root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
tar -xzf xss-nginx-module-$ver.tar.gz || exit 1 tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1 mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
@ -78,7 +78,7 @@ $root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O
tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1 tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1 mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
ver=0.22rc3 ver=0.22rc4
$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 $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 tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1 mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
@ -107,7 +107,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
################################# #################################
ver=0.3.1rc38 ver=0.3.1rc40
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1 $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 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1 mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
@ -128,7 +128,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
################################# #################################
ver=0.13rc2 ver=0.13rc3
$root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1 $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 tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1 mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@ -219,7 +219,7 @@ cd ..
################################# #################################
ver=1.0.3 ver=1.0.3
$root/util/get-tarball "http://www.kyne.com.au/~mark/software/lua-cjson-$ver.tar.gz" -O "lua-cjson-$ver.tar.gz" || exit 1 $root/util/get-tarball "http://www.kyne.com.au/~mark/software/old/lua-cjson-$ver.tar.gz" -O "lua-cjson-$ver.tar.gz" || exit 1
tar -xzf lua-cjson-$ver.tar.gz || exit 1 tar -xzf lua-cjson-$ver.tar.gz || exit 1
cd lua-cjson-$ver || exit 1 cd lua-cjson-$ver || exit 1
#patch -p1 < $root/patches/lua_cjson-$ver-array_detection_fix.patch || exit 1 #patch -p1 < $root/patches/lua_cjson-$ver-array_detection_fix.patch || exit 1

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
main_ver=1.0.10 main_ver=1.0.10
minor_ver=23 minor_ver=27
version=$main_ver.$minor_ver version=$main_ver.$minor_ver
echo $version echo $version