X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=blobdiff_plain;f=build-pspp;h=2fff2c853ec2cb693b7fb53c93e1edc5df056a83;hp=be84459c484ef04afdde2551f261e200593ad478;hb=9869b64641f5197bd495a5e62cdbb3f985adbeee;hpb=59f020fe17e2c7815d4ebb941aa0240590de2d17

diff --git a/build-pspp b/build-pspp
index be84459c48..2fff2c853e 100755
--- a/build-pspp
+++ b/build-pspp
@@ -115,18 +115,26 @@ sub save_result_if_exists {
     }
 }
 
+sub ref_to_commit {
+    my ($ref) = @_;
+    my $commit = `$GIT rev-parse $ref`;
+    chomp $commit;
+    return $commit;
+}
+
 my $GIT = "git --git-dir=$topdir/.git";
 
 if (@ARGV == 2) {
     my ($repo, $branch) = @ARGV;
 
-    # Fetch branch
-    start_step ("Fetch $repo, branch $branch");
+    start_step ("Fetch branch from Git");
+    set_var ("git_repo", $repo);
+    set_var ("git_branch", $branch);
     run ("$GIT fetch $repo +$branch:refs/builds/$build_number/pspp");
 
     # Get revision number.
-    my $revision = `$GIT rev-parse refs/builds/$build_number/pspp`;
-    chomp $revision;
+    set_var ("pspp_ref", "refs/builds/$build_number/pspp");
+    my $revision = ref_to_commit ("refs/builds/$build_number/pspp");
     set_var ("pspp_commit", $revision);
     my $abbrev_commit = substr ($revision, 0, 6);
 
@@ -153,7 +161,7 @@ if (@ARGV == 2) {
 	}
     }
     close (MAKEFILE_AM);
-    set_var ("am_mode", $am_mode);
+    print LOG "Automake mode is $am_mode\n";
 
     # Generate version number for build.
     # We want to append -g012345, but if we're in Gnits mode and the
@@ -227,12 +235,13 @@ EOF
       or die "rename $fullname.new to $fullname failed: $!\n";
 
     # If we don't already have that Gnulib commit, update Gnulib.
-    system ("$GIT rev-parse --verify --quiet $gnulib_commit");
+    system ("$GIT rev-parse --verify --quiet $gnulib_commit > /dev/null");
     if ($? != 0) {
 	start_step ("Updating Gnulib to obtain commit");
 	run ("$GIT fetch gnulib");
     }
     run ("$GIT update-ref refs/builds/$build_number/gnulib $gnulib_commit");
+    set_var ("gnulib_ref", "refs/builds/$build_number/gnulib");
 
     # Extract gnulib source.
     start_step ("Extract Gnulib source");
@@ -267,16 +276,15 @@ EOF
     start_step ("Build developers guide");
     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");
+} else {
+    $tarball = saved_result ("source distribution", $tarball);
 }
 
 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);
+    set_var ("dist_ref", "refs/builds/$build_number/dist");
+    set_var ("dist_commit", ref_to_commit ("refs/builds/$build_number/dist"));
 
     start_step ("Extracting source tarball");
     run ("zcat $tarball | (cd $builddir && tar xf -)");