Skip to content

Commit 1c1fa76

Browse files
committed
rename to csv-fortran
Fixes #34
1 parent b70cc86 commit 1c1fa76

10 files changed

+46
-46
lines changed

.github/workflows/CI.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777

7878
- name: Build documentation
7979
if: contains( matrix.gcc_v, 10 )
80-
run: ford ./fortran-csv-module.md
80+
run: ford ./ford.md
8181

8282
- name: Deploy Documentation
8383
if: contains( matrix.gcc_v, 10 ) && github.ref == 'refs/heads/master'

CMakeLists.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cmake_policy(SET CMP0053 NEW)
88
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
99

1010
# Set package metadata
11-
set(CPACK_PACKAGE_NAME "fortran-csv-module")
11+
set(CPACK_PACKAGE_NAME "csv-fortran")
1212
set(CPACK_PACKAGE_VERSION_MAJOR "1")
1313
set(CPACK_PACKAGE_VERSION_MINOR "3")
1414
set(CPACK_PACKAGE_VERSION_PATCH "1")
@@ -18,7 +18,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A modern Fortran library for reading and
1818
# set(CPACK_PACKAGE_VENDOR "")
1919
set(CPACK_PACKAGE_CONTACT "Jacob Williams")
2020
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
21-
set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/jacobwilliams/fortran-csv-module")
21+
set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/jacobwilliams/csv-fortran")
2222
# See https://spdx.org/licenses/
2323
set(SPDX_LICENSE_TAG "BSD-3-Clause")
2424
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
@@ -34,7 +34,7 @@ string(TIMESTAMP BUILD_TIMESTAMP UTC)
3434
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
3535

3636
# Set project name and language
37-
project(fortran-csv-module
37+
project(csv-fortran
3838
LANGUAGES Fortran
3939
VERSION "${CPACK_PACKAGE_VERSION}")
4040

@@ -94,9 +94,9 @@ if(${FC_ALLOWS_NO_OPTIMIZATION})
9494
list(APPEND FCOPTS ${FCOPT_NO_OPTIMIZATION})
9595
endif()
9696

97-
message(STATUS "Fortran compiler options for fortran-csv-module set to ${FCOPTS}")
97+
message(STATUS "Fortran compiler options for csv-fortran set to ${FCOPTS}")
9898

99-
# Target FCSV: fortran-csv-module library
99+
# Target FCSV: csv-fortran library
100100
set(FCSV_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
101101

102102
# Define sources for FCSV library
@@ -126,7 +126,7 @@ install(TARGETS ${LIBFCSV_NAME})
126126

127127
### Test executables
128128

129-
# Target : fortran-csv-module library
129+
# Target : csv-fortran library
130130
set(TEST_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/tests")
131131

132132
# add_executable(csv_write_test "${TEST_SOURCE_DIR}/csv_write_test.f90")
@@ -312,8 +312,8 @@ if(WIN32)
312312
# Set up NSIS
313313
find_package(NSIS)
314314
if(NSIS_FOUND)
315-
# set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/img/fortran-csv-module-icon.ico")
316-
# set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/img/fortran-csv-module-icon.ico")
315+
# set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/img/csv-fortran-icon.ico")
316+
# set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/img/csv-fortran-icon.ico")
317317
set(CPACK_NSIS_INSTALLED_ICON_NAME "Uninstall.exe")
318318
set(CPACK_NSIS_HELP_LINK "${CPACK_PACKAGE_HOMEPAGE_URL}")
319319
set(CPACK_NSIS_URL_INFO_ABOUT "${CPACK_PACKAGE_HOMEPAGE_URL}")
@@ -332,7 +332,7 @@ if(WIN32)
332332
RENAME LICENSE.txt
333333
DESTINATION doc)
334334

335-
# install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/fortran-csv-module-icon.png"
335+
# install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/csv-fortran-icon.png"
336336
# DESTINATION img)
337337

338338
# set(CPACK_NUGET_COMPONENT_INSTALL OFF)
@@ -345,12 +345,12 @@ if(WIN32)
345345
set(CPACK_NUGET_PACKAGE_HOMEPAGE_URL "${CPACK_PACKAGE_HOMEPAGE_URL}")
346346
# LicenseURL is deprecated; how to set License with CMake/CPack?
347347
# set(CPACK_NUGET_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
348-
# set(CPACK_NUGET_PACKAGE_LICENSEURL "https://github.com/jacobwilliams/fortran-csv-module/blob/master/LICENSE")
348+
# set(CPACK_NUGET_PACKAGE_LICENSEURL "https://github.com/jacobwilliams/csv-fortran/blob/master/LICENSE")
349349
set(CPACK_NUGET_PACKAGE_LICENSE_EXPRESSION "${SPDX_LICENSE_TAG}")
350350
# set(CPACK_NUGET_PACKAGE_LICENSE_FILE_NAME "doc/LICENSE.txt")
351351
# A URL for a 64x64 image with transparency background to use as the icon for the package in UI display.
352-
# set(CPACK_NUGET_PACKAGE_ICONURL "https://example.com/img/fortran-csv-module-icon.png")
353-
# set(CPACK_NUGET_PACKAGE_ICON "img/fortran-csv-module-icon.png")
352+
# set(CPACK_NUGET_PACKAGE_ICONURL "https://example.com/img/csv-fortran-icon.png")
353+
# set(CPACK_NUGET_PACKAGE_ICON "img/csv-fortran-icon.png")
354354
set(CPACK_NUGET_PACKAGE_DESCRIPTION_SUMMARY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
355355
set(CPACK_NUGET_PACKAGE_RELEASE_NOTES "Experimental version for testing NuGet packaging. For information only.")
356356
set(CPACK_NUGET_PACKAGE_COPYRIGHT "Copyright 2021, Jacob Williams")
@@ -359,7 +359,7 @@ if(WIN32)
359359
set(CPACK_NUGET_PACKAGE_TAGS "CSV" "comma separated values" "Fortran")
360360
# # Repository info
361361
# set(CPACK_NUGET_PACKAGE_REPOSITORY_TYPE "git")
362-
# set(CPACK_NUGET_PACKAGE_REPOSITORY_URL "https://github.com/jacobwilliams/fortran-csv-module.git")
362+
# set(CPACK_NUGET_PACKAGE_REPOSITORY_URL "https://github.com/jacobwilliams/csv-fortran.git")
363363
# set(CPACK_NUGET_PACKAGE_REPOSITORY_BRANCH "1.2.1")
364364
# set(CPACK_NUGET_PACKAGE_REPOSITORY_COMMIT "77a50e78c52<your_hash_here>7bba3bd655b4400b")
365365
# A list of package dependencies.
@@ -385,7 +385,7 @@ if(WIN32)
385385
set(WIX_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rtf")
386386
set(CPACK_WIX_LICENSE_RTF "${WIX_LICENSE_FILE}")
387387
install(FILES "${WIX_LICENSE_FILE}" DESTINATION doc)
388-
# set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/img/fortran-csv-module-icon.ico")
388+
# set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/img/csv-fortran-icon.ico")
389389

390390
list(APPEND CPACK_GENERATOR WIX)
391391
else()

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Fortran CSV Module
2-
https://github.com/jacobwilliams/fortran-csv-module
2+
https://github.com/jacobwilliams/csv-fortran
33

44
Copyright (c) 2017-2022, Jacob Williams
55
All rights reserved.

README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
![fortran-csv-module](media/logo.png)
1+
![csv-fortran](media/logo.png)
22
============
33

44
[![Language](https://img.shields.io/badge/-Fortran-734f96?logo=fortran&logoColor=white)](https://github.com/topics/fortran)
5-
[![GitHub release](https://img.shields.io/github/release/jacobwilliams/fortran-csv-module.svg)](https://github.com/jacobwilliams/fortran-csv-module/releases/latest)
6-
[![Build Status](https://github.com/jacobwilliams/fortran-csv-module/actions/workflows/CI.yml/badge.svg)](https://github.com/jacobwilliams/fortran-csv-module/actions)
7-
[![codecov](https://codecov.io/gh/jacobwilliams/fortran-csv-module/branch/master/graph/badge.svg?token=43HK33CSMY)](https://codecov.io/gh/jacobwilliams/fortran-csv-module)
8-
[![last-commit](https://img.shields.io/github/last-commit/jacobwilliams/fortran-csv-module)](https://github.com/jacobwilliams/fortran-csv-module/commits/master)
5+
[![GitHub release](https://img.shields.io/github/release/jacobwilliams/csv-fortran.svg)](https://github.com/jacobwilliams/csv-fortran/releases/latest)
6+
[![Build Status](https://github.com/jacobwilliams/csv-fortran/actions/workflows/CI.yml/badge.svg)](https://github.com/jacobwilliams/csv-fortran/actions)
7+
[![codecov](https://codecov.io/gh/jacobwilliams/csv-fortran/branch/master/graph/badge.svg?token=43HK33CSMY)](https://codecov.io/gh/jacobwilliams/csv-fortran)
8+
[![last-commit](https://img.shields.io/github/last-commit/jacobwilliams/csv-fortran)](https://github.com/jacobwilliams/csv-fortran/commits/master)
99

1010
### Description
1111

1212
A modern Fortran library for reading and writing CSV (comma-separated value) files.
1313

1414
### Latest Release
1515

16-
[![GitHub release](https://img.shields.io/github/release/jacobwilliams/fortran-csv-module.svg?style=plastic)](https://github.com/jacobwilliams/fortran-csv-module/releases/latest)
16+
[![GitHub release](https://img.shields.io/github/release/jacobwilliams/csv-fortran.svg?style=plastic)](https://github.com/jacobwilliams/csv-fortran/releases/latest)
1717

1818
### Documentation
1919

20-
The latest API documentation for the `master` branch can be found [here](https://jacobwilliams.github.io/fortran-csv-module/). This was generated from the source code using [FORD](https://github.com/Fortran-FOSS-Programmers/ford).
20+
The latest API documentation for the `master` branch can be found [here](https://jacobwilliams.github.io/csv-fortran/). This was generated from the source code using [FORD](https://github.com/Fortran-FOSS-Programmers/ford).
2121

2222

2323
### Getting started
2424
#### Get the code
2525
```bash
26-
git clone https://github.com/jacobwilliams/fortran-csv-module
27-
cd fortran-csv-module
26+
git clone https://github.com/jacobwilliams/csv-fortran
27+
cd csv-fortran
2828
```
2929
#### Dependencies
3030
1. Git
@@ -37,10 +37,10 @@ You can build using provided `fpm.toml`:
3737
```bash
3838
fpm build
3939
```
40-
To use `fortran-csv-module` within your fpm project, add the following to your `fpm.toml` file:
40+
To use `csv-fortran` within your fpm project, add the following to your `fpm.toml` file:
4141
```toml
4242
[dependencies]
43-
fortran-csv-module = { git="https://github.com/jacobwilliams/fortran-csv-module.git" }
43+
csv-fortran = { git="https://github.com/jacobwilliams/csv-fortran.git" }
4444
```
4545

4646
### Examples
@@ -131,4 +131,4 @@ Various options are user-selectable for specifying the format (e.g., changing th
131131

132132
### License
133133

134-
This library is released under a [BSD-3 license](https://github.com/jacobwilliams/fortran-csv-module/blob/master/LICENSE).
134+
This library is released under a [BSD-3 license](https://github.com/jacobwilliams/csv-fortran/blob/master/LICENSE).

contrib/cmake/BuildFCSV.cmake

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(GIT_FOUND)
2-
# Retrieve, build, and install fortran-csv-module (aka FCSV)
2+
# Retrieve, build, and install csv-fortran (aka FCSV)
33
# distribution from GitHub
44
set(FCSV_DIST_DIR "${CMAKE_CURRENT_BINARY_DIR}/FCSV-source")
55

@@ -15,9 +15,9 @@ if(GIT_FOUND)
1515
# Note: Use URL and URL_HASH [SHA512|SHA256|MD5]=4A54C0DE... to
1616
# download and checksum an archive. Note that URL may refer to a
1717
# local file, allowing this to work without net access.
18-
# GIT_REPOSITORY https://github.com/jacobwilliams/fortran-csv-module.git
18+
# GIT_REPOSITORY https://github.com/jacobwilliams/csv-fortran.git
1919
# GIT_TAG 1.2.0
20-
GIT_REPOSITORY https://github.com/jacobwilliams/fortran-csv-module
20+
GIT_REPOSITORY https://github.com/jacobwilliams/csv-fortran
2121
GIT_TAG 1.3.1
2222
SOURCE_DIR "${FCSV_DIST_DIR}"
2323
INSTALL_DIR "${FCSV_LOCAL_INSTALL_DIR}"
@@ -28,7 +28,7 @@ if(GIT_FOUND)
2828
USES_TERMINAL_UPDATE YES
2929
)
3030

31-
# From fortran-csv-module/CMakeLists.txt:
31+
# From csv-fortran/CMakeLists.txt:
3232
# ...
3333
# # Set default installation paths; should be invoked after setting project language(s)
3434
# include(GNUInstallDirs)
@@ -39,7 +39,7 @@ if(GIT_FOUND)
3939
# ...
4040

4141
# Create ${FCSV_LOCAL_INSTALL_DIR}/finclude based on the module install location
42-
# set in fortran-csv-module/CMakeLists.txt. Creating this directory avoids a race
42+
# set in csv-fortran/CMakeLists.txt. Creating this directory avoids a race
4343
# condition - see https://www.scivision.dev/cmake-fetchcontent-vs-external-project/
4444
file(MAKE_DIRECTORY ${FCSV_LOCAL_INSTALL_DIR}/finclude)
4545

@@ -76,7 +76,7 @@ if(GIT_FOUND)
7676
else()
7777
message(STATUS "git not available; using fallback CSV source files")
7878

79-
set(FCSV_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fortran-csv-module/src")
79+
set(FCSV_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/csv-fortran/src")
8080

8181
# Full path to csv_kinds.f90
8282
set(FCSV_KINDS_SRC "${FCSV_SOURCE_DIR}/csv_kinds.f90")

contrib/cmake/IncludeFCSV.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Retrieve fortran-csv-module from external source and include into project
2-
# See https://github.com/jacobwilliams/fortran-csv-module
1+
# Retrieve csv-fortran from external source and include into project
2+
# See https://github.com/jacobwilliams/csv-fortran
33
#
44
#!!! Verify all these!
55
# The following output variables are set by the FCSV subproject
@@ -10,7 +10,7 @@ set(FCSV_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/FCSV-source")
1010

1111
FetchContent_Declare(
1212
FCSV_external
13-
GIT_REPOSITORY https://github.com/jacobwilliams/fortran-csv-module.git
13+
GIT_REPOSITORY https://github.com/jacobwilliams/csv-fortran.git
1414
GIT_TAG 1.3.1
1515
SOURCE_DIR "${FCSV_SOURCE_DIR}"
1616
)

contrib/cmake/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Contributed CMake Support
22

33
The following CMake recipes are intended for developers using
4-
fortran-csv-module as a dependency in their own projects.
4+
csv-fortran as a dependency in their own projects.
55

66
Please read through the recipes before use; they contain
7-
documentation that will help integrate fortran-csv-module
7+
documentation that will help integrate csv-fortran
88
with a CMake based project.
99

1010
Each recipe has advantages and disadvantages as listed below.
@@ -17,7 +17,7 @@ to pulling source code over the network or vice versa.
1717
FindFCSV searches the host system for a previously installed fcsv library
1818
(*e.g.* `libfcsv.a`) and the Fortran module file `csv_module.mod`.
1919
No version checking is performed and there will likely be problems
20-
if fortran-csv-module and the parent project are built with
20+
if csv-fortran and the parent project are built with
2121
different Fortran compilers.
2222

2323
## BuildFCSV.cmake
@@ -27,7 +27,7 @@ use; they currently point to a test fork of the library. Also, ensure that
2727
`include(Git)` and `include(ExternalProject)` are called in the parent
2828
project before this recipe.
2929

30-
This recipe uses `ExternalProject_Add` to retrieve the fortran-csv-module
30+
This recipe uses `ExternalProject_Add` to retrieve the csv-fortran
3131
project and build it as an standalone dependency of the parent
3232
project. Tests and compiler flags of FCSV are kept separate from the
3333
parent project.
@@ -39,7 +39,7 @@ use; they currently point to a test fork of the library. Also, ensure that
3939
`include(Git)` and `include(FetchContent)` are called in the parent
4040
project before this recipe.
4141

42-
This recipe uses `FetchContent` to retrieve the fortran-csv-module
42+
This recipe uses `FetchContent` to retrieve the csv-fortran
4343
project and build it as part of the parent project. This has two
4444
important effects: compiler flags of the parent and child project
4545
are merged and CTest will run FCSV's tests in addition to those of
File renamed without changes.

fortran-csv-module.md ford.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
project: fortran-csv-module
1+
project: csv-fortran
22
project_dir: ./src
33
output_dir: ./doc
44
media_dir: ./media
5-
project_github: https://github.com/jacobwilliams/fortran-csv-module
5+
project_github: https://github.com/jacobwilliams/csv-fortran
66
summary: Read and Write CSV Files Using Modern Fortran
77
author: Jacob Williams
88
github: https://github.com/jacobwilliams

fpm.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name = "fortran-csv-module"
1+
name = "csv-fortran"
22
version = "2.0.1"
33
author = "Jacob Williams"
44
maintainer = "Jacob Williams"
55
copyright = "Copyright (c) 2017-2023, Jacob Williams"
66
license = "BSD-3"
77
description = "Read and Write CSV Files Using Modern Fortran"
8-
homepage = "https://github.com/jacobwilliams/fortran-csv-module"
8+
homepage = "https://github.com/jacobwilliams/csv-fortran"
99
categories = ["io"]
1010
keywords = ["csv"]
1111

0 commit comments

Comments
 (0)