#! /usr/bin/env perl
use Cwd;
+use File::Basename;
use File::Spec;
use Getopt::Long qw(:config bundling no_ignore_case);
use IO::Handle;
my $batch = 0;
my $builddir;
my $build_number;
+my $builder = `hostname`;
+chomp $builder;
GetOptions ("h|help" => \$help,
"binary!" => \$build_binary,
"batch!" => \$batch,
"o|output=s" => \$builddir,
+ "builder=s" => \$builder,
"build-number=i" => \$build_number);
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";
our $logfile = "$resultsdir/LOG";
open (LOG, '>', $logfile) or die "creating $logfile failed: $!\n";
-my $build_host = `hostname`;
-chomp $build_host;
-set_var ("build_host", $build_host);
+set_var ("builder", $builder);
set_var ("build_number", $build_number);
+our $GIT = "git --git-dir=$topdir/.git";
+
sub start_step {
my ($msg) = @_;
print LOG "\f\n$msg\n";
}
}
-my $tarball;
+sub ref_to_commit {
+ my ($ref) = @_;
+ my $commit = `$GIT rev-parse $ref`;
+ chomp $commit;
+ return $commit;
+}
+
+my $ssw = "spread-sheet-widget-0.1";
if (@ARGV == 2) {
my ($repo, $branch) = @ARGV;
- # Fetch branch
- start_step ("Fetch $repo, branch $branch");
- run ("git fetch $repo +$branch:refs/builds/$build_number/pspp");
+ my $ssw_tar = "$topdir/$ssw.tar.gz";
+ start_step ("Extract spread-sheet-widget");
+ run ("tar xzf $ssw_tar");
+
+ start_step ("Configure spread-sheet-widget");
+ run ("cd $ssw && ./configure --prefix=''");
+
+ start_step ("Build spread-sheet-widget");
+ run ("cd $ssw && make -j10");
+
+ start_step ("Install spread-sheet-widget");
+ run ("cd $ssw && make -j10 install DESTDIR=\$PWD/inst");
+
+ 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 | (cd $builddir && 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 $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/) {
}
}
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
# 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")
# Get Gnulib commit number.
start_step ("Reading README.Git to find Gnulib commit number");
my $gnulib_commit;
- $fullname = "$builddir/pspp$build_number/README.Git";
+ $fullname = "pspp/README.Git";
open (README_GIT, '<', $fullname)
or die "opening $fullname failed: $!\n";
while (<README_GIT>) {
# 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")
Changes from $repo_version to $version:
* Built from PSPP commit $revision
- in branch $branch on host $build_host.
+ in branch $branch on builder $builder.
* Built from Gnulib commit $gnulib_commit.
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 fetch gnulib");
}
- run ("git update-ref refs/builds/$build_number/gnulib $gnulib_commit");
+ 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");
- 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 -j10", "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 PKG_CONFIG_PATH=\$PWD/../../../source/$ssw/inst/lib/pkgconfig", "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 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 $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 && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texi -I doc -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.texi -I doc -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];
+ start_step ("Starting from $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%^(?:[./])*([^/]+)/%;
my ($version) = `cd $builddir/$tarball_dir && ./configure --version | head -1`
=~ /configure (\S+)$/;
set_var ("dist_version", $version);
- my ($binary_version) = "$version-$build_host-build$build_number";
+ my ($binary_version) = "$version-$builder-build$build_number";
set_var ("binary_version", $binary_version);
start_step ("Configuring");
run ("chmod u+w $builddir/$tarball_dir");
run ("mkdir $builddir/$tarball_dir/_build");
run ("chmod a-w $builddir/$tarball_dir");
- my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix=''", "bin-configure");
+ my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix='' PKG_CONFIG_PATH=\$PWD/../../../source/$ssw/inst/lib/pkgconfig CPPFLAGS=\"-I\$PWD/../../../source/$ssw/inst/include\" LDFLAGS=\"-L\$PWD/../../../source/$ssw/inst/lib\"", "bin-configure");
for my $basename ("config.h", "config.log") {
save_result_if_exists ("build configuration",
"$builddir/$tarball_dir/_build/$basename");
fail () if !$ok;
start_step ("Build");
- run ("cd $builddir/$tarball_dir/_build && make", "build");
+ run ("cd $builddir/$tarball_dir/_build && make -j10", "build");
start_step ("Install");
run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version", "install");
+ run ("cd ../source/$ssw && make -j10 install DESTDIR=$builddir/$tarball_dir/_build/pspp-$binary_version");
start_step ("Make binary distribution");
run ("cd $builddir/$tarball_dir/_build && tar cfz pspp-$binary_version.tar.gz pspp-$binary_version");
fail () if !$ok;
start_step ("Uninstall");
+ run ("cd ../source/$ssw && make -j10 uninstall DESTDIR=$builddir/$tarball_dir/_build/pspp-$binary_version");
run ("cd $builddir/$tarball_dir/_build && make uninstall DESTDIR=\$PWD/pspp-$binary_version", "uninstall");
start_step ("Check uninstall");
}
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