diff --git a/t/sanity.t b/t/sanity.t index 825e68d..d3cbb90 100644 --- a/t/sanity.t +++ b/t/sanity.t @@ -192,7 +192,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -219,11 +219,13 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -242,7 +244,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --with-debug \ --with-cc-opt='-O0' \ @@ -271,11 +273,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -304,7 +306,7 @@ gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRE 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -332,11 +334,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -355,7 +357,7 @@ gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRE 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O3' \ --add-module=../ngx_devel_kit-0.2.17 \ @@ -384,11 +386,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -407,7 +409,7 @@ gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRE 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -435,11 +437,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -458,7 +460,7 @@ gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRE 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -485,11 +487,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -502,7 +504,7 @@ clean: platform: linux (linux) cp -rp bundle/ build/ cd build -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -527,10 +529,10 @@ Type the following commands to build and install: .PHONY: all install clean all: - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -549,7 +551,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/opt/blah/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -576,11 +578,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/opt/blah/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -769,7 +771,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -796,11 +798,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) solaris - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -819,7 +821,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -847,11 +849,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) solaris - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -870,7 +872,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -898,11 +900,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) solaris - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -933,7 +935,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -963,11 +965,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -986,7 +988,7 @@ gmake install CC=gcc-4.2 INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/ope export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -1013,11 +1015,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) CC=gcc-4.2 solaris - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install CC=gcc-4.2 INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1036,7 +1038,7 @@ gmake install CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENREST 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --with-debug \ --with-cc-opt='-O0' \ @@ -1066,11 +1068,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1089,7 +1091,7 @@ gmake install CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit DESTDIR=$OP 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --with-debug \ --with-cc-opt='-O0' \ @@ -1119,11 +1121,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1154,7 +1156,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -1184,11 +1186,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1207,7 +1209,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../iconv-nginx-module-0.10rc4 \ @@ -1235,11 +1237,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1278,7 +1280,7 @@ gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -1308,11 +1310,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1341,7 +1343,7 @@ make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' cd .. -cd nginx-1.0.4 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -1369,11 +1371,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1393,7 +1395,7 @@ gmake install TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' I 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -1421,11 +1423,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build @@ -1444,7 +1446,7 @@ gmake install TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit DES 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 +cd nginx-1.0.5 ./configure --prefix=/usr/local/openresty/nginx \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../echo-nginx-module-0.37rc1 \ @@ -1472,11 +1474,11 @@ Type the following commands to build and install: all: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install: cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) - cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR) + cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR) clean: rm -rf build diff --git a/util/configure b/util/configure index ef2b4de..9f5c1a9 100755 --- a/util/configure +++ b/util/configure @@ -137,6 +137,9 @@ for my $opt (@ARGV) { } elsif ($opt eq '--without-lua51') { $resty_opts{no_lua} = 1; + } elsif ($opt eq '--without-lua_cjson') { + $resty_opts{no_lua_cjson} = 1; + } elsif ($opt eq '--with-debug') { $resty_opts{debug} = 1; @@ -510,6 +513,53 @@ _END_ . "\$(MAKE) install$extra_opts INSTALL_TOP=\$(DESTDIR)$lua_prefix"; cd '..'; + + } + + if ($opts->{lua} || $opts->{luajit}) { + # build lua modules + + my $lualib_prefix = "$prefix/lualib"; + + my $ngx_lua_dir = auto_complete 'ngx_lua'; + + open my $in, ">>$ngx_lua_dir/config" or + die "Cannot open $ngx_lua_dir/config for appending: $!\n"; + + print $in <<"_EOC_"; + +CFLAGS=\$"\$CFLAGS -DLUA_DEFAULT_PATH='\\"$lualib_prefix/?.lua\\"'" +CFLAGS=\$"\$CFLAGS -DLUA_DEFAULT_CPATH='\\"$lualib_prefix/?.so\\"'" +_EOC_ + + close $in; + + unless ($opts->{no_lua_cjson}) { + my $dir = auto_complete 'lua-cjson'; + + + if (!defined $dir) { + die "No lua-cjson found"; + } + + my $install; + if ($on_solaris) { + $install = "$root_dir/build/install"; + } else { + $install = "install"; + } + + my $lua_inc = $ENV{LUA_INC}; + + my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_INCLUDE_DIR=$lua_inc " . + "LUA_LIB_DIR=$lualib_prefix"; + + push @make_cmds, "cd $root_dir/build/$dir && ". + "\$(MAKE)$extra_opts"; + + push @make_install_cmds, "cd $root_dir/build/$dir && " . + "\$(MAKE) install$extra_opts"; + } } # prepare nginx configure line diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 6d0c09a..4e9433f 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -203,6 +203,12 @@ cd .. ################################# +ver=1.0.2 +$root/util/get-tarball "http://www.kyne.com.au/~mark/software/lua-cjson-$ver.tar.gz" -O "lua-cjson-$ver.tar.gz" || exit 1 +tar -xzf lua-cjson-$ver.tar.gz || exit 1 + +################################# + rm *.tar.gz cd .. diff --git a/util/ver b/util/ver index 1425b9f..ac9fb8b 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.0.5 -minor_ver=0rc1 +minor_ver=0rc2 version=$main_ver.$minor_ver echo $version