projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove $build_number from name of directory for building source distribution
[pspp]
/
build-pspp
diff --git
a/build-pspp
b/build-pspp
index d7983fd6d3c761ed28a6b736f876ba3a36ef772e..ce153b3024b74f97aa565b4b37bebd2675290627 100755
(executable)
--- a/
build-pspp
+++ b/
build-pspp
@@
-132,11
+132,11
@@
if (@ARGV == 2) {
# Extract source.
start_step ("Extract branch into source directory");
# Extract source.
start_step ("Extract branch into source directory");
- run ("$GIT archive --format=tar --prefix=pspp
$build_number
/ refs/builds/$build_number/pspp | 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");
# Extract version number.
start_step ("Extract repository version number");
- my $trace = `cd 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);
chomp $trace;
my ($file, $line, $macro, $package, $repo_version, @rest)
= split (':', $trace);
@@
-144,7
+144,7
@@
if (@ARGV == 2) {
# Is this a "gnits" mode tree?
start_step ("Checking Automake mode");
# Is this a "gnits" mode tree?
start_step ("Checking Automake mode");
- open (MAKEFILE_AM, '<', "pspp
$build_number
/Makefile.am");
+ open (MAKEFILE_AM, '<', "pspp/Makefile.am");
my $am_mode = "gnu";
while (<MAKEFILE_AM>) {
if (/gnits/) {
my $am_mode = "gnu";
while (<MAKEFILE_AM>) {
if (/gnits/) {
@@
-166,7
+166,7
@@
if (@ARGV == 2) {
# Append -g012345 to configure.ac version number.
start_step ("Updating version number in $file");
# Append -g012345 to configure.ac version number.
start_step ("Updating version number in $file");
- my $fullname = "pspp
$build_number
/$file";
+ my $fullname = "pspp/$file";
open (OLDFILE, '<', $fullname)
or die "opening $fullname failed: $!\n";
open (NEWFILE, '>', "$fullname.new")
open (OLDFILE, '<', $fullname)
or die "opening $fullname failed: $!\n";
open (NEWFILE, '>', "$fullname.new")
@@
-188,7
+188,7
@@
if (@ARGV == 2) {
# Get Gnulib commit number.
start_step ("Reading README.Git to find Gnulib commit number");
my $gnulib_commit;
# Get Gnulib commit number.
start_step ("Reading README.Git to find Gnulib commit number");
my $gnulib_commit;
- $fullname = "pspp
$build_number
/README.Git";
+ $fullname = "pspp/README.Git";
open (README_GIT, '<', $fullname)
or die "opening $fullname failed: $!\n";
while (<README_GIT>) {
open (README_GIT, '<', $fullname)
or die "opening $fullname failed: $!\n";
while (<README_GIT>) {
@@
-200,7
+200,7
@@
if (@ARGV == 2) {
# Add note to beginning of NEWS (otherwise "make dist" fails).
start_step ("Updating NEWS");
# Add note to beginning of NEWS (otherwise "make dist" fails).
start_step ("Updating NEWS");
- $fullname = "pspp
$build_number
/NEWS";
+ $fullname = "pspp/NEWS";
open (OLDFILE, '<', $fullname)
or die "opening $fullname failed: $!\n";
open (NEWFILE, '>', "$fullname.new")
open (OLDFILE, '<', $fullname)
or die "opening $fullname failed: $!\n";
open (NEWFILE, '>', "$fullname.new")
@@
-240,28
+240,28
@@
EOF
# Bootstrap.
start_step ("Bootstrap (make -f Smake)");
# Bootstrap.
start_step ("Bootstrap (make -f Smake)");
- run ("cd pspp
$build_number
&& make -f Smake", "bootstrap");
+ run ("cd pspp && make -f Smake", "bootstrap");
# Configure.
start_step ("Configure source");
# Configure.
start_step ("Configure source");
- run ("cd pspp
$build_number
&& mkdir _build && cd _build && ../configure", "configure");
+ run ("cd pspp && mkdir _build && cd _build && ../configure", "configure");
# Distribute.
start_step ("Make source tarball");
# Distribute.
start_step ("Make source tarball");
- run ("cd pspp
$build_number
/_build && make dist", "dist");
+ run ("cd pspp/_build && make dist", "dist");
my $tarname = "pspp-$version.tar.gz";
my $tarname = "pspp-$version.tar.gz";
- $tarball = save_result ("source distribution", "pspp
$build_number
/_build/$tarname", 1);
- save_result ("translation templates", "pspp
$build_number
/_build/po/pspp.pot");
+ $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");
# Build user manual
start_step ("Build user manual");
- run ("cd pspp
$build_number
&& cp _build/doc/*.texi doc/");
- run ("cd pspp
$build_number
&& 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 && 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");
saved_result ("User Manual", "user-manual");
# Build developer's guide
start_step ("Build developers guide");
- run ("cd pspp
$build_number
&& 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 -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");
}