From f0d2e91284ceed838b0183733ff363d975e4cdc0 Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Sat, 24 Feb 2024 17:49:38 -0800 Subject: [PATCH 1/2] doc: fix manifest URL This commit replaces a URL that generates a "404 File not found" error in browsers. --- manifest-reference.md | 2 +- src/fpm_command_line.f90 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest-reference.md b/manifest-reference.md index 5f203f9826..45cf3e6d62 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -1,3 +1,3 @@ # 301 - Moved -This document now lives at https://fpm.fortran-lang.org/en/spec/manifest.html. +This document now lives at https://fpm.fortran-lang.org/spec/manifest.html diff --git a/src/fpm_command_line.f90 b/src/fpm_command_line.f90 index 97e2ff2975..90e6a3f0fe 100644 --- a/src/fpm_command_line.f90 +++ b/src/fpm_command_line.f90 @@ -972,7 +972,7 @@ subroutine set_help() ' + The fpm(1) home page is at https://github.com/fortran-lang/fpm ', & ' + Registered fpm(1) packages are at https://fortran-lang.org/packages ', & ' + The fpm(1) TOML file format is described at ', & - ' https://fpm.fortran-lang.org/en/spec/manifest.html ', & + ' https://fpm.fortran-lang.org/spec/manifest.html ', & ''] help_list=[character(len=80) :: & 'NAME ', & @@ -1404,10 +1404,10 @@ subroutine set_help() ' See documentation for more information regarding package upload and usage:', & '', & ' Package upload:', & - ' https://fpm.fortran-lang.org/en/spec/publish.html', & + ' https://fpm.fortran-lang.org/spec/publish.html', & '', & ' Package usage:', & - ' https://fpm.fortran-lang.org/en/spec/manifest.html#dependencies-from-a-registry', & + ' https://fpm.fortran-lang.org/spec/manifest.html#dependencies-from-a-registry', & '', & 'OPTIONS', & ' --show-package-version show package version without publishing', & From dc32c50b6bf57d88574fa5d3c5598b6c8ba14523 Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Sat, 24 Feb 2024 18:29:35 -0800 Subject: [PATCH 2/2] doc(fpm_command_line): fix help text Since version 0.8.0, fpm adds the `--flag` arguments to the default arguments. Overriding the defaults requires using the [fortran] keyword in the manifest. This commit edits the `--help` output to reflect the current behavior. --- src/fpm_command_line.f90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fpm_command_line.f90 b/src/fpm_command_line.f90 index 90e6a3f0fe..025cffa163 100644 --- a/src/fpm_command_line.f90 +++ b/src/fpm_command_line.f90 @@ -170,7 +170,8 @@ module fpm_command_line ' --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 ',& + ' are added to the defaults. To override the defaults, use the ',& + ' keyword [fortran] in the manifest. 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 ',&