diff options
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | PACKAGING.md | 6 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | fpm/src/fpm_command_line.f90 | 14 | ||||
| -rw-r--r-- | manifest-reference.md | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9a1f5a3..b74aeda 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,7 +77,7 @@ decisions. This is the workflow that we follow: one person disagrees. At this stage, the scope of the fix/feature, its behavior, and API if applicable should be defined. - Only when you have community concensus on these items you should proceed to + Only when you have community consensus on these items you should proceed to writing code and opening a PR. **When actively working on code towards a PR, please assign yourself to the issue on GitHub.** diff --git a/PACKAGING.md b/PACKAGING.md index 44a0c02..663db62 100644 --- a/PACKAGING.md +++ b/PACKAGING.md @@ -177,7 +177,7 @@ Based on the output of `fpm build`, *fpm* first ran `gfortran` to emit the binary object (`math_constants.o`) and module (`math_constants.mod`) files. Then it ran `ar` to create a static library archive `math_constants.a`. `build/debug/library` is thus both your include and library path, should you -want to compile and link an exteranl program with this library. +want to compile and link an external program with this library. For modules in the top-level (`src`) directory, *fpm* requires that: @@ -585,7 +585,7 @@ And now, `fpm run` will output the following: ``` Additionally, any users of your library will now automatically depend on your -dependencies too. So if you don’t need that depedency for the library, like in +dependencies too. So if you don’t need that dependency for the library, like in the above example, then you can specify it for the specific executable like below. Then fpm will still fetch and compile it when building your executable, but users of your library won’t have to. @@ -677,7 +677,7 @@ the build script: * `FC` – The Fortran compiler to be used. * `FFLAGS` – The flags that should be passed to the Fortran compiler. * `BUILD_DIR` – Where the compiled files should be placed. -* `INCLUDE_DIRS` – The folders where any dependencies can be found, space seperated. +* `INCLUDE_DIRS` – The folders where any dependencies can be found, space separated. It is then the responsibility of the build script to generate the appropriate include flags. @@ -63,7 +63,7 @@ with the following contents and initialized as a git repository. * `fpm.toml` – with your project’s name and some default standard meta-data * `README.md` – with your project’s name -* `.gitgnore` +* `.gitignore` * `src/project_name.f90` – with a simple hello world subroutine * `app/main.f90` (if `--with-executable` flag used) – a program that calls the subroutine * `test/main.f90` (if `--with-test` flag used) – an empty test program diff --git a/fpm/src/fpm_command_line.f90 b/fpm/src/fpm_command_line.f90 index 339db4f..cb4c65a 100644 --- a/fpm/src/fpm_command_line.f90 +++ b/fpm/src/fpm_command_line.f90 @@ -99,7 +99,7 @@ contains select case(trim(cmdarg)) case('run') - call set_args('--list:l F --release:r F --runner:c " " --',help_run,version_text) + call set_args('--list F --release F --runner " " --',help_run,version_text) if( size(unnamed) .gt. 1 )then names=unnamed(2:) @@ -112,14 +112,14 @@ contains & release=lget('release'), args=remaining ,runner=sget('runner') ) case('build') - call set_args( '--release:r F --list:l F --',help_build,version_text ) + call set_args( '--release F --list F --',help_build,version_text ) allocate( fpm_build_settings :: cmd_settings ) cmd_settings=fpm_build_settings( release=lget('release'), & & list=lget('list') ) case('new') - call set_args(' --src:s F --lib:l F --app:a F --test:t F --backfill:b F', & + call set_args(' --src F --lib F --app F --test F --backfill F', & & help_new, version_text) select case(size(unnamed)) case(1) @@ -205,17 +205,17 @@ contains call printhelp(help_text) case('install') - call set_args('--release:r F ', help_install, version_text) + call set_args('--release F ', help_install, version_text) allocate(fpm_install_settings :: cmd_settings) case('list') - call set_args(' --list:l F', help_list, version_text) + call set_args(' --list F', help_list, version_text) call printhelp(help_list_nodash) if(lget('list'))then call printhelp(help_list_dash) endif case('test') - call set_args('--list:l F --release:r F --runner:c " " --',help_test,version_text) + call set_args('--list F --release F --runner " " --',help_test,version_text) if( size(unnamed) .gt. 1 )then names=unnamed(2:) @@ -230,7 +230,7 @@ contains case default - call set_args(' --list:l F', help_fpm, version_text) + call set_args(' --list F', help_fpm, version_text) ! Note: will not get here if --version or --usage or --help ! is present on commandline help_text=help_usage diff --git a/manifest-reference.md b/manifest-reference.md index 63a533f..f1394cb 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -131,7 +131,7 @@ copyright = "Copyright 2020 Jane Doe" ## Project description -The decription provides a short summary on the project. +The description provides a short summary on the project. It should be plain text and not using any markup formatting. *Example:* @@ -184,7 +184,7 @@ Library targets are exported and useable for other projects. Defines the exported library target of the project. A library is generated if the source directory is found in a project. -The default source directory is ``src`` but can be modifed in the *library* section using the *source-dir* entry. +The default source directory is ``src`` but can be modified in the *library* section using the *source-dir* entry. Paths for the source directory are given relative to the project root and use ``/`` as path separator on all platforms. *Example:* @@ -199,7 +199,7 @@ source-dir = "lib" > Supported in Bootstrap fpm only Projects with custom build scripts can specify those in the *build-script* entry. -The custom build script will be executeted when the library build step is reached. +The custom build script will be executed when the library build step is reached. *Example:* |