X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=6c5a4b5eb9782e94752234879ccd509f852dd374;hb=0a04c891c69cc5851b657208c958c68d1336b977;hp=e7c819cc6dbf1792e0efe8d72ff1f66601a305c9;hpb=b65ac0f58133c7057bad96b9de7af32e06b6e21c;p=pspp diff --git a/build-pspp b/build-pspp index e7c819cc6d..6c5a4b5eb9 100755 --- a/build-pspp +++ b/build-pspp @@ -25,9 +25,6 @@ usage () if $help; die "$0: exactly one or two nonoption arguments are required\n" if @ARGV != 1 && @ARGV != 2; -my $builder = `hostname`; -chomp $builder; - # Select build number. if (!defined ($build_number)) { $build_number = POSIX::strftime("%Y%m%d%H%M%S", localtime); @@ -55,7 +52,9 @@ VARS->autoflush (1); my $logfile = "$resultsdir/LOG"; open (LOG, '>', $logfile) or die "creating $logfile failed: $!\n"; -set_var ("builder", $builder); +my $build_host = `hostname`; +chomp $build_host; +set_var ("build_host", $build_host); set_var ("build_number", $build_number); sub start_step { @@ -78,17 +77,17 @@ sub set_var { } sub saved_result { - my ($product) = @_; - start_step ("Saving $product"); + my ($name, $product) = @_; + start_step ("Saving $name: $product"); } sub save_result { - my ($src, $rm_src) = @_; + my ($name, $src, $rm_src) = @_; my ($basename) = $src; $basename =~ s(^.*/)(); my ($dst) = "$resultsdir/$basename"; - saved_result ($basename); + saved_result ($name, $basename); run ("cp -R $src $dst"); if (defined ($rm_src) && $rm_src) { @@ -99,7 +98,7 @@ sub save_result { } sub save_result_if_exists { - my ($src, $rm_src) = @_; + my ($name, $src, $rm_src) = @_; if (-e $src) { save_result (@_); } else { @@ -113,17 +112,17 @@ if (@ARGV == 2) { # 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 -)"); + start_step ("Extract branch into source directory"); + run ("git archive --format=tar --prefix=pspp$build_number/ refs/builds/$build_number/pspp | (cd $builddir && tar xf -)"); run ("git branch -D buildtmp/$$/pspp"); # Extract version number. @@ -177,6 +176,19 @@ 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 = "$builddir/pspp$build_number/README.Git"; + open (README_GIT, '<', $fullname) + or die "opening $fullname failed: $!\n"; + while () { + ($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"; @@ -191,8 +203,10 @@ if (@ARGV == 2) { print NEWFILE <) { - ($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 update-ref refs/builds/$build_number/gnulib $gnulib_commit"); # Extract gnulib source. start_step ("Extract Gnulib source"); @@ -239,18 +241,18 @@ EOF start_step ("Make source tarball"); run ("cd $builddir/pspp$build_number/_build && make dist", "dist"); my $tarname = "pspp-$version.tar.gz"; - $tarball = save_result ("$builddir/pspp$build_number/_build/$tarname", 1); + $tarball = save_result ("source distribution", "$builddir/pspp$build_number/_build/$tarname", 1); # 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"); - saved_result ("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"); - saved_result ("dev-guide"); + saved_result ("Developers Guide", "dev-guide"); } else { $tarball = $ARGV[0]; } @@ -261,14 +263,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"); @@ -278,7 +280,8 @@ if ($build_binary) { run ("chmod a-w $builddir/$tarball_dir"); my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix=''", "bin-configure"); for my $basename ("config.h", "config.log") { - save_result_if_exists ("$builddir/$tarball_dir/_build/$basename"); + save_result_if_exists ("build configuration", + "$builddir/$tarball_dir/_build/$basename"); } fail () if !$ok; @@ -290,12 +293,12 @@ if ($build_binary) { start_step ("Make binary distribution"); run ("cd $builddir/$tarball_dir/_build && tar cfz pspp-$binary_version.tar.gz pspp-$binary_version"); - save_result ("$builddir/$tarball_dir/_build/pspp-$binary_version.tar.gz", 1); + save_result ("binary distribution", "$builddir/$tarball_dir/_build/pspp-$binary_version.tar.gz", 1); start_step ("Check"); $ok = try_run ("cd $builddir/$tarball_dir/_build && make check", "check"); for my $basename ("tests/testsuite.log", "tests/testsuite.dir") { - save_result_if_exists ("$builddir/$tarball_dir/_build/$basename"); + save_result_if_exists ("test logs", "$builddir/$tarball_dir/_build/$basename"); } fail () if !$ok;