now we bundle the lua-redis-parser library with us and it is enabled by default. tested on Linux i386, Linux x86_64, Mac OS X, FreeBSD 8.2 i386, and Solaris 11; added the new option --without-lua_redis_parser to the ./configure script; made the test scaffold emit .t_ file with actual outputs as the expected outputs; released ngx_openresty 1.0.5.0rc3.
This commit is contained in:
agentzh (章亦春)
parent
a3dfc21c1a
commit
030ffab7d2
113
t/Config.pm
113
t/Config.pm
|
|
@ -13,6 +13,9 @@ sub shell (@);
|
|||
sub cd ($);
|
||||
|
||||
our $BuildRoot;
|
||||
our @SavedTests;
|
||||
our $RootDir = `pwd`;
|
||||
chomp $RootDir;
|
||||
|
||||
sub run_tests {
|
||||
my $ver = `bash util/ver`;
|
||||
|
|
@ -29,6 +32,7 @@ sub run_tests {
|
|||
|
||||
sub run_test ($) {
|
||||
my $block = shift;
|
||||
|
||||
my $name = $block->name;
|
||||
my $cmd = $block->cmd or
|
||||
die "No --- cmd defined for $name\n";
|
||||
|
|
@ -54,24 +58,125 @@ sub run_test ($) {
|
|||
if (!defined $expected_out) {
|
||||
$expected_out = '';
|
||||
} else {
|
||||
$expected_out =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
|
||||
#$expected_out =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
|
||||
}
|
||||
|
||||
#die $BuildRoot;
|
||||
|
||||
$stdout =~ s/\Q$BuildRoot\E/\$OPENRESTY_BUILD_DIR/g;
|
||||
|
||||
is($stdout, $expected_out, "$name - stdout ok");
|
||||
is($stderr, $expected_err, "$name - stderr ok");
|
||||
is($retval >> 8, $expected_exit, "$name - exit code ok");
|
||||
|
||||
my $makefile;
|
||||
|
||||
if (defined $block->makefile) {
|
||||
open my $in, "Makefile" or
|
||||
die "cannot open Makefile for reading: $!";
|
||||
my $got = do { local $/; <$in> };
|
||||
$makefile = do { local $/; <$in> };
|
||||
close $in;
|
||||
|
||||
my $expected_makefile = $block->makefile;
|
||||
$expected_makefile =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
|
||||
#$expected_makefile =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
|
||||
|
||||
is($got, $expected_makefile, "$name - Makefile ok");
|
||||
$makefile =~ s/\Q$BuildRoot\E/\$OPENRESTY_BUILD_DIR/g;
|
||||
|
||||
is($makefile, $expected_makefile, "$name - Makefile ok");
|
||||
}
|
||||
|
||||
push @SavedTests, {
|
||||
cmd => $cmd,
|
||||
name => $name,
|
||||
exit => $retval >> 8,
|
||||
err => $stderr,
|
||||
out => $stdout,
|
||||
makefile => $makefile,
|
||||
};
|
||||
}
|
||||
|
||||
END {
|
||||
if ($0 =~ /_$/) {
|
||||
return;
|
||||
}
|
||||
|
||||
chdir "$RootDir";
|
||||
#warn `pwd`;
|
||||
|
||||
my $outfile = $0 . '_';
|
||||
if (-f $outfile) {
|
||||
unlink $outfile;
|
||||
}
|
||||
|
||||
open my $in, $0 or
|
||||
die "cannot open $0 for reading: $!\n";
|
||||
|
||||
while (<$in>) {
|
||||
if (/^--- (?:ONLY|LAST)$/) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
close $in;
|
||||
|
||||
open my $out, ">$outfile" or
|
||||
die "cannot open $outfile for writing: $!\n";
|
||||
|
||||
open $in, $0 or
|
||||
die "cannot open $0 for reading: $!\n";
|
||||
while (<$in>) {
|
||||
print $out $_;
|
||||
if (/^__DATA__$/) {
|
||||
last;
|
||||
}
|
||||
}
|
||||
close $in;
|
||||
|
||||
print $out "\n";
|
||||
|
||||
my $n = @SavedTests;
|
||||
|
||||
my $i = 0;
|
||||
for my $block (@SavedTests) {
|
||||
my $name = $block->{name};
|
||||
my $cmd = $block->{cmd};
|
||||
my $stdout = $block->{out};
|
||||
my $makefile = $block->{makefile};
|
||||
my $exit = $block->{exit};
|
||||
my $err = $block->{err};
|
||||
|
||||
#$stdout =~ s/$BuildRoot/\$OPENRESTY_BUILD_DIR/g;
|
||||
|
||||
print $out <<"_EOC_";
|
||||
=== $name
|
||||
--- cmd: $cmd
|
||||
--- out
|
||||
$stdout
|
||||
_EOC_
|
||||
|
||||
if ($makefile) {
|
||||
#$makefile =~ s/$BuildRoot\b/\$OPENRESTY_BUILD_DIR/g;
|
||||
print $out "--- makefile\n$makefile";
|
||||
}
|
||||
|
||||
if ($err) {
|
||||
print $out "--- err\n$err";
|
||||
}
|
||||
|
||||
if ($exit) {
|
||||
print $out "--- exit: $exit\n";
|
||||
}
|
||||
|
||||
if ($i++ < $n - 1) {
|
||||
print $out "\n\n\n";
|
||||
}
|
||||
}
|
||||
|
||||
print $out "\n";
|
||||
|
||||
close $out;
|
||||
|
||||
warn "wrote $outfile\n";
|
||||
}
|
||||
|
||||
sub shell (@) {
|
||||
|
|
|
|||
155
t/sanity.t
155
t/sanity.t
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
use t::Config;
|
||||
|
||||
plan tests => 124;
|
||||
plan tests => 128;
|
||||
|
||||
#no_diff();
|
||||
|
||||
|
|
@ -46,6 +46,8 @@ __DATA__
|
|||
--with-http_postgres_module enable ngx_http_postgres_module
|
||||
|
||||
--without-lua_cjson disable the lua-cjson library
|
||||
--without-lua_redis_parser disable the lua-redis-parser library
|
||||
|
||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||
--with-luajit enable LuaJIT 2.0
|
||||
--with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix
|
||||
|
|
@ -181,6 +183,7 @@ Options directly inherited from nginx
|
|||
|
||||
|
||||
|
||||
|
||||
=== TEST 2: default
|
||||
--- cmd: ./configure --dry-run
|
||||
--- out
|
||||
|
|
@ -215,17 +218,20 @@ 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.2 && $(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.09rc4 && $(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.5 && $(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.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -269,17 +275,20 @@ 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.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall -pedantic" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall -pedantic" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -289,12 +298,13 @@ clean:
|
|||
|
||||
=== TEST 4: --with-http_ssl_module & --without-http_ssl_module
|
||||
--- cmd: ./configure --with-http_ssl_module --without-http_ssl_module
|
||||
--- exit: 2
|
||||
--- err
|
||||
--with-http_ssl_module conflicts with --without-http_ssl_module.
|
||||
--- out
|
||||
platform: linux (linux)
|
||||
|
||||
--- err
|
||||
--with-http_ssl_module conflicts with --without-http_ssl_module.
|
||||
--- exit: 2
|
||||
|
||||
|
||||
|
||||
=== TEST 5: --with-luajit
|
||||
|
|
@ -332,17 +342,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -386,17 +399,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -439,17 +455,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -491,17 +510,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -536,6 +558,7 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
|
|
@ -584,17 +607,20 @@ 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.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua/include LUA_LIB_DIR=/opt/blah/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua/include LUA_LIB_DIR=/opt/blah/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/opt/blah/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua/include LUA_LIB_DIR=/opt/blah/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua/include LUA_LIB_DIR=/opt/blah/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -638,6 +664,8 @@ clean:
|
|||
--with-http_postgres_module enable ngx_http_postgres_module
|
||||
|
||||
--without-lua_cjson disable the lua-cjson library
|
||||
--without-lua_redis_parser disable the lua-redis-parser library
|
||||
|
||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||
--with-luajit enable LuaJIT 2.0
|
||||
--with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix
|
||||
|
|
@ -773,6 +801,7 @@ Options directly inherited from nginx
|
|||
|
||||
|
||||
|
||||
|
||||
=== TEST 12: default on solaris
|
||||
--- cmd: ./configure --dry-run --platform=solaris
|
||||
--- out
|
||||
|
|
@ -807,17 +836,20 @@ 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) solaris
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -860,17 +892,20 @@ 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) solaris
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -913,17 +948,20 @@ 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) solaris
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -935,6 +973,7 @@ clean:
|
|||
--- 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: 2
|
||||
|
|
@ -979,18 +1018,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
--- err
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(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.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1032,17 +1073,20 @@ 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) CC=gcc-4.2 solaris
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc-4.2
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc-4.2
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install CC=gcc-4.2 INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O3 -Wall -pedantic -D'isinf(x)=0'" CC=gcc-4.2
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CC=gcc-4.2
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1087,17 +1131,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1142,17 +1189,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install CCDEBUG=-g Q= CC=cl PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1164,6 +1214,7 @@ clean:
|
|||
--- cmd: ./configure --with-libpq=/opt/postgres --dry-run
|
||||
--- out
|
||||
platform: linux (linux)
|
||||
|
||||
--- err
|
||||
The http_postgres_module is not enabled while --with-libpq is specified.
|
||||
--- exit: 2
|
||||
|
|
@ -1208,18 +1259,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
--- err
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(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.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1262,17 +1315,20 @@ 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.2 && $(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.09rc4 && $(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.5 && $(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.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1282,19 +1338,21 @@ clean:
|
|||
|
||||
=== TEST 23: --with-libpq & --with-pg_config
|
||||
--- cmd: ./configure --with-libpq=/foo/bar --with-pg_config=/baz
|
||||
--- exit: 9
|
||||
--- out
|
||||
|
||||
--- err
|
||||
--with-pg_config is not allowed when --with-libpq is already specified.
|
||||
--- out
|
||||
--- exit: 9
|
||||
|
||||
|
||||
|
||||
=== TEST 24: --with-pg_config & --with-libpq
|
||||
--- cmd: ./configure --with-pg_config=/baz --with-libpq=/foo/bar
|
||||
--- exit: 9
|
||||
--- out
|
||||
|
||||
--- err
|
||||
--with-libpq is not allowed when --with-pg_config is already specified.
|
||||
--- out
|
||||
--- exit: 9
|
||||
|
||||
|
||||
|
||||
|
|
@ -1336,18 +1394,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
--- err
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(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.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1359,6 +1419,7 @@ clean:
|
|||
--- cmd: ./configure --with-pg_config=pg_config --dry-run
|
||||
--- out
|
||||
platform: linux (linux)
|
||||
|
||||
--- err
|
||||
The http_postgres_module is not enabled while --with-pg_config is specified.
|
||||
--- exit: 2
|
||||
|
|
@ -1399,23 +1460,24 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
make
|
||||
make install
|
||||
--- err
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(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.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
--- exit: 0
|
||||
|
||||
|
||||
|
||||
|
|
@ -1454,17 +1516,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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 -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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 -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1507,17 +1572,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1559,17 +1627,20 @@ 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) macosx
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib LDFLAGS='-bundle -undefined dynamic_lookup' CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1612,17 +1683,20 @@ cd ../..
|
|||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.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/lua-cjson-1.0.2 && $(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.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(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.09rc4 && $(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/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1666,17 +1740,20 @@ 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) solaris
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O0 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.2 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O0 -Wall -pedantic -D'isinf(x)=0'" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install CFLAGS="-g -O0 -Wall" CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
|
|
@ -1718,6 +1795,58 @@ 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-redis-parser-0.09rc4 && $(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.5 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc4 && $(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.5 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
=== TEST 33: --without-lua_redis_parser & --without-lua_cjson
|
||||
--- cmd: ./configure --dry-run --without-lua_redis_parser --without-lua_cjson
|
||||
--- 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.5
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.37rc1 \
|
||||
--add-module=../xss-nginx-module-0.03rc3 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc2 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||
--add-module=../ngx_lua-0.2.1rc4 \
|
||||
--add-module=../headers-more-nginx-module-0.15 \
|
||||
--add-module=../srcache-nginx-module-0.12 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.12 \
|
||||
--add-module=../redis2-nginx-module-0.07 \
|
||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||
--add-module=../auth-request-nginx-module-0.2 \
|
||||
--add-module=../rds-json-nginx-module-0.12rc1 \
|
||||
--with-http_ssl_module
|
||||
cd ../..
|
||||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
|
|
|
|||
|
|
@ -140,6 +140,9 @@ for my $opt (@ARGV) {
|
|||
} elsif ($opt eq '--without-lua_cjson') {
|
||||
$resty_opts{no_lua_cjson} = 1;
|
||||
|
||||
} elsif ($opt eq '--without-lua_redis_parser') {
|
||||
$resty_opts{no_lua_redis_parser} = 1;
|
||||
|
||||
} elsif ($opt eq '--with-debug') {
|
||||
$resty_opts{debug} = 1;
|
||||
|
||||
|
|
@ -583,6 +586,53 @@ _EOC_
|
|||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
||||
"\$(MAKE) install$extra_opts";
|
||||
}
|
||||
|
||||
unless ($opts->{no_lua_redis_parser}) {
|
||||
my $dir = auto_complete 'lua-redis-parser';
|
||||
if (!defined $dir) {
|
||||
die "No lua-redis-parser found";
|
||||
}
|
||||
|
||||
my $lua_inc;
|
||||
if ($opts->{luajit}) {
|
||||
$lua_inc = $ENV{LUAJIT_INC};
|
||||
|
||||
} else {
|
||||
$lua_inc = $ENV{LUA_INC};
|
||||
}
|
||||
|
||||
my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_INCLUDE_DIR=$lua_inc " .
|
||||
"LUA_LIB_DIR=$lualib_prefix";
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .= " CFLAGS=\"-g -O0 -Wall\"";
|
||||
}
|
||||
}
|
||||
|
||||
if ($platform eq 'macosx') {
|
||||
$extra_opts .= " LDFLAGS='-bundle -undefined dynamic_lookup'";
|
||||
}
|
||||
|
||||
if (defined $cc) {
|
||||
$extra_opts .= " CC=$cc";
|
||||
} else {
|
||||
$extra_opts .= " CC=gcc";
|
||||
}
|
||||
|
||||
push @make_cmds, "cd $root_dir/build/$dir && ".
|
||||
"\$(MAKE)$extra_opts";
|
||||
|
||||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
||||
"\$(MAKE) install$extra_opts";
|
||||
}
|
||||
}
|
||||
|
||||
# prepare nginx configure line
|
||||
|
|
@ -676,6 +726,8 @@ _EOC_
|
|||
$msg .= <<'_EOC_';
|
||||
|
||||
--without-lua_cjson disable the lua-cjson library
|
||||
--without-lua_redis_parser disable the lua-redis-parser library
|
||||
|
||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||
--with-luajit enable LuaJIT 2.0
|
||||
--with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ for my $t_file (@t_files) {
|
|||
warn "\n- $orig";
|
||||
warn "+ $_";
|
||||
|
||||
} elsif (s{\bbuild/$pat[^/ \t\n]*\d[^/ \t\n]*}{build/$dir}g && $orig ne $_) {
|
||||
} elsif (s{OPENRESTY_BUILD_DIR/$pat[^/ \t\n\w]*\d[^/ \t\n]*}{OPENRESTY_BUILD_DIR/$dir}g && $orig ne $_) {
|
||||
$changed++;
|
||||
|
||||
warn "\n- $orig";
|
||||
|
|
|
|||
|
|
@ -212,6 +212,13 @@ cd ..
|
|||
|
||||
#################################
|
||||
|
||||
ver=0.09rc4
|
||||
$root/util/get-tarball "http://github.com/agentzh/lua-redis-parser/tarball/v$ver" -O "lua-redis-parser-$ver.tar.gz" || exit 1
|
||||
tar -xzf lua-redis-parser-$ver.tar.gz || exit 1
|
||||
mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
rm *.tar.gz
|
||||
|
||||
cd ..
|
||||
|
|
|
|||
Loading…
Reference in New Issue