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

util/dist-check: added -l option to build the bundle with the std lua 5.1 interpreter.

This commit is contained in:
agentzh (Yichun Zhang) 2013-04-17 12:08:54 -07:00
parent 1bfc510257
commit 1d096c047e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
util/dist-check
View File

@ -9,7 +9,7 @@ use Cwd qw/cwd/;
sub sh ($); sub sh ($);
my %opts; my %opts;
getopts("f:", \%opts) or die "Usage: $0 [-f] <cores>\n"; getopts("lf:", \%opts) or die "Usage: $0 [-f] <cores>\n";
my $jobs = shift || 4; my $jobs = shift || 4;
@ -20,7 +20,7 @@ if ($cwd !~ /ngx_openresty-(\d+(?:\.\d+)+)$/) {
my $ver = $1; my $ver = $1;
my ($make); my ($make, $lua);
if ($^O eq 'freebsd' || $^O eq 'solaris') { if ($^O eq 'freebsd' || $^O eq 'solaris') {
$make = 'gmake'; $make = 'gmake';
@ -30,26 +30,35 @@ if ($^O eq 'freebsd' || $^O eq 'solaris') {
} }
my $cfg_opts = "--with-http_iconv_module"; my $cfg_opts = "--with-http_iconv_module";
if ($opts{l}) {
$lua = 'Lua';
} else {
$lua = 'LuaJIT';
$cfg_opts .= " --with-luajit";
}
my $prefix; my $prefix;
warn "=== Normal Build ===\n"; warn "=== Normal Build ===\n";
$prefix = "/usr/local/openresty"; $prefix = "/usr/local/openresty";
unless ($opts{f}) { unless ($opts{f}) {
sh "./configure --with-luajit $cfg_opts -j$jobs > /dev/null"; sh "./configure $cfg_opts -j$jobs > /dev/null";
} }
sh "$make -j$jobs > /dev/null"; sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null"; sh "sudo $make install > /dev/null";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
system "sudo killall nginx > /dev/null 2>&1"; system "sudo killall nginx > /dev/null 2>&1";
sh "sudo $prefix/nginx/sbin/nginx"; sh "sudo $prefix/nginx/sbin/nginx";
sh "curl -si localhost/lua|grep LuaJIT"; sh "curl -si localhost/lua|grep $lua";
sh "curl -si localhost/lua|grep $ver"; sh "curl -si localhost/lua|grep $ver";
sh "sudo $prefix/nginx/sbin/nginx -sstop"; sh "sudo $prefix/nginx/sbin/nginx -sstop";
warn "\n=== Debug Build ===\n"; warn "\n=== Debug Build ===\n";
$prefix = "/usr/local/openresty-debug"; $prefix = "/usr/local/openresty-debug";
unless ($opts{f}) { unless ($opts{f}) {
sh "./configure --with-debug $cfg_opts --prefix=$prefix --with-luajit -j$jobs > /dev/null"; sh "./configure --with-debug $cfg_opts --prefix=$prefix -j$jobs > /dev/null";
} }
sh "$make -j$jobs > /dev/null"; sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null"; sh "sudo $make install > /dev/null";
@ -57,14 +66,14 @@ sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-debug'"; sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-debug'";
system "sudo killall nginx > /dev/null 2>&1"; system "sudo killall nginx > /dev/null 2>&1";
sh "sudo $prefix/nginx/sbin/nginx"; sh "sudo $prefix/nginx/sbin/nginx";
sh "curl -si localhost/lua|grep LuaJIT"; sh "curl -si localhost/lua|grep $lua";
sh "curl -si localhost/lua|grep $ver"; sh "curl -si localhost/lua|grep $ver";
sh "sudo $prefix/nginx/sbin/nginx -sstop"; sh "sudo $prefix/nginx/sbin/nginx -sstop";
warn "\n=== DTrace Build ===\n"; warn "\n=== DTrace Build ===\n";
$prefix = "/usr/local/openresty-dtrace"; $prefix = "/usr/local/openresty-dtrace";
unless ($opts{f}) { unless ($opts{f}) {
sh "./configure $cfg_opts --with-dtrace-probes --prefix=$prefix --with-luajit -j$jobs > /dev/null"; sh "./configure $cfg_opts --with-dtrace-probes --prefix=$prefix -j$jobs > /dev/null";
} }
sh "$make -j$jobs > /dev/null"; sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null"; sh "sudo $make install > /dev/null";
@ -72,7 +81,7 @@ sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'"; sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'";
system "sudo killall nginx > /dev/null 2>&1"; system "sudo killall nginx > /dev/null 2>&1";
sh "sudo $prefix/nginx/sbin/nginx"; sh "sudo $prefix/nginx/sbin/nginx";
sh "curl -si localhost/lua|grep LuaJIT"; sh "curl -si localhost/lua|grep $lua";
sh "curl -si localhost/lua|grep $ver"; sh "curl -si localhost/lua|grep $ver";
if ($^O eq 'linux') { if ($^O eq 'linux') {
sh "stap -L 'process(\"$prefix/nginx/sbin/nginx\").mark(\"*\")'|grep http__lua__coroutine__done"; sh "stap -L 'process(\"$prefix/nginx/sbin/nginx\").mark(\"*\")'|grep http__lua__coroutine__done";