X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=6d13ccbf48ad0220e97e19799b9d9d314a914bc7;hb=ec687b924f4a605bc8c2bc441105f47757a7c6cf;hp=f151cc1f881135bf6019ce6d657eec40967418d5;hpb=38fb5346628a7b16e9f2a3d066059539037498bf;p=pspp

diff --git a/build-pspp b/build-pspp
index f151cc1f88..6d13ccbf48 100755
--- a/build-pspp
+++ b/build-pspp
@@ -1,6 +1,7 @@
 #! /usr/bin/env perl
 
 use Cwd;
+use File::Basename;
 use File::Spec;
 use Getopt::Long qw(:config bundling no_ignore_case);
 use IO::Handle;
@@ -25,31 +26,39 @@ usage () if $help;
 die "$0: exactly one or two nonoption arguments are required\n"
   if @ARGV != 1 && @ARGV != 2;
 
+my $tarball;
+if (@ARGV == 1) {
+    $tarball = File::Spec->rel2abs ($ARGV[0]);
+} else {
+    # Tarball will be generated later.
+}
+
 # Select build number.
 if (!defined ($build_number)) {
     $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime);
 }
 
-my $topdir = getcwd ();
+my $topdir = dirname ($0);
+$topdir = cwd () . "/$topdir" if $topdir !~ m%^/%;
 
 # Create build directory.
 if (!defined ($builddir)) {
     $builddir = "builds/$build_number";
     mkdir "builds" or die "builds: mkdir: $!\n" if ! -d "builds";
 }
+$builddir = File::Spec->rel2abs ($builddir);
 -d $builddir or mkdir $builddir or die "$builddir: mkdir: $!\n";
-my $abs_builddir = File::Spec->rel2abs ($builddir);
+chdir ($builddir) or die "$builddir: chdir: $!\n";
 
 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";
+our $logfile = "$resultsdir/LOG";
 open (LOG, '>', $logfile) or die "creating $logfile failed: $!\n";
 
 my $build_host = `hostname`;
@@ -106,28 +115,28 @@ sub save_result_if_exists {
     }
 }
 
-my $tarball;
+my $GIT = "git --git-dir=$topdir/.git";
+
 if (@ARGV == 2) {
     my ($repo, $branch) = @ARGV;
 
     # Fetch branch
     start_step ("Fetch $repo, branch $branch");
-    run ("git fetch $repo +$branch:buildtmp/$$/pspp");
+    run ("$GIT fetch $repo +$branch:refs/builds/$build_number/pspp");
 
     # Get revision number.
-    my $revision = `git rev-parse buildtmp/$$/pspp`;
+    my $revision = `$GIT rev-parse refs/builds/$build_number/pspp`;
     chomp $revision;
     set_var ("pspp_commit", $revision);
     my $abbrev_commit = substr ($revision, 0, 6);
 
     # 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");
+    start_step ("Extract branch into source directory");
+    run ("$GIT archive --format=tar --prefix=pspp$build_number/ refs/builds/$build_number/pspp | tar xf -");
 
     # Extract version number.
     start_step ("Extract repository version number");
-    my $trace = `cd $builddir/pspp$build_number && autoconf -t AC_INIT`;
+    my $trace = `cd pspp$build_number && autoconf -t AC_INIT`;
     chomp $trace;
     my ($file, $line, $macro, $package, $repo_version, @rest)
       = split (':', $trace);
@@ -135,7 +144,7 @@ if (@ARGV == 2) {
 
     # Is this a "gnits" mode tree?
     start_step ("Checking Automake mode");
-    open (MAKEFILE_AM, '<', "$builddir/pspp$build_number/Makefile.am");
+    open (MAKEFILE_AM, '<', "pspp$build_number/Makefile.am");
     my $am_mode = "gnu";
     while (<MAKEFILE_AM>) {
 	if (/gnits/) {
@@ -157,7 +166,7 @@ if (@ARGV == 2) {
 
     # Append -g012345 to configure.ac version number.
     start_step ("Updating version number in $file");
-    my $fullname = "$builddir/pspp$build_number/$file";
+    my $fullname = "pspp$build_number/$file";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -176,9 +185,22 @@ if (@ARGV == 2) {
     rename ("$fullname.new", $fullname)
       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 = "pspp$build_number/README.Git";
+    open (README_GIT, '<', $fullname)
+      or die "opening $fullname failed: $!\n";
+    while (<README_GIT>) {
+	($gnulib_commit) = /^\s+commit ([0-9a-fA-F]{8,})/ and last;
+    }
+    die "$fullname does not specify a Git commit number\n"
+      if !defined ($gnulib_commit);
+    set_var ("gnulib_commit", $gnulib_commit);
+
     # Add note to beginning of NEWS (otherwise "make dist" fails).
     start_step ("Updating NEWS");
-    $fullname = "$builddir/pspp$build_number/NEWS";
+    $fullname = "pspp$build_number/NEWS";
     open (OLDFILE, '<', $fullname)
       or die "opening $fullname failed: $!\n";
     open (NEWFILE, '>', "$fullname.new")
@@ -190,8 +212,10 @@ if (@ARGV == 2) {
 	    print NEWFILE <<EOF;
 Changes from $repo_version to $version:
 
- * Built automatically from commit $revision
-   in branch $branch by builder $builder
+ * Built from PSPP commit $revision
+   in branch $branch on host $build_host.
+
+ * Built from Gnulib commit $gnulib_commit.
 
 EOF
 	}
@@ -202,56 +226,46 @@ EOF
     rename ("$fullname.new", $fullname)
       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$build_number/README.Git";
-    open (README_GIT, '<', $fullname)
-      or die "opening $fullname failed: $!\n";
-    while (<README_GIT>) {
-	($gnulib_commit) = /^\s+commit ([0-9a-fA-F]{8,})/ and last;
-    }
-    die "$fullname does not specify a Git commit number\n"
-      if !defined ($gnulib_commit);
-    set_var ("gnulib_commit", $gnulib_commit);
-
     # If we don't already have that Gnulib commit, update Gnulib.
-    `git rev-parse $gnulib_commit`;
+    system ("$GIT rev-parse --verify --quiet $gnulib_commit");
     if ($? != 0) {
 	start_step ("Updating Gnulib to obtain commit");
-	run ("git fetch gnulib");
+	run ("$GIT fetch gnulib");
     }
+    run ("$GIT update-ref refs/builds/$build_number/gnulib $gnulib_commit");
 
     # Extract gnulib source.
     start_step ("Extract Gnulib source");
-    run ("git archive --format=tar --prefix=gnulib/ $gnulib_commit | (cd $builddir && tar xf -)");
+    run ("$GIT archive --format=tar --prefix=gnulib/ $gnulib_commit | tar xf -");
 
     # Bootstrap.
     start_step ("Bootstrap (make -f Smake)");
-    run ("cd $builddir/pspp$build_number && make -f Smake", "bootstrap");
+    run ("cd pspp$build_number && make -f Smake", "bootstrap");
 
     # Configure.
     start_step ("Configure source");
-    run ("cd $builddir/pspp$build_number && mkdir _build && cd _build && ../configure", "configure");
+    run ("cd pspp$build_number && mkdir _build && cd _build && ../configure", "configure");
 
     # Distribute.
     start_step ("Make source tarball");
-    run ("cd $builddir/pspp$build_number/_build && make dist", "dist");
+    run ("cd pspp$build_number/_build && make dist", "dist");
     my $tarname = "pspp-$version.tar.gz";
-    $tarball = save_result ("source distribution", "$builddir/pspp$build_number/_build/$tarname", 1);
+    $tarball = save_result ("source distribution", "pspp$build_number/_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");
 
     # 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 $abs_resultsdir/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "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");
     saved_result ("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 $abs_resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-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");
     saved_result ("Developers Guide", "dev-guide");
-} else {
-    $tarball = $ARGV[0];
 }
 
 if ($build_binary) {
@@ -260,14 +274,14 @@ if ($build_binary) {
     my ($tarball_dir) = $sample_filename =~ m%^(?:[./])*([^/]+)/%;
     set_var ("dist_dir", $tarball_dir);
 
-    start_step ("Extracting $tarball into $builddir/$tarball_dir");
+    start_step ("Extracting source tarball");
     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";
+    my ($binary_version) = "$version-$build_host-build$build_number";
     set_var ("binary_version", $binary_version);
 
     start_step ("Configuring");
@@ -413,5 +427,5 @@ sub write_timing {
 }
 
 sub fail {
-    die "Build failed, refer to:\n\t$topdir/$logfile\nfor details.\n";
+    die "Build failed, refer to:\n\t$logfile\nfor details.\n";
 }