Skip to content

Commit

Permalink
Fix doxygen errors
Browse files Browse the repository at this point in the history
Switch warnings as errors to default OFF
Enable mac docs
  • Loading branch information
byrnHDF committed Jan 25, 2024
1 parent efe7cb7 commit 2f4614c
Show file tree
Hide file tree
Showing 25 changed files with 36 additions and 24 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
cpp: ON
fortran: OFF
java: ON
docs: OFF
docs: ON
libaecfc: ON
localaec: OFF
zlibfc: ON
Expand Down Expand Up @@ -179,6 +179,7 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
-DBUILD_SHARED_LIBS=ON \
-DHDF5_ENABLE_ALL_WARNINGS=ON \
-DHDF5_DOXY_WARNINGS=ON \
-DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
-DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} \
-DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} \
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ if (HDF5_BUILD_DOC AND EXISTS "${HDF5_DOXYGEN_DIR}" AND IS_DIRECTORY "${HDF5_DOX
# check if Doxygen is installed
find_package(Doxygen)
if (DOXYGEN_FOUND)
option (HDF5_ENABLE_DOXY_WARNINGS "Enable fail if doxygen parsing has warnings." ON)
option (HDF5_ENABLE_DOXY_WARNINGS "Enable fail if doxygen parsing has warnings." OFF)
mark_as_advanced (HDF5_ENABLE_DOXY_WARNINGS)
if (HDF5_ENABLE_DOXY_WARNINGS)
set (HDF5_DOXY_WARNINGS "FAIL_ON_WARNINGS")
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1220,14 +1220,14 @@ AC_MSG_RESULT([$HDF5_DOXYGEN])
## This needs to be exposed for the library info file.
AC_SUBST([HDF5_DOXY_WARNINGS])

## Default is to consider doxygen warnings as errors
## Default is to not consider doxygen warnings as errors
DOXY_ERR=yes

AC_MSG_CHECKING([if doxygen warnings as errors is enabled])

AC_ARG_ENABLE([doxygen-errors],
[AS_HELP_STRING([--enable-doxygen-errors],
[Error on HDF5 doxygen warnings [default=yes]])],
[Error on HDF5 doxygen warnings [default=no]])],
[DOXY_ERR=$enableval])

if test "X$DOXY_ERR" = "Xyes"; then
Expand Down
2 changes: 1 addition & 1 deletion doxygen/dox/LearnBasics3.dox
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ is met, at a certain point in the future.)

\section secLBContentsProg Programming Example

\subsection subsecLBContentsProgUsing Using #H5Literate, #H5Lvisit and #H5Ovisit
\subsection subsecLBContentsProgUsing Using H5Literate, H5Lvisit and H5Ovisit
For example code, see the \ref HDF5Examples page.
Specifically look at the \ref ExAPI.
There are examples for different languages, where examples of using #H5Literate and #H5Ovisit/#H5Lvisit are included.
Expand Down
2 changes: 2 additions & 0 deletions doxygen/dox/PredefinedDatatypeTables.dox
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/** \page predefined_datatypes_tables HDF5 Predefined Datatypes
*
* \section sec_predefined_datatypes_tables HDF5 Predefined Datatypes
*
* The following datatypes are predefined in HDF5.
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/Callbacks.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* exceptions thrown will be passed to the default callback exception
* handler.
*
* @defgroup JCALL HDF5 Library Java Callbacks
* @defgroup JCALLBK HDF5 Library Java Callbacks
*/
public interface Callbacks {
}
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5A_iterate_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
public interface H5A_iterate_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each attribute
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5D_append_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5D_append_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each dataset access property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5D_iterate_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5D_iterate_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each dataset element
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5E_walk_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
public interface H5E_walk_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each error stack element
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5L_iterate_t.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
public interface H5L_iterate_t extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each group
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5O_iterate_t.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
public interface H5O_iterate_t extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each group
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_cls_close_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_cls_close_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_cls_copy_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_cls_copy_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_cls_create_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_cls_create_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_iterate_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_iterate_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_prp_close_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_prp_close_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_prp_compare_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_prp_copy_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_prp_copy_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_prp_create_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_prp_create_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_prp_delete_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_prp_delete_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_prp_get_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_prp_get_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/callbacks/H5P_prp_set_func_cb.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public interface H5P_prp_set_func_cb extends Callbacks {
/**
* @ingroup JCALL
* @ingroup JCALLBK
*
* application callback for each property list
*
Expand Down
2 changes: 1 addition & 1 deletion release_docs/INSTALL_CMake.txt
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ HDF5_ENABLE_ANALYZER_TOOLS "enable the use of Clang tools"
HDF5_ENABLE_SANITIZERS "execute the Clang sanitizer" OFF
HDF5_ENABLE_FORMATTERS "format source files" OFF
HDF5_BUILD_DOC "Build documentation" OFF
HDF5_ENABLE_DOXY_WARNINGS "Enable fail if doxygen parsing has warnings." ON
HDF5_ENABLE_DOXY_WARNINGS "Enable fail if doxygen parsing has warnings." OFF

---------------- HDF5 VFD Options ---------------------
HDF5_ENABLE_DIRECT_VFD "Build the Direct I/O Virtual File Driver" OFF
Expand Down
9 changes: 9 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,15 @@ Bug Fixes since HDF5-1.14.0 release

Configuration
-------------
- Changed default of 'Error on HDF5 doxygen warnings' DOXYGEN_WARN_AS_ERROR option.

The default setting of DOXYGEN_WARN_AS_ERROR to 'FAIL_ON_WARNINGS' has been changed
to 'NO'. It was decided that the setting was too aggressive and should be a user choice.
The github actions and scripts have been updated to reflect this.

* HDF5_ENABLE_DOXY_WARNINGS: ON/OFF (Default: OFF)
* --enable-doxygen-errors: enable/disable (Default: disable)

- Removed an Autotools configure hack that causes problems on MacOS

A sed line in configure.ac was added in the past to paper over some
Expand Down

0 comments on commit 2f4614c

Please sign in to comment.