tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-26 07:57:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile.am: should install distributed documentation if doc building tools does not exist.

Browse source
This commit is contained in:
Ole Tange 2014-06-13 14:30:14 +02:00
parent 2c3d409548
commit 3cb4a53ea7
10 changed files with 77 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/Makefile.am
View file

@ -2,57 +2,69 @@ bin_SCRIPTS = parallel sem sql niceload
man_MANS = parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 man_MANS = parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1
doc_DATA = parallel.html sem.html sql.html niceload.html parallel_tutorial.html parallel.texi sem.texi sql.texi niceload.texi parallel_tutorial.texi parallel.pdf sem.pdf sql.pdf niceload.pdf parallel_tutorial.pdf doc_DATA = parallel.html sem.html sql.html niceload.html parallel_tutorial.html parallel.texi sem.texi sql.texi niceload.texi parallel_tutorial.texi parallel.pdf sem.pdf sql.pdf niceload.pdf parallel_tutorial.pdf
parallel.1: parallel.pod Makefile # Build documentation file if the tool to build exists.
# Otherwise: Use the distributed version
parallel.1: parallel.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1 \ --section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1n \
&& mv $(srcdir)/parallel.1n $(srcdir)/parallel.1 \
|| echo "Warning: pod2man not found. Using old parallel.1" || echo "Warning: pod2man not found. Using old parallel.1"
parallel_tutorial.1: parallel_tutorial.pod Makefile parallel_tutorial.1: parallel_tutorial.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1 \ --section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1n \
&& mv $(srcdir)/parallel_tutorial.1n $(srcdir)/parallel_tutorial.1 \
|| echo "Warning: pod2man not found. Using old parallel_tutorial.1" || echo "Warning: pod2man not found. Using old parallel_tutorial.1"
sem.1: sem.pod Makefile sem.1: sem.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1 \ --section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1n \
&& mv $(srcdir)/sem.1n $(srcdir)/sem.1 \
|| echo "Warning: pod2man not found. Using old sem.1" || echo "Warning: pod2man not found. Using old sem.1"
sql.1: sql Makefile sql.1: sql
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/sql > $(srcdir)/sql.1 \ --section=1 $(srcdir)/sql > $(srcdir)/sql.1n \
&& mv $(srcdir)/sql.1n $(srcdir)/sql.1 \
|| echo "Warning: pod2man not found. Using old sql.1" || echo "Warning: pod2man not found. Using old sql.1"
niceload.1: niceload.pod Makefile niceload.1: niceload.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/niceload.pod > $(srcdir)/niceload.1 \ --section=1 $(srcdir)/niceload.pod > $(srcdir)/niceload.1n \
&& mv $(srcdir)/niceload.1n $(srcdir)/niceload.1 \
|| echo "Warning: pod2man not found. Using old niceload.1" || echo "Warning: pod2man not found. Using old niceload.1"
parallel.html: parallel.pod Makefile parallel.html: parallel.pod
pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.html \ pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.htmln \
&& mv $(srcdir)/parallel.htmln $(srcdir)/parallel.html \
|| echo "Warning: pod2html not found. Using old parallel.html" || echo "Warning: pod2html not found. Using old parallel.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on parallel.html to avoid stupid pod2html race condition # Depending on parallel.html to avoid stupid pod2html race condition
parallel_tutorial.html: parallel_tutorial.pod Makefile parallel.html parallel_tutorial.html: parallel_tutorial.pod parallel.html
pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.html \ pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.htmln \
&& mv $(srcdir)/parallel_tutorial.htmln $(srcdir)/parallel_tutorial.html \
|| echo "Warning: pod2html not found. Using old parallel_tutorial.html" || echo "Warning: pod2html not found. Using old parallel_tutorial.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on parallel_tutorial.html to avoid stupid pod2html race condition # Depending on parallel_tutorial.html to avoid stupid pod2html race condition
sem.html: sem.pod Makefile parallel_tutorial.html sem.html: sem.pod parallel_tutorial.html
pod2html $(srcdir)/sem.pod > $(srcdir)/sem.html \ pod2html $(srcdir)/sem.pod > $(srcdir)/sem.htmln \
&& mv $(srcdir)/sem.htmln $(srcdir)/sem.html \
|| echo "Warning: pod2html not found. Using old sem.html" || echo "Warning: pod2html not found. Using old sem.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on sem.html to avoid stupid pod2html race condition # Depending on sem.html to avoid stupid pod2html race condition
sql.html: sql Makefile sem.html sql.html: sql sem.html
pod2html $(srcdir)/sql > $(srcdir)/sql.html \ pod2html $(srcdir)/sql > $(srcdir)/sql.htmln \
&& mv $(srcdir)/sql.htmln $(srcdir)/sql.html \
|| echo "Warning: pod2html not found. Using old sql.html" || echo "Warning: pod2html not found. Using old sql.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on sql.html to avoid stupid pod2html race condition # Depending on sql.html to avoid stupid pod2html race condition
niceload.html: niceload.pod Makefile sql.html niceload.html: niceload.pod sql.html
pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.html \ pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.htmln \
&& mv $(srcdir)/niceload.htmln $(srcdir)/niceload.html \
|| echo "Warning: pod2html not found. Using old niceload.html" || echo "Warning: pod2html not found. Using old niceload.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
@ -99,7 +111,7 @@ niceload.pdf: niceload.pod
sem: parallel sem: parallel
ln -fs parallel sem ln -fs parallel sem
DISTCLEANFILES = parallel.html sem.html sql.html niceload.html parallel_tutorial.html DISTCLEANFILES =
EXTRA_DIST = parallel sem sql niceload \ EXTRA_DIST = parallel sem sql niceload \
parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 \ parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 \
parallel.html sem.html sql.html niceload.html parallel_tutorial.html \ parallel.html sem.html sql.html niceload.html parallel_tutorial.html \

48
src/Makefile.in
View file

@ -177,7 +177,7 @@ top_srcdir = @top_srcdir@
bin_SCRIPTS = parallel sem sql niceload bin_SCRIPTS = parallel sem sql niceload
man_MANS = parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 man_MANS = parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1
doc_DATA = parallel.html sem.html sql.html niceload.html parallel_tutorial.html parallel.texi sem.texi sql.texi niceload.texi parallel_tutorial.texi parallel.pdf sem.pdf sql.pdf niceload.pdf parallel_tutorial.pdf doc_DATA = parallel.html sem.html sql.html niceload.html parallel_tutorial.html parallel.texi sem.texi sql.texi niceload.texi parallel_tutorial.texi parallel.pdf sem.pdf sql.pdf niceload.pdf parallel_tutorial.pdf
DISTCLEANFILES = parallel.html sem.html sql.html niceload.html parallel_tutorial.html DISTCLEANFILES =
EXTRA_DIST = parallel sem sql niceload \ EXTRA_DIST = parallel sem sql niceload \
parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 \ parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 \
parallel.html sem.html sql.html niceload.html parallel_tutorial.html \ parallel.html sem.html sql.html niceload.html parallel_tutorial.html \
@ -489,57 +489,69 @@ uninstall-man: uninstall-man1
uninstall-man1 uninstall-man1
parallel.1: parallel.pod Makefile # Build documentation file if the tool to build exists.
# Otherwise: Use the distributed version
parallel.1: parallel.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1 \ --section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1n \
&& mv $(srcdir)/parallel.1n $(srcdir)/parallel.1 \
|| echo "Warning: pod2man not found. Using old parallel.1" || echo "Warning: pod2man not found. Using old parallel.1"
parallel_tutorial.1: parallel_tutorial.pod Makefile parallel_tutorial.1: parallel_tutorial.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1 \ --section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1n \
&& mv $(srcdir)/parallel_tutorial.1n $(srcdir)/parallel_tutorial.1 \
|| echo "Warning: pod2man not found. Using old parallel_tutorial.1" || echo "Warning: pod2man not found. Using old parallel_tutorial.1"
sem.1: sem.pod Makefile sem.1: sem.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1 \ --section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1n \
&& mv $(srcdir)/sem.1n $(srcdir)/sem.1 \
|| echo "Warning: pod2man not found. Using old sem.1" || echo "Warning: pod2man not found. Using old sem.1"
sql.1: sql Makefile sql.1: sql
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/sql > $(srcdir)/sql.1 \ --section=1 $(srcdir)/sql > $(srcdir)/sql.1 \
&& mv $(srcdir)/sql.1n $(srcdir)/sql.1 \
|| echo "Warning: pod2man not found. Using old sql.1" || echo "Warning: pod2man not found. Using old sql.1"
niceload.1: niceload.pod Makefile niceload.1: niceload.pod
pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \
--section=1 $(srcdir)/niceload.pod > $(srcdir)/niceload.1 \ --section=1 $(srcdir)/niceload.pod > $(srcdir)/niceload.1 \
&& mv $(srcdir)/niceload.1n $(srcdir)/niceload.1 \
|| echo "Warning: pod2man not found. Using old niceload.1" || echo "Warning: pod2man not found. Using old niceload.1"
parallel.html: parallel.pod Makefile parallel.html: parallel.pod
pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.html \ pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.htmln \
&& mv $(srcdir)/parallel.htmln $(srcdir)/parallel.html \
|| echo "Warning: pod2html not found. Using old parallel.html" || echo "Warning: pod2html not found. Using old parallel.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on parallel.html to avoid stupid pod2html race condition # Depending on parallel.html to avoid stupid pod2html race condition
parallel_tutorial.html: parallel_tutorial.pod Makefile parallel.html parallel_tutorial.html: parallel_tutorial.pod Makefile parallel.html
pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.html \ pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.htmln \
&& mv $(srcdir)/parallel_tutorial.htmln $(srcdir)/parallel_tutorial.html \
|| echo "Warning: pod2html not found. Using old parallel_tutorial.html" || echo "Warning: pod2html not found. Using old parallel_tutorial.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on parallel_tutorial.html to avoid stupid pod2html race condition # Depending on parallel_tutorial.html to avoid stupid pod2html race condition
sem.html: sem.pod Makefile parallel_tutorial.html sem.html: sem.pod parallel_tutorial.html
pod2html $(srcdir)/sem.pod > $(srcdir)/sem.html \ pod2html $(srcdir)/sem.pod > $(srcdir)/sem.htmln \
&& mv $(srcdir)/sem.htmln $(srcdir)/sem.html \
|| echo "Warning: pod2html not found. Using old sem.html" || echo "Warning: pod2html not found. Using old sem.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on sem.html to avoid stupid pod2html race condition # Depending on sem.html to avoid stupid pod2html race condition
sql.html: sql Makefile sem.html sql.html: sql sem.html
pod2html $(srcdir)/sql > $(srcdir)/sql.html \ pod2html $(srcdir)/sql > $(srcdir)/sql.htmln \
&& mv $(srcdir)/sql.htmln $(srcdir)/sql.html \
|| echo "Warning: pod2html not found. Using old sql.html" || echo "Warning: pod2html not found. Using old sql.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*
# Depending on sql.html to avoid stupid pod2html race condition # Depending on sql.html to avoid stupid pod2html race condition
niceload.html: niceload.pod Makefile sql.html niceload.html: niceload.pod sql.html
pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.html \ pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.htmln \
&& mv $(srcdir)/niceload.htmln $(srcdir)/niceload.html \
|| echo "Warning: pod2html not found. Using old niceload.html" || echo "Warning: pod2html not found. Using old niceload.html"
rm -f $(srcdir)/pod2htm* rm -f $(srcdir)/pod2htm*

2
src/niceload
View file

@ -24,7 +24,7 @@
use strict; use strict;
use Getopt::Long; use Getopt::Long;
$Global::progname="niceload"; $Global::progname="niceload";
$Global::version = 20140522; $Global::version = 20140613;
Getopt::Long::Configure("bundling","require_order"); Getopt::Long::Configure("bundling","require_order");
get_options_from_array(\@ARGV) || die_usage(); get_options_from_array(\@ARGV) || die_usage();
if($opt::version) { if($opt::version) {

2
src/parallel
View file

@ -748,7 +748,7 @@ sub get_options_from_array {
sub parse_options { sub parse_options {
# Returns: N/A # Returns: N/A
# Defaults: # Defaults:
$Global::version = 20140522; $Global::version = 20140613;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;

BIN
src/parallel.pdf
View file

Binary file not shown.

4
src/parallel.pod
View file

@ -2328,6 +2328,10 @@ If the login username is I<foo> on I<server2.example.net> use:
seq 10 | parallel --sshlogin server.example.com \ seq 10 | parallel --sshlogin server.example.com \
--sshlogin foo@server2.example.net echo --sshlogin foo@server2.example.net echo
If your list of hosts is I<server1-88.example.net> with login I<foo>:
seq 10 | parallel -Sfoo@server{1..88}.example.net echo
To distribute the commands to a list of computers, make a file To distribute the commands to a list of computers, make a file
I<mycomputers> with all the computers: I<mycomputers> with all the computers:

6
src/parallel.texi
View file

@ -2562,6 +2562,12 @@ If the login username is @emph{foo} on @emph{server2.example.net} use:
--sshlogin foo@server2.example.net echo --sshlogin foo@server2.example.net echo
@end verbatim @end verbatim
If your list of hosts is @emph{server1-88.example.net} with login @emph{foo}:
@verbatim
seq 10 | parallel -Sfoo@server{1..88}.example.net echo
@end verbatim
To distribute the commands to a list of computers, make a file To distribute the commands to a list of computers, make a file
@emph{mycomputers} with all the computers: @emph{mycomputers} with all the computers:

2
src/parallel_tutorial.1
View file

@ -124,7 +124,7 @@
.\" ======================================================================== .\" ========================================================================
.\" .\"
.IX Title "PARALLEL_TUTORIAL 1" .IX Title "PARALLEL_TUTORIAL 1"
.TH PARALLEL_TUTORIAL 1 "2014-06-04" "20140522" "parallel" .TH PARALLEL_TUTORIAL 1 "2014-06-13" "20140522" "parallel"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents. .\" way too many mistakes in technical documents.
.if n .ad l .if n .ad l

2
src/sql
View file

@ -566,7 +566,7 @@ $Global::Initfile && unlink $Global::Initfile;
exit ($err); exit ($err);
sub parse_options { sub parse_options {
$Global::version = 20140522; $Global::version = 20140613;
$Global::progname = 'sql'; $Global::progname = 'sql';
# This must be done first as this may exec myself # This must be done first as this may exec myself

BIN
src/sql.pdf
View file

Binary file not shown.