mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
9 Commits
v1.0.10.29
...
v1.0.10.33
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d1405ceaa | |||
| af701e5b64 | |||
| 5fb3e869e5 | |||
| 35afee967e | |||
| 1a91ab941c | |||
| 2b7c8182d9 | |||
| 6081a9b032 | |||
| 5fd1a15da2 | |||
| 0e98bb399f |
@ -2,6 +2,7 @@ package t::Config;
|
||||
|
||||
use Test::Base -Base;
|
||||
use IPC::Run3 qw( run3 );
|
||||
use Cwd qw( cwd );
|
||||
|
||||
our @EXPORT = qw(
|
||||
run_tests
|
||||
@ -13,6 +14,7 @@ sub shell (@);
|
||||
sub cd ($);
|
||||
|
||||
our $BuildRoot;
|
||||
our $DistRoot;
|
||||
our @SavedTests;
|
||||
our $RootDir = `pwd`;
|
||||
chomp $RootDir;
|
||||
@ -23,6 +25,7 @@ sub run_tests {
|
||||
|
||||
cd "ngx_openresty-$ver";
|
||||
|
||||
$DistRoot = cwd();
|
||||
$BuildRoot = File::Spec->rel2abs("./build");
|
||||
|
||||
for my $block (blocks()) {
|
||||
@ -52,6 +55,7 @@ sub run_test ($) {
|
||||
$expected_err = '';
|
||||
} else {
|
||||
$expected_err =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
|
||||
$expected_err =~ s/\$OPENRESTY_DIR\b/$DistRoot/gs;
|
||||
}
|
||||
|
||||
my $expected_out = $block->out;
|
||||
@ -64,6 +68,7 @@ sub run_test ($) {
|
||||
#die $BuildRoot;
|
||||
|
||||
$stdout =~ s/\Q$BuildRoot\E/\$OPENRESTY_BUILD_DIR/g;
|
||||
$stdout =~ s/\Q$DistRoot\E/\$OPENRESTY_DIR/g;
|
||||
|
||||
is($stdout, $expected_out, "$name - stdout ok");
|
||||
is($stderr, $expected_err, "$name - stderr ok");
|
||||
|
||||
304
t/sanity.t
304
t/sanity.t
@ -2,7 +2,7 @@
|
||||
|
||||
use t::Config;
|
||||
|
||||
plan tests => 151;
|
||||
plan tests => 155;
|
||||
|
||||
#no_diff();
|
||||
|
||||
@ -190,7 +190,6 @@ Options directly inherited from nginx
|
||||
|
||||
|
||||
|
||||
|
||||
=== TEST 2: default
|
||||
--- cmd: ./configure --dry-run
|
||||
--- out
|
||||
@ -208,11 +207,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -268,11 +267,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -326,7 +325,7 @@ platform: linux (linux)
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -337,11 +336,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -361,14 +360,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
@ -385,7 +384,7 @@ clean:
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -397,11 +396,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -421,14 +420,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
@ -445,7 +444,7 @@ clean:
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -456,11 +455,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -480,14 +479,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
@ -504,7 +503,7 @@ clean:
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -515,10 +514,10 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -538,14 +537,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
@ -567,10 +566,10 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -616,11 +615,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -837,7 +836,6 @@ Options directly inherited from nginx
|
||||
|
||||
|
||||
|
||||
|
||||
=== TEST 12: default on solaris
|
||||
--- cmd: ./configure --dry-run --platform=solaris
|
||||
--- out
|
||||
@ -855,11 +853,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -913,12 +911,12 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.1.2rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -972,12 +970,12 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.1.2rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1044,12 +1042,12 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../drizzle-nginx-module-0.1.2rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1104,11 +1102,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1151,7 +1149,7 @@ clean:
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
|
||||
gmake install CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -1164,11 +1162,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1188,14 +1186,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall -pedantic" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall -pedantic" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
@ -1212,7 +1210,7 @@ clean:
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit
|
||||
gmake install CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -1225,11 +1223,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1249,14 +1247,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
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/LuaJIT-2.0.0-beta9 && $(MAKE) CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall -pedantic" CC=cl
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=cl
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=cl
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall -pedantic" CC=cl
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=cl
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=cl
|
||||
@ -1297,12 +1295,12 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_postgres-0.9rc2 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1358,11 +1356,11 @@ cd nginx-1.0.10
|
||||
--add-module=../iconv-nginx-module-0.10rc5 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1438,12 +1436,12 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_postgres-0.9rc2 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1509,11 +1507,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1556,7 +1554,7 @@ clean:
|
||||
platform: solaris (solaris)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit
|
||||
gmake 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=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -1567,11 +1565,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1591,14 +1589,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
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/LuaJIT-2.0.0-beta9 && $(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/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -DMISSING_ISINF" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(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/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -DMISSING_ISINF" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
@ -1615,7 +1613,7 @@ clean:
|
||||
platform: freebsd (freebsd)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit
|
||||
gmake install TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -1626,11 +1624,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1650,14 +1648,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
@ -1685,11 +1683,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1732,7 +1730,7 @@ clean:
|
||||
platform: macosx (darwin)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -1743,11 +1741,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1767,14 +1765,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
@ -1804,11 +1802,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1862,11 +1860,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1918,11 +1916,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -1972,11 +1970,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -2024,11 +2022,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -2088,11 +2086,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -2145,11 +2143,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -2192,7 +2190,7 @@ clean:
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd LuaJIT-2.0.0-beta8
|
||||
cd LuaJIT-2.0.0-beta9
|
||||
gmake -j5 TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
|
||||
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
|
||||
@ -2203,11 +2201,11 @@ cd nginx-1.0.10
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc38 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc4 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
@ -2227,14 +2225,14 @@ Type the following commands to build and install:
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta9 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(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/LuaJIT-2.0.0-beta9 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
@ -2243,3 +2241,61 @@ install:
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
||||
|
||||
=== TEST 41: --add-module
|
||||
--- cmd: ./configure --add-module=/path/to/some/module --add-module=../some/module/ --dry-run
|
||||
--- out
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd lua-5.1.4
|
||||
gmake linux
|
||||
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.10
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc7 \
|
||||
--add-module=../xss-nginx-module-0.03rc8 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc4 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.3.1rc42 \
|
||||
--add-module=../headers-more-nginx-module-0.16rc6 \
|
||||
--add-module=../srcache-nginx-module-0.13rc3 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc2 \
|
||||
--add-module=../redis2-nginx-module-0.08rc2 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
--add-module=../auth-request-nginx-module-0.2 \
|
||||
--add-module=../rds-json-nginx-module-0.12rc7 \
|
||||
--add-module=../rds-csv-nginx-module-0.04 \
|
||||
--add-module=/path/to/some/module --add-module=$OPENRESTY_DIR/../some/module --with-http_ssl_module
|
||||
cd ../..
|
||||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.10 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
||||
5
util/configure
vendored
5
util/configure
vendored
@ -212,6 +212,11 @@ for my $opt (@ARGV) {
|
||||
} elsif ($opt eq '--without-http_ssl_module') {
|
||||
$resty_opts{no_http_ssl} = 1;
|
||||
|
||||
} elsif ($opt =~ /^--add-module=(.*)/) {
|
||||
|
||||
my $mod_path = File::Spec->rel2abs($1);
|
||||
push @ngx_opts, "--add-module=$mod_path";
|
||||
|
||||
} elsif ($opt =~ /^--\w.*/) {
|
||||
push @ngx_opts, $opt;
|
||||
|
||||
|
||||
@ -54,6 +54,8 @@ patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || e
|
||||
|
||||
patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
|
||||
|
||||
#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1
|
||||
|
||||
rm -f *.patch || exit 1
|
||||
|
||||
cd .. || exit 1
|
||||
@ -93,7 +95,7 @@ $root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v
|
||||
tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
|
||||
|
||||
ver=0.16rc5
|
||||
ver=0.16rc6
|
||||
$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
|
||||
@ -107,7 +109,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.3.1rc41
|
||||
ver=0.3.1rc42
|
||||
$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
|
||||
@ -205,14 +207,14 @@ rm lua-makefile-fix.patch || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=2.0.0-beta8
|
||||
ver=2.0.0-beta9
|
||||
$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
|
||||
|
||||
cd LuaJIT-$ver || exit 1;
|
||||
$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch
|
||||
patch -p1 < beta8_hotfix1.patch || exit 1
|
||||
rm beta8_hotfix1.patch || exit 1
|
||||
#$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch
|
||||
#patch -p1 < beta8_hotfix1.patch || exit 1
|
||||
#rm beta8_hotfix1.patch || exit 1
|
||||
cp $root/misc/unwind-generic.h ./unwind.h || exit 1
|
||||
cd ..
|
||||
|
||||
|
||||
Reference in New Issue
Block a user