X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=92e1d9a2668ee1cb87e0f307753bc20c60d04bd4;hb=82cd5d32c86d7bfcc5a1c90e02c182cf790f4c68;hp=8180ddd80c1d289ac3785f0b833e4ccf7b902b79;hpb=e69ef9cf2879acc8bd4c4b53099af8f75e982ef9;p=pspp

diff --git a/build-pspp b/build-pspp
index 8180ddd80c..92e1d9a266 100755
--- a/build-pspp
+++ b/build-pspp
@@ -14,45 +14,71 @@ usage () if $help;
 die "$0: exactly one or two nonoption arguments are required\n"
   if @ARGV != 1 && @ARGV != 2;
 
-my $buildslave = `hostname`;
-chomp $buildslave;
+my $builder = `hostname`;
+chomp $builder;
 
 # Select build number.
-my $buildnumber = POSIX::strftime("%Y%m%d%H%M%S", localtime);
-print "\tBUILDNUMBER=$buildnumber\n";
+my $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime);
 
 # Create build directory.
-my $builddir = "builds/$buildnumber";
-print "Create $builddir\n";
+my $builddir = "builds/$build_number";
 mkdir "builds" or die "builds: mkdir: $!\n" if ! -d "builds";
 mkdir $builddir or die "$builddir: mkdir: $!\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";
+open (LOG, '>', $logfile) or die "creating $logfile failed: $!\n";
+
+set_var ("builder", $builder);
+set_var ("build_number", $build_number);
+
+sub start_step {
+    my ($msg) = @_;
+    print LOG "\n$msg\n";
+    print "$msg\n";
+}
+
+sub set_var {
+    my ($var, $value) = @_;
+    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";
+}
+
+my $tarball;
 if (@ARGV == 2) {
     my ($repo, $branch) = @ARGV;
 
     # Fetch branch
-    print "Fetch $repo, branch $branch\n";
+    start_step ("Fetch $repo, branch $branch");
     run ("git fetch $repo +$branch:buildtmp/$$/pspp");
 
     # Get revision number.
     my $revision = `git rev-parse buildtmp/$$/pspp`;
     chomp $revision;
-    print "\tREVISION=$revision\n";
-    my $abbrev_revision = substr ($revision, 0, 6);
+    set_var ("pspp_commit", $revision);
+    my $abbrev_commit = substr ($revision, 0, 6);
 
     # Extract source.
-    print "Extract branch into $builddir/pspp$buildnumber\n";
-    run ("git archive --format=tar --prefix=pspp$buildnumber/ buildtmp/$$/pspp | (cd $builddir && tar xf -)");
+    start_step ("Extract branch into $builddir/pspp$build_number");
+    run ("git archive --format=tar --prefix=pspp$build_number/ buildtmp/$$/pspp | (cd $builddir && tar xf -)");
 
     # Extract version number.
-    print "Extract version number\n";
-    my $trace = `cd $builddir/pspp$buildnumber && autoconf -t AC_INIT`;
+    start_step ("Extract version number");
+    my $trace = `cd $builddir/pspp$build_number && autoconf -t AC_INIT`;
     chomp $trace;
     my ($file, $line, $macro, $package, $version, @rest) = split (':', $trace);
-    print "\tVERSION=$version\n";
+    set_var ("pspp_version", $version);
 
     # Append -g012345 to AC_INIT version number.
-    my $fullname = "$builddir/pspp$buildnumber/$file";
+    start_step ("Adding -g$abbrev_commit to version number");
+    my $fullname = "$builddir/pspp$build_number/$file";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -61,9 +87,8 @@ if (@ARGV == 2) {
 	if ($. != $line) {
 	    print NEWFILE $_;
 	} else {
-	    print NEWFILE "AC_INIT([[$package]]";
-	    print NEWFILE ", [[$version-g$abbrev_revision]]";
-	    print NEWFILE ", [[$_]]" foreach @rest;
+	    print NEWFILE "AC_INIT([$package], [$version-g$abbrev_commit]";
+	    print NEWFILE ", [$_]" foreach @rest;
 	    print NEWFILE ")\n";
 	}
     }
@@ -73,7 +98,8 @@ if (@ARGV == 2) {
       or die "rename $fullname.new to $fullname failed: $!\n";
 
     # Add note to beginning of NEWS (otherwise "make dist" fails).
-    $fullname = "$builddir/pspp$buildnumber/NEWS";
+    start_step ("Updating NEWS");
+    $fullname = "$builddir/pspp$build_number/NEWS";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -83,10 +109,10 @@ if (@ARGV == 2) {
 	if (!$found_changes && /^Changes/) {
 	    $found_changes = 1;
 	    print NEWFILE <<EOF;
-Changes from $version to $version-g$abbrev_revision:
+Changes from $version to $version-g$abbrev_commit:
 
  * Built automatically from commit $revision
-   in branch $branch on build slave $buildslave
+   in branch $branch by builder $builder
 
 EOF
 	}
@@ -98,8 +124,9 @@ EOF
       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$buildnumber/README.Git";
+    $fullname = "$builddir/pspp$build_number/README.Git";
     open (README_GIT, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     while (<README_GIT>) {
@@ -107,9 +134,80 @@ EOF
     }
     die "$fullname does not specify a Git commit number\n"
       if !defined ($gnulib_commit);
-    print "\tGNULIB_REVISION=$gnulib_commit\n";
+    set_var ("gnulib_commit", $gnulib_commit);
+
+    # If we don't already have that Gnulib commit, update Gnulib.
+    `git rev-parse $gnulib_commit`;
+    if ($? != 0) {
+	start_step ("Updating Gnulib to obtain commit");
+	run ("git fetch gnulib");
+    }
+
+    # Extract gnulib source.
+    start_step ("Extract Gnulib source");
+    run ("git archive --format=tar --prefix=gnulib/ $gnulib_commit | (cd $builddir && tar xf -)");
+
+    # Bootstrap.
+    start_step ("Bootstrap (make -f Smake)");
+    run ("cd $builddir/pspp$build_number && make -f Smake");
+
+    # Configure.
+    start_step ("Configure source");
+    run ("cd $builddir/pspp$build_number && mkdir _build && cd _build && ../configure");
+
+    # Distribute.
+    start_step ("Make dist tarball");
+    run ("cd $builddir/pspp$build_number/_build && make dist");
+
+    $tarball = "$builddir/pspp$build_number/_build/pspp-$version-g$abbrev_commit.tar.gz";
+} else {
+    $tarball = $ARGV[0];
 }
 
+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");
+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";
+set_var ("binary_version", $binary_version);
+
+start_step ("Configuring");
+run ("chmod -R a-w $builddir/$tarball_dir");
+run ("chmod u+w $builddir/$tarball_dir");
+run ("mkdir $builddir/$tarball_dir/_build");
+run ("chmod a-w $builddir/$tarball_dir");
+run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix=''");
+
+start_step ("Build");
+run ("cd $builddir/$tarball_dir/_build && make");
+
+start_step ("Install");
+run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version");
+
+start_step ("Make binary distribution");
+run ("cd $builddir/$tarball_dir/_build && tar cfz pspp-$binary_version.tar.gz pspp-$binary_version");
+
+start_step ("Check");
+run ("cd $builddir/$tarball_dir/_build && make check");
+
+start_step ("Uninstall");
+run ("cd $builddir/$tarball_dir/_build && make uninstall DESTDIR=\$PWD/pspp-$binary_version");
+
+start_step ("Check uninstall");
+run ("cd $builddir/$tarball_dir/_build && make distuninstallcheck distuninstallcheck_dir=\$PWD/pspp-$binary_version");
+
+# distcleancheck
+
+start_step ("Success");
+
 sub usage {
     print <<EOF;
 $0, for building and testing PSPP
@@ -125,9 +223,29 @@ EOF
 
 sub run {
     my ($command) = @_;
-    return if system ($command) == 0;
-    if ($? == -1) {
-	print "$command: failed to execute: $!\n";
+
+    print LOG "$command\n";
+
+    my $pid = open (COMMAND, '-|');
+    if (!defined ($pid)) {
+	die "fork failed: $!\n";
+    } elsif (!$pid) {
+	dup2 (1, 2);
+	exec ($command);
+	die "$command: exec failed: $!\n";
+    }
+
+    local ($|) = 1;
+    my $i = 0;
+    while (<COMMAND>) {
+	print LOG $_;
+	print "\r", $i++;
+    }
+    close (COMMAND);
+    print "\r      \r";
+
+    if ($? == 0) {
+	return;
     } elsif ($? & 127) {
 	printf "%s: child died with signal %d, %s coredump\n",
 	  $command, ($? & 127),  ($? & 128) ? 'with' : 'without';
@@ -152,3 +270,5 @@ sub run {
 # Make binary dist
 # Build mingw32 installer
 # Other distcheck stuff?
+
+# Distribute manual in various formats