X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=634364fd6b182c9d846a55800db55e85e40f6665;hb=32512097fa8fd103d842f3fe1573d3dc3b209439;hp=3d3959095ac1d6449ce2e2aa2b0b85d0496dbdeb;hpb=a5f96d8db046bc632654f3fa155bb975726bb935;p=pspp

diff --git a/build-pspp b/build-pspp
index 3d3959095a..634364fd6b 100755
--- a/build-pspp
+++ b/build-pspp
@@ -1,16 +1,24 @@
 #! /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;
 
 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;
 
@@ -21,18 +29,28 @@ my $builder = `hostname`;
 chomp $builder;
 
 # 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 ();
 
 # 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";
@@ -43,26 +61,34 @@ 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 ($product) = @_;
+    start_step ("Saving $product");
 }
 
 sub save_result {
     my ($src, $rm_src) = @_;
-    my ($dst) = $src;
-    $dst =~ s(^.*/)();
-    $dst = "$resultsdir/$dst";
+    my ($basename) = $src;
+    $basename =~ s(^.*/)();
+    my ($dst) = "$resultsdir/$basename";
 
-    start_step ("Saving $src");
+    saved_result ($basename);
     run ("cp -R $src $dst");
 
     if (defined ($rm_src) && $rm_src) {
@@ -98,6 +124,7 @@ if (@ARGV == 2) {
     # 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 -)");
+    run ("git branch -D buildtmp/$$/pspp");
 
     # Extract version number.
     start_step ("Extract repository version number");
@@ -217,11 +244,13 @@ EOF
     # 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");
 
     # 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 ("dev-guide");
 } else {
     $tarball = $ARGV[0];
 }
@@ -290,6 +319,8 @@ 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);
 }
@@ -329,20 +360,21 @@ sub try_run {
 		$progress .= sprintf ", ETA %d s", $left;
 	    }
 	}
-	print "\r$progress", " " x (79 - length ($progress)), "\r";
+	print "\r$progress", " " x (79 - length ($progress)), "\r"
+	  unless $batch;
     }
     close (COMMAND);
-    print "\r", " " x 79, "\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;
 }