projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-pspp: Do parallel build.
[pspp]
/
build-pspp
diff --git
a/build-pspp
b/build-pspp
index ce153b3024b74f97aa565b4b37bebd2675290627..811a39f33defc373e8b70d96176e6f9306dded0e 100755
(executable)
--- a/
build-pspp
+++ b/
build-pspp
@@
-66,6
+66,8
@@
chomp $build_host;
set_var ("build_host", $build_host);
set_var ("build_number", $build_number);
set_var ("build_host", $build_host);
set_var ("build_number", $build_number);
+our $GIT = "git --git-dir=$topdir/.git";
+
sub start_step {
my ($msg) = @_;
print LOG "
\f
\n$msg\n";
sub start_step {
my ($msg) = @_;
print LOG "
\f
\n$msg\n";
@@
-115,18
+117,24
@@
sub save_result_if_exists {
}
}
}
}
-my $GIT = "git --git-dir=$topdir/.git";
+sub ref_to_commit {
+ my ($ref) = @_;
+ my $commit = `$GIT rev-parse $ref`;
+ chomp $commit;
+ return $commit;
+}
if (@ARGV == 2) {
my ($repo, $branch) = @ARGV;
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.
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);
set_var ("pspp_commit", $revision);
my $abbrev_commit = substr ($revision, 0, 6);
@@
-153,7
+161,7
@@
if (@ARGV == 2) {
}
}
close (MAKEFILE_AM);
}
}
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
# Generate version number for build.
# We want to append -g012345, but if we're in Gnits mode and the
@@
-227,12
+235,13
@@
EOF
or die "rename $fullname.new to $fullname failed: $!\n";
# If we don't already have that Gnulib commit, update Gnulib.
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 update-ref refs/builds/$build_number/gnulib $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");
+ set_var ("gnulib_ref", "refs/builds/$build_number/gnulib");
# Extract gnulib source.
start_step ("Extract Gnulib source");
# Extract gnulib source.
start_step ("Extract Gnulib source");
@@
-251,23
+260,30
@@
EOF
run ("cd pspp/_build && make dist", "dist");
my $tarname = "pspp-$version.tar.gz";
$tarball = save_result ("source distribution", "pspp/_build/$tarname", 1);
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");
# Build user manual
start_step ("Build 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");
+ run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -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");
saved_result ("User Manual", "user-manual");
# Build developer's guide
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");
+ run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -
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");
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");
}
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`;
start_step ("Determining $tarball target directory");
my $sample_filename = `zcat $tarball | tar tf - | head -1`;
@@
-297,7
+313,7
@@
if ($build_binary) {
fail () if !$ok;
start_step ("Build");
fail () if !$ok;
start_step ("Build");
- run ("cd $builddir/$tarball_dir/_build && make", "build");
+ run ("cd $builddir/$tarball_dir/_build && make
-j2
", "build");
start_step ("Install");
run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version", "install");
start_step ("Install");
run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version", "install");