#! /usr/bin/env perl
use Cwd;
+use File::Basename;
use File::Spec;
use Getopt::Long qw(:config bundling no_ignore_case);
use IO::Handle;
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`;
}
}
-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/ 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 && autoconf -t AC_INIT`;
chomp $trace;
my ($file, $line, $macro, $package, $repo_version, @rest)
= split (':', $trace);
# Is this a "gnits" mode tree?
start_step ("Checking Automake mode");
- open (MAKEFILE_AM, '<', "$builddir/pspp$build_number/Makefile.am");
+ open (MAKEFILE_AM, '<', "pspp/Makefile.am");
my $am_mode = "gnu";
while (<MAKEFILE_AM>) {
if (/gnits/) {
# Append -g012345 to configure.ac version number.
start_step ("Updating version number in $file");
- my $fullname = "$builddir/pspp$build_number/$file";
+ my $fullname = "pspp/$file";
open (OLDFILE, '<', $fullname)
or die "opening $fullname failed: $!\n";
open (NEWFILE, '>', "$fullname.new")
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/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/NEWS";
open (OLDFILE, '<', $fullname)
or die "opening $fullname failed: $!\n";
open (NEWFILE, '>', "$fullname.new")
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
}
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 && make -f Smake", "bootstrap");
# Configure.
start_step ("Configure source");
- run ("cd $builddir/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 $builddir/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", "$builddir/pspp$build_number/_build/$tarname", 1);
+ $tarball = save_result ("source distribution", "pspp/_build/$tarname", 1);
+ save_result ("translation templates", "pspp/_build/po/pspp.pot");
# 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 && 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 $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 && 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) {
+ 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);
- 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");
}
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";
}
projects / pspp / blobdiff