Skip to content

Commit dc98525

Browse files
committed
remove unused pathlib module
1 parent 5aecd39 commit dc98525

File tree

6 files changed

+12
-97
lines changed

6 files changed

+12
-97
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
sudo apt install -yq --no-install-recommends ninja-build libhdf5-dev
3232
3333
- run: cmake --preset multi --install-prefix=${HOME}
34+
3435
- run: cmake --build --preset debug
3536
- run: ctest --preset debug --output-junit test-debug.xml
3637

@@ -46,22 +47,22 @@ jobs:
4647
- run: cmake --install build
4748

4849
- name: configure examples
49-
run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=~
50+
run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=${HOME}
5051
- name: build examples
5152
run: cmake --build Examples/build
5253
- name: Test examples
53-
run: ctest --test-dir Examples/build --output-on-failure
54+
run: ctest --test-dir Examples/build -V
5455

5556
- name: create package
5657
if: github.event.action == 'published'
5758
run: cpack --config build/CPackConfig.cmake
5859

5960
- name: Upload artifact
6061
if: github.event.action == 'published'
61-
uses: actions/upload-artifact@v1
62+
uses: actions/upload-artifact@v2
6263
with:
6364
name: binary-archive
64-
path: build/package
65+
path: build/package/
6566

6667
- name: get version
6768
if: github.event.action == 'published'
@@ -108,9 +109,9 @@ jobs:
108109
- run: cmake --install build
109110

110111
- name: configure examples
111-
run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=~
112+
run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=${HOME}
112113
- name: build examples
113-
run: cmake --build Examples/build
114+
run: cmake --build Examples/build --parallel
114115
- name: Test examples
115116
run: ctest --test-dir Examples/build -V
116117

@@ -149,9 +150,9 @@ jobs:
149150
- run: cmake --install build
150151

151152
- name: configure examples
152-
run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=~
153+
run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=${HOME}
153154
- name: build Examples
154-
run: cmake --build Examples/build
155+
run: cmake --build Examples/build --parallel
155156
- name: Test Examples
156157
run: ctest --test-dir Examples/build -V
157158

.github/workflows/ci_meson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
with:
1919
python-version: '3.x'
2020

21-
- run: pip install meson
21+
- run: pip install meson ninja
2222
- run: |
2323
sudo apt update -yq
24-
sudo apt install -yq --no-install-recommends gfortran ninja-build libhdf5-dev
24+
sudo apt install -yq --no-install-recommends libhdf5-dev
2525
2626
- run: meson setup build
2727
- run: meson compile -C build

src/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@ if(concepts)
22
add_subdirectory(concepts)
33
endif(concepts)
44

5-
if(WIN32)
6-
set(is_windows .true.)
7-
else()
8-
set(is_windows .false.)
9-
endif()
10-
configure_file(pathlib.in.f90 pathlib.f90 @ONLY)
11-
125
add_subdirectory(read)
136

147
add_subdirectory(write)
158

169
target_sources(h5fortran PRIVATE
1710
interface.f90 attributes.f90
18-
${CMAKE_CURRENT_BINARY_DIR}/pathlib.f90
1911
)

src/interface.f90

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,21 +137,6 @@ module h5fortran
137137

138138
!> Submodules
139139

140-
interface !< pathlib.f90
141-
module subroutine std_unlink(filename)
142-
character(*), intent(in) :: filename
143-
end subroutine std_unlink
144-
145-
module logical function is_absolute_path(path)
146-
character(*), intent(in) :: path
147-
end function is_absolute_path
148-
149-
module function get_tempdir()
150-
character(:), allocatable :: get_tempdir
151-
end function
152-
153-
end interface
154-
155140
interface !< write.f90
156141
module subroutine hdf_create(self, dname, dtype, dims, sid, did, chunk_size, istart, iend, stride, compact)
157142
class(hdf5_file), intent(inout) :: self

src/meson.build

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
c = configuration_data()
2-
is_windows = os == 'windows' ? '.true.' : '.false.'
3-
c.set('is_windows', is_windows)
4-
configure_file(
5-
input : 'pathlib.in.f90',
6-
output : 'pathlib.f90',
7-
configuration : c)
8-
9-
101
subdir('read')
112

123
subdir('write')
134

14-
hdf5_src = files('interface.f90',
15-
'attributes.f90',
16-
meson.current_build_dir() / 'pathlib.f90') + read_src + write_src
5+
hdf5_src = files('interface.f90', 'attributes.f90') + read_src + write_src

src/pathlib.in.f90

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)