Skip to content

Commit 65454ba

Browse files
committed
Refactor cloc_tools
Remove YAML in favor of JSON, which is part of standard Python
1 parent 0d364f1 commit 65454ba

21 files changed

+484
-576
lines changed

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Sphinx = "*"
1818
sphinx_rtd_theme = "*"
1919
sphinxcontrib-bibtex = "*"
2020
yapf = "*"
21-
21+
fprettify = "*"
2222

2323
[dev-packages]
2424

Pipfile.lock

Lines changed: 105 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/custom/cloc.cmake

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

doc/.gitignore

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ xml
55
doxygen_sqlite3.db
66
mock_pcmsolver.h
77
cloc_tools.py
8-
gfx/*.png
9-
gfx/matplotlib
10-
scratch_cpp.yml
11-
scratch_hpp.yml
12-
scratch_c.yml
13-
scratch_h.yml
14-
scratch_fortran.yml
8+
gfx/bar_charts/*.svg
9+
scratch_cpp.json
10+
scratch_hpp.json
11+
scratch_c.json
12+
scratch_h.json
13+
scratch_fortran.json
1514
doxygen.log
15+
__pycache__

doc/Doxyfile.in

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ DOXYFILE_ENCODING = UTF-8
77
PROJECT_NAME = PCMSolver
88
PROJECT_NUMBER = @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@-@PROJECT_VERSION_TWEAK@
99
PROJECT_BRIEF = "An Open Source API for the Polarizable Continuum Model"
10-
PROJECT_LOGO = @PROJECT_SOURCE_DIR@/doc/gfx/logo.jpg
11-
OUTPUT_DIRECTORY = @PROJECT_SOURCE_DIR@/doc
10+
PROJECT_LOGO = @project_root_dir@/doc/gfx/logo.jpg
11+
OUTPUT_DIRECTORY = @doc_build_dir@
1212
CREATE_SUBDIRS = NO
1313
ALLOW_UNICODE_NAMES = NO
1414
OUTPUT_LANGUAGE = English
@@ -28,7 +28,7 @@ ABBREVIATE_BRIEF = "The $name class" \
2828
ALWAYS_DETAILED_SEC = NO
2929
INLINE_INHERITED_MEMB = NO
3030
FULL_PATH_NAMES = YES
31-
STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@/src
31+
STRIP_FROM_PATH = @project_root_dir@/src
3232
STRIP_FROM_INC_PATH =
3333
SHORT_NAMES = NO
3434
JAVADOC_AUTOBRIEF = NO
@@ -97,7 +97,7 @@ SHOW_FILES = YES
9797
SHOW_NAMESPACES = YES
9898
FILE_VERSION_FILTER =
9999
LAYOUT_FILE =
100-
CITE_BIB_FILES = @PROJECT_SOURCE_DIR@/doc/pcmsolver.bib
100+
CITE_BIB_FILES = @project_root_dir@/doc/pcmsolver.bib
101101
#---------------------------------------------------------------------------
102102
# Configuration options related to warning and progress messages
103103
#---------------------------------------------------------------------------
@@ -112,10 +112,10 @@ WARN_LOGFILE = doc/doxygen.log
112112
#---------------------------------------------------------------------------
113113
# Configuration options related to the input files
114114
#---------------------------------------------------------------------------
115-
INPUT = @PROJECT_SOURCE_DIR@/src \
116-
@PROJECT_SOURCE_DIR@/api \
117-
@PROJECT_SOURCE_DIR@/doc \
118-
@PROJECT_SOURCE_DIR@/include
115+
INPUT = @project_root_dir@/src \
116+
@project_root_dir@/api \
117+
@project_root_dir@/doc \
118+
@project_root_dir@/include
119119
INPUT_ENCODING = UTF-8
120120
FILE_PATTERNS = *.c \
121121
*.cpp \
@@ -133,13 +133,14 @@ FILE_PATTERNS = *.c \
133133
*.F03 \
134134
*.F08
135135
RECURSIVE = YES
136-
EXCLUDE = @PROJECT_SOURCE_DIR@/src/bin \
137-
@PROJECT_SOURCE_DIR@/src/utils/getkw
136+
EXCLUDE = @project_root_dir@/src/bin \
137+
@project_root_dir@/src/utils/getkw \
138+
@project_root_dir@/doc/__pycache__
138139
EXCLUDE_SYMLINKS = NO
139-
EXCLUDE_PATTERNS = @PROJECT_SOURCE_DIR@/api/pcmsolver.h \
140-
@PROJECT_SOURCE_DIR@/api/pcmsolver.f90 \
141-
@PROJECT_SOURCE_DIR@/src/utils/Logger.* \
142-
@PROJECT_SOURCE_DIR@/src/utils/RungeKutta4.*
140+
EXCLUDE_PATTERNS = @project_root_dir@/api/pcmsolver.h \
141+
@project_root_dir@/api/pcmsolver.f90 \
142+
@project_root_dir@/src/utils/Logger.* \
143+
@project_root_dir@/src/utils/RungeKutta4.*
143144
EXCLUDE_SYMBOLS = EIGEN_MAKE_ALIGNED_OPERATOR_NEW \
144145
REQUIRE \
145146
SCENARIO \
@@ -162,10 +163,10 @@ EXCLUDE_SYMBOLS = EIGEN_MAKE_ALIGNED_OPERATOR_NEW \
162163
__noexcept \
163164
__noreturn \
164165
__nullptr
165-
EXAMPLE_PATH = @PROJECT_SOURCE_DIR@/doc/snippets
166+
EXAMPLE_PATH = @project_root_dir@/doc/snippets
166167
EXAMPLE_PATTERNS = *
167168
EXAMPLE_RECURSIVE = NO
168-
IMAGE_PATH = @PROJECT_SOURCE_DIR@/doc/gfx
169+
IMAGE_PATH = @project_root_dir@/doc/gfx
169170
INPUT_FILTER =
170171
FILTER_PATTERNS =
171172
FILTER_SOURCE_FILES = NO

0 commit comments

Comments
 (0)