X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=f151cc1f881135bf6019ce6d657eec40967418d5;hb=38fb5346628a7b16e9f2a3d066059539037498bf;hp=724221cebd23c8fdc083e85eedb29cc3124251e2;hpb=a861f41d5f49d7e57400b2d572fbdb83a62b7d28;p=pspp

diff --git a/build-pspp b/build-pspp
index 724221cebd..f151cc1f88 100755
--- a/build-pspp
+++ b/build-pspp
@@ -1,8 +1,10 @@
 #! /usr/bin/env perl
 
+use Cwd;
+use File::Spec;
 use Getopt::Long qw(:config bundling no_ignore_case);
+use IO::Handle;
 use POSIX;
-use Cwd;
 
 use strict;
 use warnings;
@@ -10,37 +12,49 @@ use warnings;
 my $help = 0;
 my $build_binary = 1;
 my $batch = 0;
+my $builddir;
+my $build_number;
 GetOptions ("h|help" => \$help,
 	    "binary!" => \$build_binary,
-	    "batch!" => \$batch);
+	    "batch!" => \$batch,
+	    "o|output=s" => \$builddir,
+	    "build-number=i" => \$build_number);
 
 usage () if $help;
 
 die "$0: exactly one or two nonoption arguments are required\n"
   if @ARGV != 1 && @ARGV != 2;
 
-my $builder = `hostname`;
-chomp $builder;
-
 # Select build number.
-my $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime);
-print "$build_number\n" if $batch;
+if (!defined ($build_number)) {
+    $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime);
+}
 
 my $topdir = getcwd ();
 
 # Create build directory.
-my $builddir = "builds/$build_number";
-mkdir "builds" or die "builds: mkdir: $!\n" if ! -d "builds";
-mkdir $builddir or die "$builddir: mkdir: $!\n";
+if (!defined ($builddir)) {
+    $builddir = "builds/$build_number";
+    mkdir "builds" or die "builds: mkdir: $!\n" if ! -d "builds";
+}
+-d $builddir or mkdir $builddir or die "$builddir: mkdir: $!\n";
+my $abs_builddir = File::Spec->rel2abs ($builddir);
 
 our $resultsdir = "$builddir/results";
 mkdir $resultsdir or die "$resultsdir: mkdir: $!\n";
 mkdir "$resultsdir/vars" or die "$resultsdir/vars: mkdir: $!\n";
+my $abs_resultsdir = File::Spec->rel2abs ($resultsdir);
+
+my $varsfile = "$resultsdir/VARS";
+open (VARS, '>', $varsfile) or die "creating $varsfile failed: $!\n";
+VARS->autoflush (1);
 
 my $logfile = "$resultsdir/LOG";
 open (LOG, '>', $logfile) or die "creating $logfile failed: $!\n";
 
-set_var ("builder", $builder);
+my $build_host = `hostname`;
+chomp $build_host;
+set_var ("build_host", $build_host);
 set_var ("build_number", $build_number);
 
 sub start_step {
@@ -51,21 +65,29 @@ sub start_step {
 
 sub set_var {
     my ($var, $value) = @_;
+
+    print VARS "$var=$value\n";
+
+    print "\t$var=$value\n" unless $batch;
+
     open (VAR, '>', "$resultsdir/vars/$var")
       or die "creating $resultsdir/$var failed: $!\n";
     print VAR "$value\n";
     close VAR;
-    print LOG "$var=$value\n";
-    print "\t$var=$value\n" unless $batch;
+}
+
+sub saved_result {
+    my ($name, $product) = @_;
+    start_step ("Saving $name: $product");
 }
 
 sub save_result {
-    my ($src, $rm_src) = @_;
-    my ($dst) = $src;
-    $dst =~ s(^.*/)();
-    $dst = "$resultsdir/$dst";
+    my ($name, $src, $rm_src) = @_;
+    my ($basename) = $src;
+    $basename =~ s(^.*/)();
+    my ($dst) = "$resultsdir/$basename";
 
-    start_step ("Saving $src");
+    saved_result ($name, $basename);
     run ("cp -R $src $dst");
 
     if (defined ($rm_src) && $rm_src) {
@@ -76,7 +98,7 @@ sub save_result {
 }
 
 sub save_result_if_exists {
-    my ($src, $rm_src) = @_;
+    my ($name, $src, $rm_src) = @_;
     if (-e $src) {
 	save_result (@_);
     } else {
@@ -216,16 +238,18 @@ EOF
     start_step ("Make source tarball");
     run ("cd $builddir/pspp$build_number/_build && make dist", "dist");
     my $tarname = "pspp-$version.tar.gz";
-    $tarball = save_result ("$builddir/pspp$build_number/_build/$tarname", 1);
+    $tarball = save_result ("source distribution", "$builddir/pspp$build_number/_build/$tarname", 1);
 
     # Build user manual
     start_step ("Build user manual");
     run ("cd $builddir/pspp$build_number && cp _build/doc/*.texi doc/");
-    run ("cd $builddir/pspp$build_number && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -o $topdir/$builddir/results/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "user-manual");
+    run ("cd $builddir/pspp$build_number && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -o $abs_resultsdir/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "user-manual");
+    saved_result ("User Manual", "user-manual");
 
     # Build developer's guide
     start_step ("Build developers guide");
-    run ("cd $builddir/pspp$build_number && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -o $topdir/$builddir/results/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
+    run ("cd $builddir/pspp$build_number && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -o $abs_resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
+    saved_result ("Developers Guide", "dev-guide");
 } else {
     $tarball = $ARGV[0];
 }
@@ -253,7 +277,8 @@ if ($build_binary) {
     run ("chmod a-w $builddir/$tarball_dir");
     my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix=''", "bin-configure");
     for my $basename ("config.h", "config.log") {
-	save_result_if_exists ("$builddir/$tarball_dir/_build/$basename");
+	save_result_if_exists ("build configuration",
+			       "$builddir/$tarball_dir/_build/$basename");
     }
     fail () if !$ok;
 
@@ -265,12 +290,12 @@ if ($build_binary) {
 
     start_step ("Make binary distribution");
     run ("cd $builddir/$tarball_dir/_build && tar cfz pspp-$binary_version.tar.gz pspp-$binary_version");
-    save_result ("$builddir/$tarball_dir/_build/pspp-$binary_version.tar.gz", 1);
+    save_result ("binary distribution", "$builddir/$tarball_dir/_build/pspp-$binary_version.tar.gz", 1);
 
     start_step ("Check");
     $ok = try_run ("cd $builddir/$tarball_dir/_build && make check", "check");
     for my $basename ("tests/testsuite.log", "tests/testsuite.dir") {
-	save_result_if_exists ("$builddir/$tarball_dir/_build/$basename");
+	save_result_if_exists ("test logs", "$builddir/$tarball_dir/_build/$basename");
     }
     fail () if !$ok;
 
@@ -327,7 +352,7 @@ sub try_run {
 	print LOG $_;
 
 	my $elapsed = time () - $start;
-	$progress = sprintf "%d lines logged, %d s elapsed",
+	my $progress = sprintf "%d lines logged, %d s elapsed",
 	  $lines++, $elapsed;
 	if ($est_time > 0) {
 	    my $left = $est_time - $elapsed;