projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-pspp: Use -I flag to newer gendocs.sh to copy HTML image files.
[pspp]
/
build-pspp
diff --git
a/build-pspp
b/build-pspp
index 2fff2c853ec2cb693b7fb53c93e1edc5df056a83..6c1a30dc9bc422a61ac5e77e4bd9f0765dab8b11 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";
@@
-122,8
+124,6
@@
sub ref_to_commit {
return $commit;
}
return $commit;
}
-my $GIT = "git --git-dir=$topdir/.git";
-
if (@ARGV == 2) {
my ($repo, $branch) = @ARGV;
if (@ARGV == 2) {
my ($repo, $branch) = @ARGV;
@@
-235,7
+235,7
@@
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 > /dev/null");
+ system ("$GIT rev-parse --verify --quiet $gnulib_commit
^0
> /dev/null");
if ($? != 0) {
start_step ("Updating Gnulib to obtain commit");
run ("$GIT fetch gnulib");
if ($? != 0) {
start_step ("Updating Gnulib to obtain commit");
run ("$GIT fetch gnulib");
@@
-268,13
+268,12
@@
EOF
# 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");
} else {
$tarball = saved_result ("source distribution", $tarball);
saved_result ("Developers Guide", "dev-guide");
} else {
$tarball = saved_result ("source distribution", $tarball);
@@
-286,6
+285,11
@@
if ($build_binary) {
set_var ("dist_ref", "refs/builds/$build_number/dist");
set_var ("dist_commit", ref_to_commit ("refs/builds/$build_number/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%^(?:[./])*([^/]+)/%;
+ set_var ("dist_dir", $tarball_dir);
+
start_step ("Extracting source tarball");
run ("zcat $tarball | (cd $builddir && tar xf -)");
start_step ("Extracting source tarball");
run ("zcat $tarball | (cd $builddir && tar xf -)");