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

Merge branch 'master' of github.com:agentzh/ngx_openresty

This commit is contained in:
agentzh (章亦春) 2011-06-10 21:31:40 +08:00
parent 04709aa2e6 70d58760ef
commit 3702d98b4a
6 changed files with 137 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
README
View File

@ -15,6 +15,18 @@ A quick note to Debian and Ubuntu users:
apt-get install libreadline-dev libpcre3-dev libssl-dev perl
If you want to enable LuaJIT, ensure that your system's "ldconfig"
utility is in your PATH environment. You can check out
the path of your "ldconfig" by using the "whereis" command:
whereis ldconfig
On Debian systems, it's usually /sbin, and you just need to add
it to your PATH this way:
PATH=/sbin:$PATH
export PATH
A quick note to Fedora/RedHat users:
You're recommended to install the following packages using yum before
installing this bundle:
@ -34,11 +46,11 @@ 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
http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.5.tar.gz
we will eventually migrate to the openresty.org domain.
2. and then enter the ngx_openresty-0.8.54.3/ directory,
2. and then enter the ngx_openresty-0.8.54.5/ directory,
and type the following command to configure:
./configure
@ -58,6 +70,10 @@ in your PATH environment, and then follow the following steps:
so when it complaints about OpenSSL and you have indeed
already installed it, specify the --with-ld-opt='-L/lib' option.
Errors in running the ./configure script can be found in this file:
build/nginx-0.8.54/objs/autoconf.err
3. build everything locally
make
@ -71,6 +87,13 @@ in your PATH environment, and then follow the following steps:
make install
Then you can start your server this way:
/usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root \
-c /path/to/your/nginx.conf
assuming you're using the default "prefix", i.e., /usr/local/openresty, in Step 2.
For bundle maintainers:
The bundle's source is at the following git repository:
@ -83,31 +106,39 @@ For bundle maintainers:
at the top of the bundle source tree.
The following packages are bundled in the 0.8.54.3 release:
The following packages are bundled in the 0.8.54.5 release:
LuaJIT-2.0.0-beta6
LuaJIT-2.0.0-beta7
array-var-nginx-module-0.02
auth-request-nginx-module-0.2
drizzle-nginx-module-0.0.15rc9
echo-nginx-module-0.36rc2
echo-nginx-module-0.36rc3
encrypted-session-nginx-module-0.01
form-input-nginx-module-0.07rc4
headers-more-nginx-module-0.14
headers-more-nginx-module-0.15rc1
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_lua-0.1.6rc9
ngx_postgres-0.8
rds-json-nginx-module-0.11rc2
redis2-nginx-module-0.06
redis2-nginx-module-0.07rc1
set-misc-nginx-module-0.21
srcache-nginx-module-0.12rc2
srcache-nginx-module-0.12rc4
upstream-keepalive-nginx-module-0.3
xss-nginx-module-0.03rc2
REPORT BUGS
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.
Copyright (c) 2011, Taobao Inc., Alibaba Group (

17
patches/LuaJIT-2.0.0-beta7-symlink_lib.patch Normal file
View File

@ -0,0 +1,17 @@
--- LuaJIT-2.0.0-beta7/Makefile 2011-05-05 22:30:00.000000000 +0800
+++ LuaJIT-2.0.0-beta7-patched/Makefile 2011-05-26 15:32:02.888893148 +0800
@@ -113,13 +113,8 @@
$(RM) $(FILE_PC).tmp
cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+ $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
- @echo ""
- @echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
- @echo "You can do this now by running this command (with sudo):"
- @echo ""
- @echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
- @echo ""
##############################################################################

122
t/sanity.t
View File

@ -194,16 +194,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -254,16 +254,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -314,7 +314,7 @@ 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-beta7
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,16 +323,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -347,12 +347,12 @@ cd ../..
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-beta7 && $(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-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -373,7 +373,7 @@ 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-beta7
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,16 +382,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -406,12 +406,12 @@ cd ../..
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-beta7 && $(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-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -432,7 +432,7 @@ 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-beta7
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,16 +441,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -465,12 +465,12 @@ cd ../..
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-beta7 && $(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-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -484,7 +484,7 @@ clean:
platform: linux (linux)
cp -r bundle/ build/
cd build
cd LuaJIT-2.0.0-beta6
cd LuaJIT-2.0.0-beta7
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'
@ -493,15 +493,15 @@ 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=../echo-nginx-module-0.36rc3 \
--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.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -515,11 +515,11 @@ cd ../..
.PHONY: all install
all:
cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/LuaJIT-2.0.0-beta7 && $(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/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -540,7 +540,7 @@ 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-beta7
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,7 +549,7 @@ 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=../echo-nginx-module-0.36rc3 \
--add-module=../xss-nginx-module-0.03rc2 \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../set-misc-nginx-module-0.21 \
@ -557,7 +557,7 @@ cd nginx-0.8.54
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -572,12 +572,12 @@ cd ../..
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-beta7 && $(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-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -601,7 +601,7 @@ 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=../echo-nginx-module-0.36rc3 \
--add-module=../xss-nginx-module-0.03rc2 \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../set-misc-nginx-module-0.21 \
@ -609,7 +609,7 @@ cd nginx-0.8.54
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -641,7 +641,7 @@ clean:
platform: linux (linux)
cp -r bundle/ build/
cd build
cd LuaJIT-2.0.0-beta6
cd LuaJIT-2.0.0-beta7
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'
@ -650,16 +650,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -673,11 +673,11 @@ cd ../..
.PHONY: all install
all:
cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/LuaJIT-2.0.0-beta7 && $(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/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -691,7 +691,7 @@ clean:
platform: linux (linux)
cp -r bundle/ build/
cd build
cd LuaJIT-2.0.0-beta6
cd LuaJIT-2.0.0-beta7
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'
@ -701,15 +701,15 @@ 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=../echo-nginx-module-0.36rc3 \
--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.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -723,11 +723,11 @@ cd ../..
.PHONY: all install
all:
cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
cd build/LuaJIT-2.0.0-beta7 && $(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/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
@ -757,16 +757,16 @@ cd ..
cd nginx-0.8.54
./configure --prefix=/opt/blah/nginx \
--with-cc-opt='-O2' \
--add-module=../echo-nginx-module-0.36rc2 \
--add-module=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -971,15 +971,15 @@ 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=../echo-nginx-module-0.36rc3 \
--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.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -1026,16 +1026,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \
@ -1085,16 +1085,16 @@ 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=../echo-nginx-module-0.36rc3 \
--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=../drizzle-nginx-module-0.0.15rc9 \
--add-module=../ngx_lua-0.1.6rc4 \
--add-module=../ngx_lua-0.1.6rc10 \
--add-module=../headers-more-nginx-module-0.15rc1 \
--add-module=../srcache-nginx-module-0.12rc2 \
--add-module=../srcache-nginx-module-0.12rc4 \
--add-module=../array-var-nginx-module-0.02 \
--add-module=../memc-nginx-module-0.12rc1 \
--add-module=../redis2-nginx-module-0.07rc1 \

13
util/fix-tests
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 { " $_" } sort @dirs), "\n";
sub cd ($) {
my $dir = shift;

10
util/mirror-tarballs
View File

@ -40,7 +40,7 @@ rm -f *.patch || exit 1
cd .. || exit 1
ver=0.36rc2
ver=0.36rc3
$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
@ -79,7 +79,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.1.6rc4
ver=0.1.6rc10
$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
@ -100,7 +100,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
#################################
ver=0.12rc2
ver=0.12rc4
$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
@ -177,10 +177,12 @@ rm lua-makefile-fix.patch
#################################
ver=2.0.0-beta6
ver=2.0.0-beta7
$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
patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1
#################################
ver=0.8

2
util/ver
View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=0.8.54
minor_ver=4rc2
minor_ver=6rc2
version=$main_ver.$minor_ver
echo $version