From 9fc759a1821df5a11bde1e48f0f09aca39130f1f Mon Sep 17 00:00:00 2001 From: "John S. Urban" Date: Fri, 12 Nov 2021 15:33:27 -0500 Subject: white-space adjustments to help to conform to txt2man(1) utility A few lines in the help text no longer conformed to the rules used by txt2man(1), causing errors in generating man-pages and an HTML version of the documentation available via the "help" subcommand. --- src/fpm_command_line.f90 | 61 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/src/fpm_command_line.f90 b/src/fpm_command_line.f90 index 4fce58a..ed99e58 100644 --- a/src/fpm_command_line.f90 +++ b/src/fpm_command_line.f90 @@ -121,26 +121,25 @@ character(len=:), allocatable :: val_runner, val_compiler, val_flag, val_cflag, ! '12345678901234567890123456789012345678901234567890123456789012345678901234567890',& character(len=80), parameter :: help_text_compiler(*) = [character(len=80) :: & - ' --compiler NAME Specify a compiler name. The default is "gfortran"',& - ' unless set by the environment variable FPM_FC.',& - ' --c-compiler NAME Specify the C compiler name. Automatically determined by ',& - ' default unless set by the environment variable FPM_CC.',& - ' --archiver NAME Specify the archiver name. Automatically determined by ',& - ' default unless set by the environment variable FPM_AR.'& + ' --compiler NAME Specify a compiler name. The default is "gfortran" ',& + ' unless set by the environment variable FPM_FC. ',& + ' --c-compiler NAME Specify the C compiler name. Automatically determined by ',& + ' default unless set by the environment variable FPM_CC. ',& + ' --archiver NAME Specify the archiver name. Automatically determined by ',& + ' default unless set by the environment variable FPM_AR. '& ] +! '12345678901234567890123456789012345678901234567890123456789012345678901234567890',& character(len=80), parameter :: help_text_flag(*) = [character(len=80) :: & - ' --flag FFLAGS selects compile arguments for the build, the default',& - ' value is set by the FPM_FFLAGS environment variable.', & - ' These are added to the profile options if --profile', & - ' is specified, else these options override the defaults.',& - ' Note object and .mod directory locations are always',& - ' built in.',& + ' --flag FFLAGS selects compile arguments for the build, the default value is',& + ' set by the FPM_FFLAGS environment variable. These are added ',& + ' to the profile options if --profile is specified, else these ',& + ' these options override the defaults. Note object and .mod ',& + ' directory locations are always built in. ',& ' --c-flag CFLAGS selects compile arguments specific for C source in the build.',& - ' The default value is set by the FPM_CFLAGS environment',& - ' variable.',& - ' --link-flag LDFLAGS',& - ' select arguments passed to the linker for the build. The',& + ' The default value is set by the FPM_CFLAGS environment ',& + ' variable. ',& + ' --link-flag LDFLAGS select arguments passed to the linker for the build. The ',& ' default value is set by the FPM_LDFLAGS environment variable.'& ] @@ -705,15 +704,15 @@ contains 'SUBCOMMANDS ', & ' Valid fpm(1) subcommands are: ', & ' ', & - ' + build Compile the packages into the "build/" directory. ', & - ' + new Create a new Fortran package directory with sample files. ', & - ' + update Update the project dependencies. ', & - ' + run Run the local package binaries. defaults to all binaries for ', & - ' that release. ', & - ' + test Run the tests. ', & - ' + help Alternate to the --help switch for displaying help text. ', & - ' + list Display brief descriptions of all subcommands. ', & - ' + install Install project ', & + ' + build Compile the packages into the "build/" directory. ', & + ' + new Create a new Fortran package directory with sample files. ', & + ' + update Update the project dependencies. ', & + ' + run Run the local package binaries. defaults to all binaries ', & + ' for that release. ', & + ' + test Run the tests. ', & + ' + help Alternate to the --help switch for displaying help text. ', & + ' + list Display brief descriptions of all subcommands. ', & + ' + install Install project ', & ' ', & ' Their syntax is ', & ' ', & @@ -758,7 +757,7 @@ contains ' directory. ', & ' ', & ' If "file" does not exist or cannot be read, then an error occurs and', & - ' the program stops. Each line of the file is prefixed with "options"', & + ' the program stops. Each line of the file is prefixed with "options" ', & ' and interpreted as a separate argument. The file itself may not ', & ' contain @file arguments. That is, it is not processed recursively. ', & ' ', & @@ -932,11 +931,11 @@ contains ' default. ',& help_text_compiler, & help_text_flag, & - ' --list list candidates instead of building or running them ', & - ' --tests build all tests (otherwise only if needed) ', & - ' --show-model show the model and exit (do not build) ', & - ' --help print this help and exit ', & - ' --version print program version information and exit ', & + ' --list list candidates instead of building or running them ', & + ' --tests build all tests (otherwise only if needed) ', & + ' --show-model show the model and exit (do not build) ', & + ' --help print this help and exit ', & + ' --version print program version information and exit ', & ' ', & help_text_environment, & ' ', & -- cgit v1.2.3