upgraded ngx_iconv to 0.10rc3, ngx_form_input to 0.07rc5, ngx_array_var to 0.03rc1, and ngx_set_misc to 0.22rc1; now --with-debug option also affects luajit2.0; disabled target stripping in luajit2.0; released ngx_openresty 1.0.4.1rc5.
This commit is contained in:
parent
8ba0a37a42
commit
0bf8bbe040
168
t/sanity.t
168
t/sanity.t
|
@ -190,13 +190,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -220,7 +220,7 @@ clean:
|
|||
|
||||
|
||||
|
||||
=== TEST 3: --with-debug
|
||||
=== TEST 3: --with-debug (standard lua)
|
||||
--- cmd: ./configure --with-debug --dry-run
|
||||
--- out
|
||||
platform: linux (linux)
|
||||
|
@ -239,13 +239,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -286,8 +286,8 @@ 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
|
||||
make TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
make install TARGET_STRIP= 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 ..
|
||||
|
@ -296,13 +296,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -315,11 +315,11 @@ cd ../..
|
|||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
cd build/nginx-1.0.4 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
@ -334,8 +334,8 @@ 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
|
||||
make TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
make install TARGET_STRIP= 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 ..
|
||||
|
@ -345,13 +345,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -364,11 +364,11 @@ cd ../..
|
|||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
cd build/nginx-1.0.4 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
@ -383,8 +383,8 @@ 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
|
||||
make TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
make install TARGET_STRIP= 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 ..
|
||||
|
@ -393,13 +393,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -412,11 +412,11 @@ cd ../..
|
|||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
cd build/nginx-1.0.4 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
@ -431,8 +431,8 @@ 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
|
||||
make TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
make install TARGET_STRIP= 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 ..
|
||||
|
@ -441,12 +441,12 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -459,11 +459,11 @@ cd ../..
|
|||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) PREFIX=/usr/local/openresty/luajit
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP= PREFIX=/usr/local/openresty/luajit
|
||||
cd build/nginx-1.0.4 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
@ -482,12 +482,12 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -526,13 +526,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -736,13 +736,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -783,14 +783,14 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.1.1rc2 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -831,14 +831,14 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.1.1rc2 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -882,23 +882,23 @@ export LIBDRIZZLE_LIB='/opt/drizzle/lib'
|
|||
export LIBDRIZZLE_INC='/opt/drizzle/include/libdrizzle-1.0'
|
||||
cd lua-5.1.4
|
||||
make linux
|
||||
make install INSTALL_TOP=/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1rc2/build/lua-root/usr/local/openresty/lua
|
||||
export LUA_LIB='/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1rc2/build/lua-root/usr/local/openresty/lua/lib'
|
||||
export LUA_INC='/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1rc2/build/lua-root/usr/local/openresty/lua/include'
|
||||
make install INSTALL_TOP=/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1rc5/build/lua-root/usr/local/openresty/lua
|
||||
export LUA_LIB='/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1rc5/build/lua-root/usr/local/openresty/lua/lib'
|
||||
export LUA_INC='/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1rc5/build/lua-root/usr/local/openresty/lua/include'
|
||||
cd ..
|
||||
cd nginx-1.0.4
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.1.1rc2 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -941,13 +941,13 @@ cd nginx-1.0.4
|
|||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--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=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.02 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
|
@ -969,3 +969,53 @@ install:
|
|||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
||||
|
||||
=== TEST 18: --with-debug & luajit
|
||||
--- cmd: ./configure --with-luajit --with-debug --dry-run
|
||||
--- out
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build/
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
make TARGET_STRIP= CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
|
||||
make install TARGET_STRIP= CCDEBUG=-g Q= 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-1.0.4
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--with-debug \
|
||||
--with-cc-opt='-O0' \
|
||||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--add-module=../xss-nginx-module-0.03rc3 \
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc1 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc2 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
--add-module=../auth-request-nginx-module-0.2 \
|
||||
--add-module=../rds-json-nginx-module-0.12rc1 \
|
||||
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
|
||||
--with-http_ssl_module
|
||||
cd ../..
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP= CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
|
||||
cd build/nginx-1.0.4 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP= CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
|
|
@ -324,10 +324,14 @@ sub build_resty_opts {
|
|||
|
||||
cd $luajit_src;
|
||||
|
||||
my $extra_opts = '';
|
||||
my $extra_opts = ' TARGET_STRIP=';
|
||||
|
||||
if (defined $cc) {
|
||||
$extra_opts .= " CC=$cc";
|
||||
$extra_opts .= " HOST_CC=$cc";
|
||||
}
|
||||
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .= ' CCDEBUG=-g Q=';
|
||||
}
|
||||
|
||||
shell "make$extra_opts PREFIX=$luajit_prefix", $dry_run;
|
||||
|
|
|
@ -63,7 +63,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
|
||||
mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
|
||||
|
||||
ver=0.21
|
||||
ver=0.22rc1
|
||||
$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
|
||||
mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
|
||||
|
@ -94,7 +94,7 @@ mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
|||
|
||||
#################################
|
||||
|
||||
ver=0.02
|
||||
ver=0.03rc1
|
||||
$root/util/get-tarball "http://github.com/agentzh/array-var-nginx-module/tarball/v$ver" -O array-var-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf array-var-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
|
||||
|
@ -115,14 +115,14 @@ mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
|
|||
|
||||
#################################
|
||||
|
||||
ver=0.07rc4
|
||||
ver=0.07rc5
|
||||
$root/util/get-tarball "http://github.com/calio/form-input-nginx-module/tarball/v$ver" -O form-input-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf form-input-nginx-module-$ver.tar.gz || exit 1
|
||||
mv calio-form-input-nginx-module-* form-input-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.10rc3
|
||||
ver=0.10rc4
|
||||
$root/util/get-tarball "http://github.com/calio/iconv-nginx-module/tarball/v$ver" -O iconv-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf iconv-nginx-module-$ver.tar.gz || exit 1
|
||||
mv calio-iconv-nginx-module-* iconv-nginx-module-$ver || exit 1
|
||||
|
|
Loading…
Reference in New Issue