flyskype
/
openresty
mirror of https://github.com/openresty/openresty
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

we no longer bundle libdrizzle because libdrizzle 1.0 is distributed with the drizzle server and hard to separate.

Browse Source
pull/4/head
agentzh (章亦春) 14 years ago
parent 2055f54dbb
commit 7fcf5e3e82
4 changed files with 17 additions and 322 deletions
Show Stats Download Patch File Download Diff File

281
t/sanity.t
Unescape Escape View File

@ -25,7 +25,6 @@ __DATA__
--without-http_form_input_module disable ngx_http_form_input_module
--without-http_encrypted_session_module
disable ngx_http_encrypted_session_module
--without-http_drizzle_module disable ngx_http_drizzle_module
--without-http_lua_module disable ngx_http_lua_module
--without-http_headers_more_module disable ngx_http_headers_more_module
--without-http_srcache_module disable ngx_http_srcache_module
@ -40,6 +39,7 @@ __DATA__
--without-http_ssl_module disable ngx_http_ssl_module
--with-http_iconv_module enable ngx_http_iconv_module
--with-http_drizzle_module enable ngx_http_drizzle_module
--with-http_postgres_module enable ngx_http_postgres_module
--without-lua51 disable the bundled Lua 5.1 interpreter
@ -178,13 +178,6 @@ Options directly inherited from nginx
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd lua-5.1.4
make linux
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
@ -200,7 +193,6 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
@ -210,19 +202,16 @@ cd nginx-0.8.54
--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/libdrizzle/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/lua-5.1.4 && $(MAKE) linux
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
@ -237,13 +226,6 @@ clean:
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd lua-5.1.4
make linux
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
@ -260,7 +242,6 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
@ -270,19 +251,16 @@ cd nginx-0.8.54
--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/libdrizzle/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/lua-5.1.4 && $(MAKE) linux
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
@ -307,13 +285,6 @@ platform: linux (linux)
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd LuaJIT-2.0.0-beta8
make PREFIX=/usr/local/openresty/luajit
make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
@ -329,7 +300,6 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
@ -339,19 +309,17 @@ cd nginx-0.8.54
--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/libdrizzle/lib:/usr/local/openresty/luajit/lib' \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
@ -366,13 +334,6 @@ clean:
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd LuaJIT-2.0.0-beta8
make PREFIX=/usr/local/openresty/luajit
make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
@ -388,7 +349,6 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
@ -398,19 +358,17 @@ cd nginx-0.8.54
--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/libdrizzle/lib:/usr/local/openresty/luajit/lib' \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
@ -425,65 +383,6 @@ clean:
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd LuaJIT-2.0.0-beta8
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.36rc4 \
--add-module=../xss-nginx-module-0.03rc3 \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc2 \
--add-module=../redis2-nginx-module-0.07rc3 \
--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/libdrizzle/lib:/usr/local/openresty/luajit/lib -llua' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
rm -rf build
=== TEST 8: --without-http_drizzle_module
--- cmd: ./configure --with-luajit --without-http_drizzle_module --dry-run
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd LuaJIT-2.0.0-beta8
make PREFIX=/usr/local/openresty/luajit
make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
@ -508,7 +407,7 @@ cd nginx-0.8.54
--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-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib -llua' \
--with-http_ssl_module
cd ../..
--- makefile
@ -527,19 +426,12 @@ clean:
=== TEST 9: --with-luajit & --without-http_lua_module
=== TEST 8: --with-luajit & --without-http_lua_module
--- cmd: ./configure --with-luajit --without-http_lua_module --dry-run
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd LuaJIT-2.0.0-beta8
make PREFIX=/usr/local/openresty/luajit
make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
@ -555,109 +447,6 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc2 \
--add-module=../redis2-nginx-module-0.07rc3 \
--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/libdrizzle/lib:/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
rm -rf build
=== TEST 10: --without-http_lua_module
--- cmd: ./configure --without-http_lua_module --dry-run
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd nginx-0.8.54
./configure --prefix=/usr/local/openresty/nginx \
--with-cc-opt='-O2' \
--add-module=../echo-nginx-module-0.36rc4 \
--add-module=../xss-nginx-module-0.03rc3 \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc2 \
--add-module=../redis2-nginx-module-0.07rc3 \
--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/libdrizzle/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
rm -rf build
=== TEST 11: --without-http_drizzle_module & --with-http_postgres_module
--- cmd: ./configure --with-luajit --without-http_drizzle_module --with-http_postgres_module --dry-run
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd LuaJIT-2.0.0-beta8
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.36rc4 \
--add-module=../xss-nginx-module-0.03rc3 \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_postgres-0.8 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
--add-module=../array-var-nginx-module-0.02 \
@ -685,29 +474,21 @@ clean:
=== TEST 12: --without-http_drizzle_module & --with-http_iconv_module
--- cmd: ./configure --with-luajit --without-http_drizzle_module --with-http_iconv_module --dry-run
=== TEST 9: --without-http_lua_module
--- cmd: ./configure --without-http_lua_module --dry-run
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd LuaJIT-2.0.0-beta8
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=../iconv-nginx-module-0.10rc3 \
--add-module=../echo-nginx-module-0.36rc4 \
--add-module=../xss-nginx-module-0.03rc3 \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
--add-module=../array-var-nginx-module-0.02 \
@ -716,18 +497,15 @@ cd nginx-0.8.54
--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-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -735,19 +513,12 @@ clean:
=== TEST 13: --prefix
=== TEST 10: --prefix
--- cmd: ./configure --prefix=/opt/blah --dry-run
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/opt/blah/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/opt/blah/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/opt/blah/libdrizzle/include'
cd ..
cd lua-5.1.4
make linux
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua
@ -763,7 +534,6 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
@ -773,19 +543,16 @@ cd nginx-0.8.54
--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,/opt/blah/libdrizzle/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/lua-5.1.4 && $(MAKE) linux
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/opt/blah/lua
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
@ -794,7 +561,7 @@ clean:
=== TEST 14: --help on solaris
=== TEST 11: --help on solaris
--- cmd: ./configure --help --platform=solaris
--- out
--help this message
@ -956,7 +723,7 @@ Options directly inherited from nginx
=== TEST 15: default on solaris
=== TEST 12: default on solaris
--- cmd: ./configure --dry-run --platform=solaris
--- out
platform: solaris (solaris)
@ -1004,19 +771,12 @@ clean:
=== TEST 16: --with-http_drizzle_module on solaris
=== TEST 13: --with-http_drizzle_module on solaris
--- cmd: ./configure --with-http_drizzle_module --dry-run --platform=solaris
--- out
platform: solaris (solaris)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd lua-5.1.4
make solaris
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
@ -1032,7 +792,7 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../drizzle-nginx-module-0.0.15rc13 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
@ -1042,19 +802,16 @@ cd nginx-0.8.54
--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/libdrizzle/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/lua-5.1.4 && $(MAKE) solaris
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
@ -1063,19 +820,12 @@ clean:
=== TEST 17: --with-http_drizzle_module on Solaris
=== TEST 14: --with-http_drizzle_module on Solaris
--- cmd: ./configure --with-http_drizzle_module --dry-run --platform=solaris
--- out
platform: solaris (solaris)
cp -rp bundle/ build/
cd build
cd libdrizzle-0.8
./configure --prefix=/usr/local/openresty/libdrizzle
make
make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd ..
cd lua-5.1.4
make solaris
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
@ -1091,7 +841,7 @@ cd nginx-0.8.54
--add-module=../set-misc-nginx-module-0.21 \
--add-module=../form-input-nginx-module-0.07rc4 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc11 \
--add-module=../drizzle-nginx-module-0.0.15rc13 \
--add-module=../ngx_lua-0.1.6rc15 \
--add-module=../headers-more-nginx-module-0.15rc3 \
--add-module=../srcache-nginx-module-0.12rc5 \
@ -1101,19 +851,16 @@ cd nginx-0.8.54
--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/libdrizzle/lib' \
--with-http_ssl_module
cd ../..
--- makefile
.PHONY: all install
all:
cd build/libdrizzle-0.8 && $(MAKE)
cd build/lua-5.1.4 && $(MAKE) solaris
cd build/nginx-0.8.54 && $(MAKE)
install:
cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)

42
util/configure vendored
Unescape Escape View File

@ -59,7 +59,7 @@ my @modules = (
[http_set_misc => 'set-misc-nginx-module'],
[http_form_input => 'form-input-nginx-module'],
[http_encrypted_session => 'encrypted-session-nginx-module'],
[http_drizzle => 'drizzle-nginx-module', $on_solaris ? 'disabled' : () ],
[http_drizzle => 'drizzle-nginx-module', 'disabled'],
[http_postgres => 'ngx_postgres', 'disabled'],
[http_lua => 'ngx_lua'],
[http_headers_more => 'headers-more-nginx-module'],
@ -249,15 +249,6 @@ sub build_resty_opts {
$opts->{lua} = 1;
}
if ($on_solaris) {
if ($opts->{http_drizzle}) {
$opts->{libdrizzle} = 1;
}
} elsif (! $opts->{no_http_drizzle}) {
$opts->{libdrizzle} = 1;
}
if ($opts->{no_http_ssl} && $opts->{http_ssl}) {
die "--with-http_ssl_module conflicts with --without-http_ssl_module.\n";
}
@ -297,37 +288,6 @@ sub build_resty_opts {
# build 3rd-party C libraries if required
if ($opts->{libdrizzle}) {
my $libdrizzle_src = auto_complete 'libdrizzle';
my $libdrizzle_prefix = "$prefix/libdrizzle";
my $libdrizzle_root = File::Spec->rel2abs("libdrizzle-root");
if (-d $libdrizzle_root) {
shell "rm -rf $libdrizzle_root";
}
mkdir $libdrizzle_root or
die "create create directory libdrizzle-root: $!\n";
cd $libdrizzle_src;
shell "./configure --prefix=$libdrizzle_prefix", $dry_run;
shell "make", $dry_run;
shell "make install DESTDIR=$libdrizzle_root", $dry_run;
push @make_cmds, "cd build/$libdrizzle_src && \$(MAKE)";
push @make_install_cmds, "cd build/$libdrizzle_src && "
. "\$(MAKE) install DESTDIR=\$(DESTDIR)";
env LIBDRIZZLE_LIB => "$libdrizzle_root$libdrizzle_prefix/lib";
env LIBDRIZZLE_INC => "$libdrizzle_root$libdrizzle_prefix/include";
push @ngx_rpaths, "$libdrizzle_prefix/lib";
cd '..';
}
if ($opts->{luajit}) {
my $luajit_src = auto_complete 'LuaJIT';
my $luajit_prefix = "$prefix/luajit";

14
util/mirror-tarballs
Unescape Escape View File

@ -74,7 +74,7 @@ mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
#################################
ver=0.0.15rc11
ver=0.0.15rc13
$root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1
tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1
mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
@ -187,18 +187,6 @@ tar -xzf LuaJIT-$ver.tar.gz || exit 1
#################################
ver=0.8
$root/util/get-tarball "http://launchpad.net/libdrizzle/trunk/0.8/+download/libdrizzle-0.8.tar.gz" -O "libdrizzle-$ver.tar.gz" || exit 1
tar -xzf libdrizzle-$ver.tar.gz || exit 1
$root/util/get-tarball "http://agentzh.org/misc/nginx/libdrizzle-0.8-parsebug_and_mac_fixes.patch" -O "parsebug_and_mac_fixes.patch" || exit 1
patch -p0 < parsebug_and_mac_fixes.patch
rm parsebug_and_mac_fixes.patch || exit 1
#################################
rm *.tar.gz
cd ..

2
util/ver
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save