fixed auto_complate and upgraded various modules.
This commit is contained in:
agentzh (章亦春)
parent
e9d01174a0
commit
2a2a5f444d
77
t/sanity.t
77
t/sanity.t
|
|
@ -189,16 +189,16 @@ cd ..
|
|||
cd nginx-0.8.54
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--with-cc-opt='-O2' \
|
||||
--add-module=../echo-nginx-module-0.36rc1 \
|
||||
--add-module=../echo-nginx-module-0.36rc2 \
|
||||
--add-module=../xss-nginx-module-0.03rc2 \
|
||||
--add-module=../ngx_devel_kit-0.2.14 \
|
||||
--add-module=../set-misc-nginx-module-0.21rc2 \
|
||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
||||
--add-module=../lua-nginx-module-0.1.6rc1 \
|
||||
--add-module=../ngx_lua-0.1.6rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.14 \
|
||||
--add-module=../srcache-nginx-module-0.12rc1 \
|
||||
--add-module=../srcache-nginx-module-0.12rc2 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../memc-nginx-module-0.12rc1 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
|
@ -247,16 +247,16 @@ cd nginx-0.8.54
|
|||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--with-debug \
|
||||
--with-cc-opt='-O0' \
|
||||
--add-module=../echo-nginx-module-0.36rc1 \
|
||||
--add-module=../echo-nginx-module-0.36rc2 \
|
||||
--add-module=../xss-nginx-module-0.03rc2 \
|
||||
--add-module=../ngx_devel_kit-0.2.14 \
|
||||
--add-module=../set-misc-nginx-module-0.21rc2 \
|
||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
||||
--add-module=../lua-nginx-module-0.1.6rc1 \
|
||||
--add-module=../ngx_lua-0.1.6rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.14 \
|
||||
--add-module=../srcache-nginx-module-0.12rc1 \
|
||||
--add-module=../srcache-nginx-module-0.12rc2 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../memc-nginx-module-0.12rc1 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
|
@ -313,16 +313,16 @@ cd ..
|
|||
cd nginx-0.8.54
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--with-cc-opt='-O2' \
|
||||
--add-module=../echo-nginx-module-0.36rc1 \
|
||||
--add-module=../echo-nginx-module-0.36rc2 \
|
||||
--add-module=../xss-nginx-module-0.03rc2 \
|
||||
--add-module=../ngx_devel_kit-0.2.14 \
|
||||
--add-module=../set-misc-nginx-module-0.21rc2 \
|
||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
||||
--add-module=../lua-nginx-module-0.1.6rc1 \
|
||||
--add-module=../ngx_lua-0.1.6rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.14 \
|
||||
--add-module=../srcache-nginx-module-0.12rc1 \
|
||||
--add-module=../srcache-nginx-module-0.12rc2 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../memc-nginx-module-0.12rc1 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
|
@ -370,16 +370,16 @@ cd ..
|
|||
cd nginx-0.8.54
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--with-cc-opt='-O2 -O3' \
|
||||
--add-module=../echo-nginx-module-0.36rc1 \
|
||||
--add-module=../echo-nginx-module-0.36rc2 \
|
||||
--add-module=../xss-nginx-module-0.03rc2 \
|
||||
--add-module=../ngx_devel_kit-0.2.14 \
|
||||
--add-module=../set-misc-nginx-module-0.21rc2 \
|
||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
||||
--add-module=../lua-nginx-module-0.1.6rc1 \
|
||||
--add-module=../ngx_lua-0.1.6rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.14 \
|
||||
--add-module=../srcache-nginx-module-0.12rc1 \
|
||||
--add-module=../srcache-nginx-module-0.12rc2 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../memc-nginx-module-0.12rc1 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
|
@ -427,16 +427,16 @@ cd ..
|
|||
cd nginx-0.8.54
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--with-cc-opt='-O2' \
|
||||
--add-module=../echo-nginx-module-0.36rc1 \
|
||||
--add-module=../echo-nginx-module-0.36rc2 \
|
||||
--add-module=../xss-nginx-module-0.03rc2 \
|
||||
--add-module=../ngx_devel_kit-0.2.14 \
|
||||
--add-module=../set-misc-nginx-module-0.21rc2 \
|
||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
||||
--add-module=../lua-nginx-module-0.1.6rc1 \
|
||||
--add-module=../ngx_lua-0.1.6rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.14 \
|
||||
--add-module=../srcache-nginx-module-0.12rc1 \
|
||||
--add-module=../srcache-nginx-module-0.12rc2 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../memc-nginx-module-0.12rc1 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
|
@ -461,3 +461,50 @@ install:
|
|||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
||||
|
||||
=== TEST 5: --without-http_drizzle_module
|
||||
--- cmd: ./configure --with-luajit --without-http_drizzle_module --dry-run
|
||||
--- out
|
||||
cp -r bundle/ build/
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta6
|
||||
make PREFIX=/usr/local/openresty/luajit
|
||||
make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0'
|
||||
cd ..
|
||||
cd nginx-0.8.54
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--with-cc-opt='-O2' \
|
||||
--add-module=../echo-nginx-module-0.36rc2 \
|
||||
--add-module=../xss-nginx-module-0.03rc2 \
|
||||
--add-module=../ngx_devel_kit-0.2.14 \
|
||||
--add-module=../set-misc-nginx-module-0.21rc2 \
|
||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.1.6rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.14 \
|
||||
--add-module=../srcache-nginx-module-0.12rc2 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../memc-nginx-module-0.12rc1 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
--add-module=../auth-request-nginx-module-0.2 \
|
||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||
--with-ld-opt='-Wl,-rpath=/usr/local/openresty/luajit/lib' \
|
||||
--with-http_ssl_module
|
||||
cd ../..
|
||||
--- makefile
|
||||
.PHONY: all install
|
||||
|
||||
all:
|
||||
cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
|
||||
cd build/nginx-0.8.54 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ my @modules = (
|
|||
[http_encrypted_session => 'encrypted-session-nginx-module'],
|
||||
[http_drizzle => 'drizzle-nginx-module'],
|
||||
[http_postgres => 'drizzle-nginx-module', 'disabled'],
|
||||
[http_lua => 'lua-nginx-module'],
|
||||
[http_lua => 'ngx_lua'],
|
||||
[http_headers_more => 'headers-more-nginx-module'],
|
||||
[http_srcache => 'srcache-nginx-module'],
|
||||
[http_array_var => 'array-var-nginx-module'],
|
||||
|
|
@ -95,14 +95,14 @@ for my $opt (@ARGV) {
|
|||
push @ngx_ld_opts, $1;
|
||||
|
||||
} elsif ($opt =~ $without_resty_mods_regex) {
|
||||
die "No $1\n";
|
||||
$resty_opts{"no_http_$1"} = 1;
|
||||
#die "no_$1\n";
|
||||
$resty_opts{"no_$1"} = 1;
|
||||
|
||||
} elsif ($opt eq '--without-ngx_devel_kit_module') {
|
||||
$resty_opts{no_ndk} = 1;
|
||||
|
||||
} elsif ($opt =~ $with_resty_mods_regex) {
|
||||
$resty_opts{"http_$1"} = 1;
|
||||
$resty_opts{"$1"} = 1;
|
||||
|
||||
} elsif ($opt eq '--with-luajit') {
|
||||
$resty_opts{luajit} = 1;
|
||||
|
|
@ -173,7 +173,7 @@ sub shell ($@) {
|
|||
|
||||
sub auto_complete ($) {
|
||||
my $name = shift;
|
||||
my @dirs = glob "$name-*" or
|
||||
my @dirs = glob "$name-[0-9]*" or
|
||||
die "No source directory found for $name\n";
|
||||
|
||||
if (@dirs > 1) {
|
||||
|
|
@ -309,7 +309,7 @@ sub build_resty_opts {
|
|||
} elsif ($opts->{lua}) {
|
||||
# build stdandard lua
|
||||
|
||||
my $lua_src = glob('lua-5.*');
|
||||
my $lua_src = auto_complete 'lua';
|
||||
|
||||
if (!defined $lua_src) {
|
||||
die "No lua5 found";
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
|||
ver=0.1.6rc2
|
||||
$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-* lua-nginx-module-$ver || exit 1
|
||||
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue