Compare commits

...

5 Commits

4 changed files with 260 additions and 251 deletions

File diff suppressed because it is too large Load Diff

13
util/configure vendored
View File

@ -11,6 +11,7 @@ sub env ($$);
sub cd ($); sub cd ($);
sub auto_complete ($); sub auto_complete ($);
sub usage ($); sub usage ($);
sub trim ($);
my (@make_cmds, @make_install_cmds); my (@make_cmds, @make_install_cmds);
@ -272,10 +273,16 @@ sub shell ($@) {
unless ($dry_run) { unless ($dry_run) {
system($cmd) == 0 or system($cmd) == 0 or
die "failed to run command: $cmd\n"; die "failed to run command: ", trim($cmd), "\n";
} }
} }
sub trim ($) {
my $cmd = shift;
$cmd =~ s/\n.*/.../s;
$cmd;
}
sub auto_complete ($) { sub auto_complete ($) {
my $name = shift; my $name = shift;
my @dirs = glob "$name-[0-9]*" or my @dirs = glob "$name-[0-9]*" or
@ -313,7 +320,9 @@ sub build_resty_opts {
# no gmake found # no gmake found
if ($platform =~ /bsd/i) { if ($platform =~ /bsd/i) {
die "error: you need to install gmake (Gnu make) to build LuaJIT.\n"; die "error: I cannot find \"gmake\" (Gnu make) in your PATH ".
"envirnonment. You can also specify your make by the ".
"--with-make=PATH option\n";
} }
if (can_run("make")) { if (can_run("make")) {

View File

@ -100,7 +100,7 @@ mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
################################# #################################
ver=0.1.2rc3 ver=0.1.2rc4
$root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1 $root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1
tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1 tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1
mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1 mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
main_ver=1.0.9 main_ver=1.0.9
minor_ver=7 minor_ver=10
version=$main_ver.$minor_ver version=$main_ver.$minor_ver
echo $version echo $version