From 9bf1e32b9b711bbe868df05bfc6327f891f76be7 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Mon, 5 Oct 2020 15:05:30 +0200 Subject: [PATCH 1/4] Add fpm package manifest - support usage of functional-fortran with fpm - does not support testing due to shortcomings of bootstrap fpm --- fpm.toml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 fpm.toml diff --git a/fpm.toml b/fpm.toml new file mode 100644 index 0000000..4370b10 --- /dev/null +++ b/fpm.toml @@ -0,0 +1,6 @@ +name = "functional-fortran" +version = "0.5.0" +license = "BSD-3-Clause" + +[library] +source-dir = "src/lib" From 500f687fcaaba324fbb55892bc725fd09295b4b2 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Mon, 5 Oct 2020 16:23:04 +0200 Subject: [PATCH 2/4] Add fpm support to README and update fpm.toml - match datetime-fortran's fpm.toml --- README.md | 8 ++++++++ fpm.toml | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ed25c89..0668a42 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,14 @@ Start using functional-fortran in your code by including the module: use mod_functional ``` +This project also supports the Fortran Package Manager ([fpm](https://github.com/fortran-lang/fpm)). +Just add functional-fortran to your `fpm.toml`: +```toml +[dependencies] +[dependencies.functional] +git = "https://github.com/wavebitscientific/functional-fortran" +``` + ## Why functional-fortran? While not designed as a purely functional programming language, diff --git a/fpm.toml b/fpm.toml index 4370b10..c894569 100644 --- a/fpm.toml +++ b/fpm.toml @@ -1,6 +1,9 @@ -name = "functional-fortran" +name = "functional" version = "0.5.0" license = "BSD-3-Clause" +author = "Milan Curcic" +maintainer = "mcurcic@wavebitscientific.com" +copyright = "Copyright (c) 2016-2020, Milan Curcic" [library] source-dir = "src/lib" From 28f4a8fa3f4162f308fdfc9f4fdd99defe4a3e49 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Mon, 5 Oct 2020 16:42:12 +0200 Subject: [PATCH 3/4] Include contributors in copyright entry Co-authored-by: Milan Curcic --- fpm.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fpm.toml b/fpm.toml index c894569..397e529 100644 --- a/fpm.toml +++ b/fpm.toml @@ -3,7 +3,7 @@ version = "0.5.0" license = "BSD-3-Clause" author = "Milan Curcic" maintainer = "mcurcic@wavebitscientific.com" -copyright = "Copyright (c) 2016-2020, Milan Curcic" +copyright = "Copyright (c) 2016-2020, functional-fortran contributors" [library] source-dir = "src/lib" From 172781376299ee8344e9ffb2de5e8365b1b1d60c Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Mon, 5 Oct 2020 16:51:12 +0200 Subject: [PATCH 4/4] Consistent copyright notice in license and package manifest --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3288525..da2d51d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2018, Milan Curcic +Copyright (c) 2016-2020, functional-fortran contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: