X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=ae723f7de4922f2ccd58695098b4f499af5cc8b9;hb=91958b98fac5f791b0009314e09773d21e550b4b;hp=4b3cf01b5bd6792c2647b7a0c645c019c72ed542;hpb=e0342d528bb13ab467395ef7c7136fc3650c1d5d;p=pspp

diff --git a/build-pspp b/build-pspp
index 4b3cf01b5b..ae723f7de4 100755
--- a/build-pspp
+++ b/build-pspp
@@ -66,6 +66,8 @@ chomp $build_host;
 set_var ("build_host", $build_host);
 set_var ("build_number", $build_number);
 
+our $GIT = "git --git-dir=$topdir/.git";
+
 sub start_step {
     my ($msg) = @_;
     print LOG "\n$msg\n";
@@ -115,28 +117,34 @@ sub save_result_if_exists {
     }
 }
 
-my $GIT = "git --git-dir=$topdir/.git";
+sub ref_to_commit {
+    my ($ref) = @_;
+    my $commit = `$GIT rev-parse $ref`;
+    chomp $commit;
+    return $commit;
+}
 
 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);
 
     # Extract source.
     start_step ("Extract branch into source directory");
-    run ("$GIT archive --format=tar --prefix=pspp$build_number/ refs/builds/$build_number/pspp | tar xf -");
+    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 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);
@@ -144,7 +152,7 @@ if (@ARGV == 2) {
 
     # Is this a "gnits" mode tree?
     start_step ("Checking Automake mode");
-    open (MAKEFILE_AM, '<', "pspp$build_number/Makefile.am");
+    open (MAKEFILE_AM, '<', "pspp/Makefile.am");
     my $am_mode = "gnu";
     while (<MAKEFILE_AM>) {
 	if (/gnits/) {
@@ -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
@@ -166,7 +174,7 @@ if (@ARGV == 2) {
 
     # Append -g012345 to configure.ac version number.
     start_step ("Updating version number in $file");
-    my $fullname = "pspp$build_number/$file";
+    my $fullname = "pspp/$file";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -188,7 +196,7 @@ if (@ARGV == 2) {
     # Get Gnulib commit number.
     start_step ("Reading README.Git to find Gnulib commit number");
     my $gnulib_commit;
-    $fullname = "pspp$build_number/README.Git";
+    $fullname = "pspp/README.Git";
     open (README_GIT, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     while (<README_GIT>) {
@@ -200,7 +208,7 @@ if (@ARGV == 2) {
 
     # Add note to beginning of NEWS (otherwise "make dist" fails).
     start_step ("Updating NEWS");
-    $fullname = "pspp$build_number/NEWS";
+    $fullname = "pspp/NEWS";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -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^0 > /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");
@@ -240,36 +249,43 @@ EOF
 
     # Bootstrap.
     start_step ("Bootstrap (make -f Smake)");
-    run ("cd pspp$build_number && make -f Smake", "bootstrap");
+    run ("cd pspp && make -f Smake", "bootstrap");
 
     # Configure.
     start_step ("Configure source");
-    run ("cd pspp$build_number && mkdir _build && cd _build && ../configure", "configure");
+    run ("cd pspp && mkdir _build && cd _build && ../configure", "configure");
 
     # Distribute.
     start_step ("Make source tarball");
-    run ("cd pspp$build_number/_build && make dist", "dist");
+    run ("cd pspp/_build && make dist", "dist");
     my $tarname = "pspp-$version.tar.gz";
-    $tarball = save_result ("source distribution", "pspp$build_number/_build/$tarname", 1);
-    save_result ("translation templates", "pspp$build_number/_build/po/pspp.pot");
+    $tarball = save_result ("source distribution", "pspp/_build/$tarname", 1);
 
-    # Save distributed files in Git.
-    start_step ("Save distributed files in Git");
-    run ("GIT_DIR=$topdir/.git $topdir/git-import-tar $resultsdir/$tarname refs/builds/$build_number/dist", "git-dist");
+    # Save translation templates.
+    my $potfile = "pspp/_build/po/pspp.pot";
+    $potfile = "pspp/po/pspp.pot" if ! -e $potfile;
+    save_result ("translation templates", $potfile);
 
     # Build user manual
     start_step ("Build user manual");
-    run ("cd pspp$build_number && cp _build/doc/*.texi doc/");
-    run ("cd pspp$build_number && 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");
+    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 pspp$build_number && 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");
+    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");
+    set_var ("dist_ref", "refs/builds/$build_number/dist");
+    set_var ("dist_commit", ref_to_commit ("refs/builds/$build_number/dist"));
+
     start_step ("Determining $tarball target directory");
     my $sample_filename = `zcat $tarball | tar tf - | head -1`;
     my ($tarball_dir) = $sample_filename =~ m%^(?:[./])*([^/]+)/%;