From: Ben Pfaff Date: Mon, 15 Feb 2010 23:38:51 +0000 (-0800) Subject: get it working pretty well X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=a5f96d8db046bc632654f3fa155bb975726bb935 get it working pretty well --- diff --git a/.gitignore b/.gitignore index 913ec74c53..2a3d71f3a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /builds/ +/timings diff --git a/build-pspp b/build-pspp index 5aeacde8af..3d3959095a 100755 --- a/build-pspp +++ b/build-pspp @@ -111,12 +111,13 @@ if (@ARGV == 2) { start_step ("Checking Automake mode"); open (MAKEFILE_AM, '<', "$builddir/pspp$build_number/Makefile.am"); my $am_mode = "gnu"; - while () { + while () { if (/gnits/) { $am_mode = "gnits"; last; } } + close (MAKEFILE_AM); set_var ("am_mode", $am_mode); # Generate version number for build. @@ -201,26 +202,26 @@ EOF # Bootstrap. start_step ("Bootstrap (make -f Smake)"); - run ("cd $builddir/pspp$build_number && make -f Smake"); + run ("cd $builddir/pspp$build_number && make -f Smake", "bootstrap"); # Configure. start_step ("Configure source"); - run ("cd $builddir/pspp$build_number && mkdir _build && cd _build && ../configure"); + run ("cd $builddir/pspp$build_number && mkdir _build && cd _build && ../configure", "configure"); # Distribute. start_step ("Make source tarball"); - run ("cd $builddir/pspp$build_number/_build && make dist"); + 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); # 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 $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"); # 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\""); + 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"); } else { $tarball = $ARGV[0]; } @@ -246,34 +247,34 @@ 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"); } - 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); 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"); } - 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 } @@ -294,11 +295,11 @@ EOF } sub run { - exit 1 if !try_run(@_); + fail () if !try_run (@_); } sub try_run { - my ($command) = @_; + my ($command, $id) = @_; print LOG "$command\n"; @@ -311,14 +312,29 @@ 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 () { print LOG $_; - print "\r", $i++; + + my $elapsed = time () - $start; + $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"; } close (COMMAND); - print "\r \r"; + print "\r", " " x 79, "\r"; + + write_timing ($id, time () - $start) if defined ($id); return 1 if !$?; @@ -330,3 +346,40 @@ sub try_run { } return 0; } + +sub read_timing { + my ($id) = @_; + open (TIMINGS, "<", "$topdir/timings") or return 0; + while () { + 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 () { + 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$topdir/$logfile\nfor details.\n"; +}