}
}
+sub ref_to_commit {
+ my ($ref) = @_;
+ my $commit = `$GIT rev-parse $ref`;
+ chomp $commit;
+ return $commit;
+}
+
my $GIT = "git --git-dir=$topdir/.git";
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);
}
}
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
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 > /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");
run ("cd pspp/_build && make dist", "dist");
my $tarname = "pspp-$version.tar.gz";
$tarball = save_result ("source distribution", "pspp/_build/$tarname", 1);
- save_result ("translation templates", "pspp/_build/po/pspp.pot");
+
+ # 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");
start_step ("Build developers 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");
-
- 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);
+ set_var ("dist_ref", "refs/builds/$build_number/dist");
+ set_var ("dist_commit", ref_to_commit ("refs/builds/$build_number/dist"));
start_step ("Extracting source tarball");
run ("zcat $tarball | (cd $builddir && tar xf -)");