Compare commits

...

32 Commits

Author SHA1 Message Date
e101ac777a released ngx_openresty 0.8.54.8; also updated README to point to openresty.org. 2011-07-01 12:25:35 +08:00
147dba8f62 upgraded ngx_echo to 0.36rc6, ngx_lua to 0.1.6rc17, ngx_srcache to 0.12rc6, and ngx_redis2 to 0.07rc4 and also released ngx_openresty 0.8.54.8rc2. 2011-07-01 11:58:26 +08:00
5a7890001b added --with-libdrizzle option to specify the (lib)drizzle installation prefix. now ngx_drizzle is disabled by default. you need to enable it via the --with-http_drizzle_module option. 2011-06-28 18:56:37 +08:00
7fcf5e3e82 we no longer bundle libdrizzle because libdrizzle 1.0 is distributed with the drizzle server and hard to separate. 2011-06-28 18:35:10 +08:00
2055f54dbb released ngx_openresty 0.8.54.7. 2011-06-27 21:22:57 +08:00
cdcfac980e marked ngx_openresty 0.8.54.7rc5. 2011-06-27 21:12:13 +08:00
0597fedf6e we should preserve timestamps when copying bundle/ to build/. 2011-06-27 21:11:08 +08:00
0556e081b8 upgraded ngx_xss to 0.03rc3, ngx_drizzle to 0.0.15rc11, ngx_memc to 0.12rc2, ngx_srcache to 0.12rc5, ngx_redis2 to 0.07rc3; also marked ngx_openresty 0.8.54.7rc4. 2011-06-27 20:47:41 +08:00
69a2effd7b upgraded LuaJIT to 2.0.0beta8, ngx_lua to 0.1.6rc15, and ngx_echo to 0.36rc4; also released ngx_openresty 0.8.54.7rc3. 2011-06-27 20:00:19 +08:00
7244088ed0 upgraded ngx_lua to v0.1.16rc14 and ngx_headers_more to v0.15rc3; also released ngx_openresty 0.8.54.7rc2. 2011-06-16 21:10:52 +08:00
9da7200899 upgraded ngx_headers_more to v0.15rc2 and ngx_lua to v0.1.6rc13. released ngx_openresty 0.8.54.7rc1. 2011-06-15 18:22:19 +08:00
46ec035831 released ngx_openresty 0.8.54.6. 2011-06-15 12:28:18 +08:00
7d6c400d3d upgraded ngx_lua to v0.1.6rc12 and ngx_drizzle to v0.0.15rc10; also released ngx_openresty v0.8.54.6rc5. 2011-06-14 17:12:33 +08:00
7df5c5c851 fixed a test in sanity.t. 2011-06-12 11:01:38 +08:00
8fa9eb77bd upgraded ngx_lua to 0.1.6rc11 and ngx_redis2 to 0.07rc2; also released ngx_openresty 0.8.54.6rc4. 2011-06-12 11:00:24 +08:00
cd77c676c3 version 0.8.54.6rc3. 2011-06-12 10:25:53 +08:00
3702d98b4a Merge branch 'master' of github.com:agentzh/ngx_openresty 2011-06-10 21:31:40 +08:00
04709aa2e6 ensure that ldconfig is in PATH on linux *and* luajit is enabled. 2011-06-10 21:31:20 +08:00
70d58760ef upgraded ngx_lua to 0.1.6rc10; marked ngx_openresty 0.8.54.6rc2. 2011-05-27 17:03:59 +08:00
942411c114 emphasized that you need to add the path of your "ldconfig" utility to your PATH env if you want to enable luajit. 2011-05-26 15:47:21 +08:00
b644d3d531 now we create symlinks to luajit library files. 2011-05-26 15:36:51 +08:00
087ec653a5 documented the autoconf.err file for debugging ./configure issues. 2011-05-26 15:26:27 +08:00
4df2272a77 documented that for certain Debian systems, it is required to specify --with-ld-opt="-ldl" when luajit is enabled. 2011-05-26 15:23:30 +08:00
73f13092eb broke lines that are too long in README. 2011-05-26 14:43:11 +08:00
777da53f2d upgraded ngx_lua to 0.1.6rc9 and ngx_echo to 0.36rc3; released ngx_openresty 0.8.54.5. 2011-05-25 14:37:33 +08:00
f43134c1fd release 0.8.54.4. 2011-05-13 15:56:51 +08:00
400de3c50d upgraded LuaJIT2.0, ngx_lua, ngx_headers_more, and ngx_srcache; also bumped the bundle version to 0.8.54.4rc3. 2011-05-13 15:37:45 +08:00
6271d106b4 added a note for starting the ngx_openresty server. 2011-05-12 18:06:02 +08:00
9415dafc3f upgraded ngx_lua to 0.1.16rc4 and ngx_redis2 to 0.07rc1. 2011-04-07 11:48:49 +08:00
1f051ab43f mentions that make -jN may not work at least for FreeBSD's bsdmake. 2011-04-02 15:21:52 +08:00
86024a6988 upgraded ngx_headers_more to 0.15rc1 and also updated version to 0.8.54.4rc1. 2011-03-29 18:39:19 +08:00
478518fe08 added a quick note to fedora/redhat users. 2011-03-29 17:57:25 +08:00
8 changed files with 279 additions and 505 deletions

83
README
View File

@ -9,57 +9,11 @@ that all these modules are played well together.
The bundled software components are copyrighted by the respective copyright holders.
A quick note to Debian and Ubuntu users:
You're recommended to install the following packages using apt-get before
installing this bundle:
The homepage for this project is http://openresty.org.
apt-get install libreadline-dev libpcre3-dev libssl-dev perl
A quick note to Mac OS X (Darwin) users:
You're recommended to install prerequisites PCRE using some package
management tool, like Homebrew:
brew install pcre
Alternatively you can install PCRE from source all by yourself :)
To build ngx_openresty, you need a working perl (perl 5.6.0 or better)
in your PATH environment, and then follow the following steps:
1. download the latest ngx_openresty tarball can be downloaded from
http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.3.tar.gz
we will eventually migrate to the openresty.org domain.
2. and then enter the ngx_openresty-0.8.54.3/ directory,
and type the following command to configure:
./configure
by default, --prefix=/usr/local/openresty is assumed. You can
specify various options, as in
./configure --prefix=/opt/openresty \
--with-luajit \
--without-http_drizzle_module \
--with-http_iconv_module \
--with-http_postgres_module
try ./configure --help to see more options.
For Solaris, it's common to install libraries like OpenSSL to /lib,
so when it complaints about OpenSSL and you have indeed
already installed it, specify the --with-ld-opt='-L/lib' option.
3. build everything locally
make
4. install ngx_openresty into the target directory that you specified by
the --prefix option in Step 2.
make install
For the users:
Visit http://openresty.org/#Download to download the latest bundle tarball, and
follow the installation instructions in the page http://openresty.org/#Installation.
For bundle maintainers:
@ -73,30 +27,13 @@ For bundle maintainers:
at the top of the bundle source tree.
The following packages are bundled in the 0.8.54.3 release:
REPORT BUGS
LuaJIT-2.0.0-beta6
array-var-nginx-module-0.02
auth-request-nginx-module-0.2
drizzle-nginx-module-0.0.15rc9
echo-nginx-module-0.36rc2
encrypted-session-nginx-module-0.01
form-input-nginx-module-0.07rc4
headers-more-nginx-module-0.14
iconv-nginx-module-0.10rc3
libdrizzle-0.8
lua-5.1.4
memc-nginx-module-0.12rc1
nginx-0.8.54
ngx_devel_kit-0.2.17
ngx_lua-0.1.6rc3
ngx_postgres-0.8
rds-json-nginx-module-0.11rc2
redis2-nginx-module-0.06
set-misc-nginx-module-0.21
srcache-nginx-module-0.12rc2
upstream-keepalive-nginx-module-0.3
xss-nginx-module-0.03rc2
You're very welcome to report issues on GitHub:
https://github.com/agentzh/ngx_openresty/issues
COPYRIGHT & LICENSE
The bundle itself is licensed under the 2-clause BSD license.

View File

@ -0,0 +1,24 @@
diff -ur nginx-0.8.54/auto/cc/gcc nginx-0.8.54-patched/auto/cc/gcc
--- nginx-0.8.54/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800
+++ nginx-0.8.54-patched/auto/cc/gcc 2011-06-27 19:53:13.837741087 +0800
@@ -169,7 +169,7 @@
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"
diff -ur nginx-0.8.54/auto/cc/icc nginx-0.8.54-patched/auto/cc/icc
--- nginx-0.8.54/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800
+++ nginx-0.8.54-patched/auto/cc/icc 2011-06-27 19:53:19.508916811 +0800
@@ -139,7 +139,7 @@
esac
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"

View File

@ -2,7 +2,7 @@
use t::Config;
plan tests => 4 * blocks() - 3;
plan tests => 4 * blocks() - 4;
#no_diff();
@ -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,10 +39,12 @@ __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
--with-luajit enable LuaJIT 2.0
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
Options directly inherited from nginx
@ -176,15 +177,8 @@ Options directly inherited from nginx
--- cmd: ./configure --dry-run
--- out
platform: linux (linux)
cp -r bundle/ build/
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
@ -194,35 +188,31 @@ 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=../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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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/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)
@ -235,15 +225,8 @@ clean:
--- cmd: ./configure --with-debug --dry-run
--- out
platform: linux (linux)
cp -r bundle/ build/
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
@ -254,35 +237,31 @@ cd nginx-0.8.54
./configure --prefix=/usr/local/openresty/nginx \
--with-debug \
--with-cc-opt='-O0' \
--add-module=../echo-nginx-module-0.36rc2 \
--add-module=../xss-nginx-module-0.03rc2 \
--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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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/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)
@ -295,7 +274,7 @@ clean:
--- cmd: ./configure --with-http_ssl_module --without-http_ssl_module
--- exit: 255
--- err
--with-http_ssl_module conflicts with --without-http_ssl_module
--with-http_ssl_module conflicts with --without-http_ssl_module.
--- out
platform: linux (linux)
@ -305,16 +284,9 @@ platform: linux (linux)
--- cmd: ./configure --with-luajit --dry-run
--- out
platform: linux (linux)
cp -r bundle/ build/
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-beta6
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'
@ -323,36 +295,33 @@ 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=../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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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-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-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
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-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit 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:
@ -364,16 +333,9 @@ clean:
--- cmd: ./configure --with-luajit --with-cc-opt="-O3" --dry-run
--- out
platform: linux (linux)
cp -r bundle/ build/
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-beta6
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'
@ -382,36 +344,33 @@ cd ..
cd nginx-0.8.54
./configure --prefix=/usr/local/openresty/nginx \
--with-cc-opt='-O2 -O3' \
--add-module=../echo-nginx-module-0.36rc2 \
--add-module=../xss-nginx-module-0.03rc2 \
--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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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-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-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
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-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit 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:
@ -423,16 +382,9 @@ clean:
--- cmd: ./configure --with-luajit --with-ld-opt="-llua" --dry-run
--- out
platform: linux (linux)
cp -r bundle/ build/
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-beta6
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'
@ -441,36 +393,33 @@ 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=../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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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-ld-opt='-Wl,-rpath,/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-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
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-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit 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:
@ -478,69 +427,13 @@ clean:
=== TEST 8: --without-http_drizzle_module
--- cmd: ./configure --with-luajit --without-http_drizzle_module --dry-run
--- out
platform: linux (linux)
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.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.6rc3 \
--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=../redis2-nginx-module-0.06 \
--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
=== 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 -r bundle/ build/
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-beta6
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'
@ -549,35 +442,32 @@ 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=../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.15rc9 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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-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-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
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-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit 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:
@ -585,49 +475,38 @@ clean:
=== TEST 10: --without-http_lua_module
=== TEST 9: --without-http_lua_module
--- cmd: ./configure --without-http_lua_module --dry-run
--- out
platform: linux (linux)
cp -r bundle/ build/
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.36rc2 \
--add-module=../xss-nginx-module-0.03rc2 \
--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.15rc9 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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:
@ -635,119 +514,12 @@ clean:
=== 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 -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.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.6rc3 \
--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=../redis2-nginx-module-0.06 \
--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
=== TEST 12: --without-http_drizzle_module & --with-http_iconv_module
--- cmd: ./configure --with-luajit --without-http_drizzle_module --with-http_iconv_module --dry-run
--- out
platform: linux (linux)
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=../iconv-nginx-module-0.10rc3 \
--add-module=../echo-nginx-module-0.36rc2 \
--add-module=../xss-nginx-module-0.03rc2 \
--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.6rc3 \
--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=../redis2-nginx-module-0.06 \
--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
=== TEST 13: --prefix
=== TEST 10: --prefix
--- cmd: ./configure --prefix=/opt/blah --dry-run
--- out
platform: linux (linux)
cp -r bundle/ build/
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
@ -757,35 +529,31 @@ cd ..
cd nginx-0.8.54
./configure --prefix=/opt/blah/nginx \
--with-cc-opt='-O2' \
--add-module=../echo-nginx-module-0.36rc2 \
--add-module=../xss-nginx-module-0.03rc2 \
--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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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,/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 +562,7 @@ clean:
=== TEST 14: --help on solaris
=== TEST 11: --help on solaris
--- cmd: ./configure --help --platform=solaris
--- out
--help this message
@ -828,6 +596,7 @@ clean:
--without-lua51 disable the bundled Lua 5.1 interpreter
--with-luajit enable LuaJIT 2.0
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
Options directly inherited from nginx
@ -956,11 +725,11 @@ 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)
cp -r bundle/ build/
cp -rp bundle/ build/
cd build
cd lua-5.1.4
make solaris
@ -971,18 +740,18 @@ 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=../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.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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 \
@ -1004,19 +773,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 -r bundle/ build/
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
@ -1026,35 +788,32 @@ 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=../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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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/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 +822,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 -r bundle/ build/
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
@ -1085,35 +837,94 @@ 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=../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.15rc9 \
--add-module=../ngx_lua-0.1.6rc3 \
--add-module=../headers-more-nginx-module-0.14 \
--add-module=../srcache-nginx-module-0.12rc2 \
--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 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.06 \
--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/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)
clean:
rm -rf build
=== TEST 15: ngx_drizzle not enabled but specify --with-libdrizzle
--- cmd: ./configure --with-libdrizzle=/opt/drizzle --dry-run
--- out
platform: linux (linux)
--- err
The http_drizzle_module is not enabled while --with-libdrizzle is specified.
--- exit: 255
=== TEST 16: ngx_drizzle enabled and --with-libdrizzle is specified
--- cmd: ./configure --with-libdrizzle=/opt/drizzle --with-http_drizzle_module --dry-run
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
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-0.8.54.8rc1/build/lua-root/usr/local/openresty/lua
export LUA_LIB='/home/agentz/git/ngx_openresty/ngx_openresty-0.8.54.8rc1/build/lua-root/usr/local/openresty/lua/lib'
export LUA_INC='/home/agentz/git/ngx_openresty/ngx_openresty-0.8.54.8rc1/build/lua-root/usr/local/openresty/lua/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.15rc13 \
--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,/opt/drizzle/lib' \
--with-http_ssl_module
cd ../..
--- err
--- makefile
.PHONY: all install
all:
cd build/lua-5.1.4 && $(MAKE) linux
cd build/nginx-0.8.54 && $(MAKE)
install:
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)

79
util/configure vendored
View File

@ -5,6 +5,7 @@ use strict;
use warnings;
use File::Spec;
use ExtUtils::MakeMaker ();
sub shell ($@);
sub env ($$);
@ -58,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'],
@ -147,6 +148,9 @@ for my $opt (@ARGV) {
} elsif ($opt eq '--with-luajit') {
$resty_opts{luajit} = 1;
} elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
$resty_opts{libdrizzle} = $1;
} elsif ($opt eq '--with-http_ssl_module') {
$resty_opts{http_ssl} = 1;
push @ngx_opts, $opt;
@ -248,17 +252,8 @@ 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";
die "--with-http_ssl_module conflicts with --without-http_ssl_module.\n";
}
if (! $opts->{no_http_ssl} && ! $opts->{http_ssl}) {
@ -266,6 +261,14 @@ sub build_resty_opts {
push @ngx_opts, '--with-http_ssl_module';
}
if (! $opts->{http_drizzle} && $opts->{libdrizzle}) {
die "The http_drizzle_module is not enabled while --with-libdrizzle is specified.\n";
}
if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
die "you need to have ldconfig in your PATH env when enabling luajit.\n";
}
my $opts_line = '';
if ($opts->{debug}) {
@ -286,41 +289,17 @@ sub build_resty_opts {
die "build/ directory already exists\n";
}
shell "cp -r bundle/ build/";
shell "cp -rp bundle/ build/";
cd 'build';
# 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 (my $drizzle_prefix = $opts->{libdrizzle}) {
my $drizzle_lib = "$drizzle_prefix/lib";
env LIBDRIZZLE_LIB => "$drizzle_prefix/lib";
env LIBDRIZZLE_INC => "$drizzle_prefix/include/libdrizzle-1.0";
push @ngx_rpaths, $drizzle_lib;
}
if ($opts->{luajit}) {
@ -477,6 +456,7 @@ _EOC_
--without-lua51 disable the bundled Lua 5.1 interpreter
--with-luajit enable LuaJIT 2.0
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
Options directly inherited from nginx
@ -628,3 +608,20 @@ sub gen_makefile {
close $out;
}
# check if we can run some command
sub can_run {
my ($cmd) = @_;
#warn "can run: @_\n";
my $_cmd = $cmd;
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
next if $dir eq '';
my $abs = File::Spec->catfile($dir, $_[0]);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
return;
}

View File

@ -42,9 +42,20 @@ for my $t_file (@t_files) {
if (s{\.\./$pat\S+}{../$dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";
warn "+ $_";
} elsif (s{\bbuild/$pat\S+}{build/$dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";
warn "+ $_";
} elsif (s{^cd $pat\S+}{cd $dir}g && $orig ne $_) {
$changed++;
warn "\n- $orig";
warn "+ $_";
}
}
print $out $_;
@ -57,7 +68,7 @@ for my $t_file (@t_files) {
close $in;
}
print join "\n", map { " $_" } sort @dirs;
print join("\n", map { /^LuaJIT/ ? "* ~$_" : "* $_" } sort @dirs), "\n";
sub cd ($) {
my $dir = shift;

View File

@ -1,6 +1,7 @@
#!/bin/bash
root=$(readlink -f -- "$(dirname -- "$0")/..")
#root=$(readlink -f -- "$(dirname -- "$0")/..")
root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
work=$root/work
if [ ! -d $work ]; then

View File

@ -1,6 +1,7 @@
#!/bin/bash
root=$(readlink -f -- "$(dirname -- "$0")/..")
#root=$(readlink -f -- "$(dirname -- "$0")/..")
root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
. util/ver
@ -35,16 +36,18 @@ patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit
patch -p1 < $root/patches/nginx-$main_ver-no_error_pages.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1
rm -f *.patch || exit 1
cd .. || exit 1
ver=0.36rc2
ver=0.36rc6
$root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1
tar -xzf echo-nginx-module-$ver.tar.gz
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver
ver=0.03rc2
ver=0.03rc3
$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
mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
@ -64,21 +67,21 @@ $root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/
tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
ver=0.14
ver=0.15rc3
$root/util/get-tarball "http://github.com/agentzh/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
#################################
ver=0.0.15rc9
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
#################################
ver=0.1.6rc3
ver=0.1.6rc17
$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-* ngx_lua-$ver || exit 1
@ -92,14 +95,14 @@ mv agentzh-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
#################################
ver=0.12rc1
ver=0.12rc2
$root/util/get-tarball "http://github.com/agentzh/memc-nginx-module/tarball/v$ver" -O memc-nginx-module-$ver.tar.gz || exit 1
tar -xzf memc-nginx-module-$ver.tar.gz || exit 1
mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
#################################
ver=0.12rc2
ver=0.12rc6
$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
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@ -149,7 +152,7 @@ mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
#################################
ver=0.06
ver=0.07rc4
$root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
@ -176,21 +179,11 @@ rm lua-makefile-fix.patch
#################################
ver=2.0.0-beta6
ver=2.0.0-beta8
$root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
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
#patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1
#################################

View File

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