X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=blobdiff_plain;f=build-pspp;h=ce153b3024b74f97aa565b4b37bebd2675290627;hp=5aeacde8afb819410a6825c52964416f729afeb6;hb=215d09f8d91f75eac208d4945906a959bc508701;hpb=8ffdac26caf91e175dfd371ef609f39817db79d8

diff --git a/build-pspp b/build-pspp
index 5aeacde8af..ce153b3024 100755
--- a/build-pspp
+++ b/build-pspp
@@ -1,68 +1,102 @@
 #! /usr/bin/env perl
 
+use Cwd;
+use File::Basename;
+use File::Spec;
 use Getopt::Long qw(:config bundling no_ignore_case);
+use IO::Handle;
 use POSIX;
-use Cwd;
 
 use strict;
 use warnings;
 
 my $help = 0;
 my $build_binary = 1;
+my $batch = 0;
+my $builddir;
+my $build_number;
 GetOptions ("h|help" => \$help,
-	    "binary!" => \$build_binary);
+	    "binary!" => \$build_binary,
+	    "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;
+my $tarball;
+if (@ARGV == 1) {
+    $tarball = File::Spec->rel2abs ($ARGV[0]);
+} else {
+    # Tarball will be generated later.
+}
 
 # Select build number.
-my $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime);
+if (!defined ($build_number)) {
+    $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime);
+}
 
-my $topdir = getcwd ();
+my $topdir = dirname ($0);
+$topdir = cwd () . "/$topdir" if $topdir !~ m%^/%;
 
 # 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";
+}
+$builddir = File::Spec->rel2abs ($builddir);
+-d $builddir or mkdir $builddir or die "$builddir: mkdir: $!\n";
+chdir ($builddir) or die "$builddir: chdir: $!\n";
 
 our $resultsdir = "$builddir/results";
 mkdir $resultsdir or die "$resultsdir: mkdir: $!\n";
 mkdir "$resultsdir/vars" or die "$resultsdir/vars: mkdir: $!\n";
 
-my $logfile = "$resultsdir/LOG";
+my $varsfile = "$resultsdir/VARS";
+open (VARS, '>', $varsfile) or die "creating $varsfile failed: $!\n";
+VARS->autoflush (1);
+
+our $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 {
     my ($msg) = @_;
     print LOG "\n$msg\n";
-    print "$msg\n";
+    print "$msg\n" unless $batch;
 }
 
 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";
+}
+
+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) {
@@ -73,7 +107,7 @@ sub save_result {
 }
 
 sub save_result_if_exists {
-    my ($src, $rm_src) = @_;
+    my ($name, $src, $rm_src) = @_;
     if (-e $src) {
 	save_result (@_);
     } else {
@@ -81,27 +115,28 @@ sub save_result_if_exists {
     }
 }
 
-my $tarball;
+my $GIT = "git --git-dir=$topdir/.git";
+
 if (@ARGV == 2) {
     my ($repo, $branch) = @ARGV;
 
     # Fetch branch
     start_step ("Fetch $repo, branch $branch");
-    run ("git fetch $repo +$branch:buildtmp/$$/pspp");
+    run ("$GIT fetch $repo +$branch:refs/builds/$build_number/pspp");
 
     # Get revision number.
-    my $revision = `git rev-parse buildtmp/$$/pspp`;
+    my $revision = `$GIT rev-parse refs/builds/$build_number/pspp`;
     chomp $revision;
     set_var ("pspp_commit", $revision);
     my $abbrev_commit = substr ($revision, 0, 6);
 
     # Extract source.
-    start_step ("Extract branch into $builddir/pspp$build_number");
-    run ("git archive --format=tar --prefix=pspp$build_number/ buildtmp/$$/pspp | (cd $builddir && tar xf -)");
+    start_step ("Extract branch into source directory");
+    run ("$GIT archive --format=tar --prefix=pspp/ refs/builds/$build_number/pspp | tar xf -");
 
     # Extract version number.
     start_step ("Extract repository version number");
-    my $trace = `cd $builddir/pspp$build_number && autoconf -t AC_INIT`;
+    my $trace = `cd pspp && autoconf -t AC_INIT`;
     chomp $trace;
     my ($file, $line, $macro, $package, $repo_version, @rest)
       = split (':', $trace);
@@ -109,14 +144,15 @@ if (@ARGV == 2) {
 
     # Is this a "gnits" mode tree?
     start_step ("Checking Automake mode");
-    open (MAKEFILE_AM, '<', "$builddir/pspp$build_number/Makefile.am");
+    open (MAKEFILE_AM, '<', "pspp/Makefile.am");
     my $am_mode = "gnu";
-    while (<MAKEFILE>) {
+    while (<MAKEFILE_AM>) {
 	if (/gnits/) {
 	    $am_mode = "gnits";
 	    last;
 	}
     }
+    close (MAKEFILE_AM);
     set_var ("am_mode", $am_mode);
 
     # Generate version number for build.
@@ -130,7 +166,7 @@ if (@ARGV == 2) {
 
     # Append -g012345 to configure.ac version number.
     start_step ("Updating version number in $file");
-    my $fullname = "$builddir/pspp$build_number/$file";
+    my $fullname = "pspp/$file";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -149,9 +185,22 @@ if (@ARGV == 2) {
     rename ("$fullname.new", $fullname)
       or die "rename $fullname.new to $fullname failed: $!\n";
 
+    # Get Gnulib commit number.
+    start_step ("Reading README.Git to find Gnulib commit number");
+    my $gnulib_commit;
+    $fullname = "pspp/README.Git";
+    open (README_GIT, '<', $fullname)
+      or die "opening $fullname failed: $!\n";
+    while (<README_GIT>) {
+	($gnulib_commit) = /^\s+commit ([0-9a-fA-F]{8,})/ and last;
+    }
+    die "$fullname does not specify a Git commit number\n"
+      if !defined ($gnulib_commit);
+    set_var ("gnulib_commit", $gnulib_commit);
+
     # Add note to beginning of NEWS (otherwise "make dist" fails).
     start_step ("Updating NEWS");
-    $fullname = "$builddir/pspp$build_number/NEWS";
+    $fullname = "pspp/NEWS";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -163,8 +212,10 @@ if (@ARGV == 2) {
 	    print NEWFILE <<EOF;
 Changes from $repo_version to $version:
 
- * Built automatically from commit $revision
-   in branch $branch by builder $builder
+ * Built from PSPP commit $revision
+   in branch $branch on host $build_host.
+
+ * Built from Gnulib commit $gnulib_commit.
 
 EOF
 	}
@@ -175,70 +226,62 @@ EOF
     rename ("$fullname.new", $fullname)
       or die "rename $fullname.new to $fullname failed: $!\n";
 
-    # Get Gnulib commit number.
-    start_step ("Reading README.Git to find Gnulib commit number");
-    my $gnulib_commit;
-    $fullname = "$builddir/pspp$build_number/README.Git";
-    open (README_GIT, '<', $fullname)
-      or die "opening $fullname failed: $!\n";
-    while (<README_GIT>) {
-	($gnulib_commit) = /^\s+commit ([0-9a-fA-F]{8,})/ and last;
-    }
-    die "$fullname does not specify a Git commit number\n"
-      if !defined ($gnulib_commit);
-    set_var ("gnulib_commit", $gnulib_commit);
-
     # If we don't already have that Gnulib commit, update Gnulib.
-    `git rev-parse $gnulib_commit`;
+    system ("$GIT rev-parse --verify --quiet $gnulib_commit");
     if ($? != 0) {
 	start_step ("Updating Gnulib to obtain commit");
-	run ("git fetch gnulib");
+	run ("$GIT fetch gnulib");
     }
+    run ("$GIT update-ref refs/builds/$build_number/gnulib $gnulib_commit");
 
     # Extract gnulib source.
     start_step ("Extract Gnulib source");
-    run ("git archive --format=tar --prefix=gnulib/ $gnulib_commit | (cd $builddir && tar xf -)");
+    run ("$GIT archive --format=tar --prefix=gnulib/ $gnulib_commit | tar xf -");
 
     # Bootstrap.
     start_step ("Bootstrap (make -f Smake)");
-    run ("cd $builddir/pspp$build_number && make -f Smake");
+    run ("cd pspp && make -f Smake", "bootstrap");
 
     # Configure.
     start_step ("Configure source");
-    run ("cd $builddir/pspp$build_number && mkdir _build && cd _build && ../configure");
+    run ("cd pspp && mkdir _build && cd _build && ../configure", "configure");
 
     # Distribute.
     start_step ("Make source tarball");
-    run ("cd $builddir/pspp$build_number/_build && make dist");
+    run ("cd pspp/_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", "pspp/_build/$tarname", 1);
+    save_result ("translation templates", "pspp/_build/po/pspp.pot");
 
     # 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\"");
+    run ("cd pspp && cp _build/doc/*.texi doc/");
+    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -o $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 \"GNU PSPP Developers Guide\"");
-} else {
-    $tarball = $ARGV[0];
+    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -o $resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
+    saved_result ("Developers Guide", "dev-guide");
 }
 
 if ($build_binary) {
+    start_step ("Save tarball to Git");
+    run ("GIT_DIR=$topdir/.git $topdir/git-import-tar $tarball refs/builds/$build_number/dist", "git-dist");
+
     start_step ("Determining $tarball target directory");
     my $sample_filename = `zcat $tarball | tar tf - | head -1`;
     my ($tarball_dir) = $sample_filename =~ m%^(?:[./])*([^/]+)/%;
     set_var ("dist_dir", $tarball_dir);
 
-    start_step ("Extracting $tarball into $builddir/$tarball_dir");
+    start_step ("Extracting source tarball");
     run ("zcat $tarball | (cd $builddir && tar xf -)");
 
     start_step ("Extracting tar version");
     my ($version) = `cd $builddir/$tarball_dir && ./configure --version | head -1`
       =~ /configure (\S+)$/;
     set_var ("dist_version", $version);
-    my ($binary_version) = "$version-$builder-build$build_number";
+    my ($binary_version) = "$version-$build_host-build$build_number";
     set_var ("binary_version", $binary_version);
 
     start_step ("Configuring");
@@ -246,34 +289,35 @@ if ($build_binary) {
     run ("chmod u+w $builddir/$tarball_dir");
     run ("mkdir $builddir/$tarball_dir/_build");
     run ("chmod a-w $builddir/$tarball_dir");
-    my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix=''");
+    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");
     }
-    exit 1 if !$ok;
+    fail () if !$ok;
 
     start_step ("Build");
-    run ("cd $builddir/$tarball_dir/_build && make");
+    run ("cd $builddir/$tarball_dir/_build && make", "build");
 
     start_step ("Install");
-    run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version");
+    run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version", "install");
 
     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");
+    $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");
     }
-    exit 1 if !$ok;
+    fail () if !$ok;
 
     start_step ("Uninstall");
-    run ("cd $builddir/$tarball_dir/_build && make uninstall DESTDIR=\$PWD/pspp-$binary_version");
+    run ("cd $builddir/$tarball_dir/_build && make uninstall DESTDIR=\$PWD/pspp-$binary_version", "uninstall");
 
     start_step ("Check uninstall");
-    run ("cd $builddir/$tarball_dir/_build && make distuninstallcheck distuninstallcheck_dir=\$PWD/pspp-$binary_version");
+    run ("cd $builddir/$tarball_dir/_build && make distuninstallcheck distuninstallcheck_dir=\$PWD/pspp-$binary_version", "distuninstallcheck");
 
     # distcleancheck
 }
@@ -289,16 +333,18 @@ where TARBALL is the name of a tarball produced by "make dist"
 
 Options:
   --help            Print this usage message and exit
+  --no-binary       Build source tarballs but no binaries.
+  --batch           Do not print progress to stdout.
 EOF
     exit(0);
 }
 
 sub run {
-    exit 1 if !try_run(@_);
+    fail () if !try_run (@_);
 }
 
 sub try_run {
-    my ($command) = @_;
+    my ($command, $id) = @_;
 
     print LOG "$command\n";
 
@@ -311,22 +357,75 @@ sub try_run {
 	die "$command: exec failed: $!\n";
     }
 
+    my ($start) = time ();
+    my ($est_time) = (defined ($id) ? read_timing ($id) : 0);
+
     local ($|) = 1;
-    my $i = 0;
+    my $lines = 0;
     while (<COMMAND>) {
 	print LOG $_;
-	print "\r", $i++;
+
+	my $elapsed = time () - $start;
+	my $progress = sprintf "%d lines logged, %d s elapsed",
+	  $lines++, $elapsed;
+	if ($est_time > 0) {
+	    my $left = $est_time - $elapsed;
+	    if ($left > 0) {
+		$progress .= sprintf ", ETA %d s", $left;
+	    }
+	}
+	print "\r$progress", " " x (79 - length ($progress)), "\r"
+	  unless $batch;
     }
     close (COMMAND);
-    print "\r      \r";
+    print "\r", " " x 79, "\r" unless $batch;
+
+    write_timing ($id, time () - $start) if defined ($id);
 
     return 1 if !$?;
 
     if ($? & 127) {
-	printf "%s: child died with signal %d, %s coredump\n",
+	printf STDERR "%s: child died with signal %d, %s coredump\n",
 	  $command, ($? & 127),  ($? & 128) ? 'with' : 'without';
     } else {
-	printf "%s: child exited with value %d\n", $command, $? >> 8;
+	printf STDERR "%s: child exited with value %d\n", $command, $? >> 8;
+    }
+    return 0;
+}
+
+sub read_timing {
+    my ($id) = @_;
+    open (TIMINGS, "<", "$topdir/timings") or return 0;
+    while (<TIMINGS>) {
+	chomp;
+	my ($key, $value) = /^([^=]+)=(.*)/ or next;
+	return $value if $key eq $id;
     }
+    close (TIMINGS);
     return 0;
 }
+
+sub write_timing {
+    my ($id, $time) = @_;
+
+    open (NEWTIMINGS, ">", "$topdir/timings.tmp$$") or return;
+
+    if (open (OLDTIMINGS, "<", "$topdir/timings")) {
+	while (<OLDTIMINGS>) {
+	    if (my ($key, $value) = /^([^=]+)=(.*)/) {
+		next if $key eq $id;
+	    }
+	    print NEWTIMINGS $_;
+	}
+	close (OLDTIMINGS);
+    }
+
+    print NEWTIMINGS "$id=$time\n";
+    close (NEWTIMINGS);
+
+    rename ("$topdir/timings.tmp$$", "$topdir/timings");
+}
+
+sub fail {
+    die "Build failed, refer to:\n\t$logfile\nfor details.\n";
+}