Skip to content

Commit df20da2

Browse files
authored
Remove references to autotools options in documentation/comments (#5619)
1 parent a069f54 commit df20da2

14 files changed

+25
-77
lines changed

.github/workflows/README.md

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ There are a few that only get triggered manually.
3838
* release-files.yml uploads new binaries to releases page
3939

4040
## Triggered Workflows
41-
- autotools.yml
4241
- clang-format-check.yml runs clang-format and reports issues
4342
- cmake.yml
4443
- codespell.yml checks spelling
@@ -47,24 +46,6 @@ There are a few that only get triggered manually.
4746
- linkchecker.yml verifies the links in generated doxygen files
4847
- netcdf.yml configures and builds HDF5 then tests NetCDF
4948

50-
## Workflows called by autotools.yml
51-
- main-auto-spc.yml configure, build, and test HDF5 with:
52-
* API default v1_6
53-
* API default v1_8
54-
* API default v1_10
55-
* API default v1_12
56-
* API default v1_14
57-
* using no deprecated
58-
* in debug mode and -Werror compiler option
59-
* in release mode and -Werror compiler option
60-
- main-auto-par-spc.yml configure, build, and test HDF5 with CFLAGS=-Werror
61-
- main-auto-par.yml configure, build, and test HDF5 with openmpi
62-
- main-auto.yml configure, build, and test HDF5
63-
- intel-auto.yml configure, build, and test HDF5 with Intel OneAPI on Linux and Windows
64-
- nvhpc-auto.yml configure, build, and test HDF5 with nvhpc
65-
- aocc-auto.yml configure, build, and test HDF5 with AOCC and OpenMPI
66-
- testxpr-auto.yml configure, build, and test HDF5 with HDF_TEST_EXPRESS=0
67-
6849
## Workflows called by cmake.yml
6950
- main-cmake-spc.yml configure, build, and test HDF5 with:
7051
* API default v1_6

config/ConfigureChecks.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ if (HDF5_ENABLE_USING_MEMCHECKER)
460460
endif ()
461461

462462
#-----------------------------------------------------------------------------
463-
# Option for --enable-strict-format-checks
463+
# Option for strict file format checks
464464
#-----------------------------------------------------------------------------
465465
option (HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF)
466466
mark_as_advanced (HDF5_STRICT_FORMAT_CHECKS)

config/flags/HDFCompilerCXXFlags.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,13 @@ if (CMAKE_CXX_COMPILER_LOADED)
126126
endif ()
127127

128128
#-----------------------------------------------------------------------------
129-
# Option for --enable-profiling
130129
# This option will force/override the default setting for all configurations
131130
#-----------------------------------------------------------------------------
132131
if (HDF5_ENABLE_PROFILING)
133132
list (APPEND HDF5_CMAKE_CXX_FLAGS "${PROFILE_CXXFLAGS}")
134133
endif ()
135134

136135
#-----------------------------------------------------------------------------
137-
# Option for --enable-optimization
138136
# This option will force/override the default setting for all configurations
139137
#-----------------------------------------------------------------------------
140138
if (HDF5_ENABLE_OPTIMIZATION)

config/flags/HDFCompilerFlags.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ if (HDF5_ENABLE_ALL_WARNINGS)
161161
endif ()
162162

163163
#-----------------------------------------------------------------------------
164-
# Option for --enable-asserts
165164
# By default, CMake adds NDEBUG to CMAKE_${lang}_FLAGS for Release build types
166165
# This option will force/override the default setting for all configurations
167166
#-----------------------------------------------------------------------------
@@ -176,7 +175,6 @@ endif ()
176175
MARK_AS_ADVANCED (HDF5_ENABLE_ASSERTS)
177176

178177
#-----------------------------------------------------------------------------
179-
# Option for --enable-symbols
180178
# This option will force/override the default setting for all configurations
181179
#-----------------------------------------------------------------------------
182180
#option (HDF5_ENABLE_SYMBOLS "Add debug symbols to the library independent of the build mode and optimization level." OFF)
@@ -185,7 +183,6 @@ set_property (CACHE HDF5_ENABLE_SYMBOLS PROPERTY STRINGS OFF NO YES)
185183
MARK_AS_ADVANCED (HDF5_ENABLE_SYMBOLS)
186184

187185
#-----------------------------------------------------------------------------
188-
# Option for --enable-profiling
189186
# This option will force/override the default setting for all configurations
190187
#-----------------------------------------------------------------------------
191188
option (HDF5_ENABLE_PROFILING "Enable profiling flags independently from the build mode." OFF)
@@ -195,7 +192,6 @@ endif ()
195192
MARK_AS_ADVANCED (HDF5_ENABLE_PROFILING)
196193

197194
#-----------------------------------------------------------------------------
198-
# Option for --enable-optimization
199195
# This option will force/override the default setting for all configurations
200196
#-----------------------------------------------------------------------------
201197
option (HDF5_ENABLE_OPTIMIZATION "Enable optimization flags/settings independently from the build mode" OFF)

config/flags/HDFGnuCXXFlags.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ endif ()
180180
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
181181

182182
#-----------------------------------------------------------------------------
183-
# Option for --enable-symbols
184183
# This option will force/override the default setting for all configurations
185184
#-----------------------------------------------------------------------------
186185
if (HDF5_ENABLE_SYMBOLS MATCHES "YES")

config/flags/HDFGnuFlags.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ endif ()
185185
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
186186

187187
#-----------------------------------------------------------------------------
188-
# Option for --enable-symbols
189188
# This option will force/override the default setting for all configurations
190189
#-----------------------------------------------------------------------------
191190
if (HDF5_ENABLE_SYMBOLS MATCHES "YES")

config/flags/HDFIntelCXXFlags.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ if (HDF5_ENABLE_DEV_WARNINGS)
8181
endif ()
8282

8383
#-----------------------------------------------------------------------------
84-
# Option for --enable-symbols
8584
# This option will force/override the default setting for all configurations
8685
#-----------------------------------------------------------------------------
8786
if (NOT _INTEL_WINDOWS)

doxygen/dox/HDF5CompressionTroubleshooting.dox

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ Everywhere in this document, the term \b szip refers to the \b szip filter and t
7474

7575
\b gzip and \b szip require the \b libz.a(so,dylib,lib) and \b libsz.a(so,dylib,lib)/libaec.a(so,dylib,lib)
7676
libraries, respectively, to be present on the system and to be enabled during HDF5 configuration with
77-
this autotools configure command:
78-
CMake configure command:
77+
this CMake configure command:
7978
\code
8079
cmake -G "Unix Makefiles" -DHDF5_ENABLE_ZLIB_SUPPORT=ON -DHDF5_ENABLE_SZIP_SUPPORT=ON -D<other flags>
8180
\endcode

doxygen/dox/LearnBasics3.dox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ Compiling applications to use the HDF5 Library can be as simple as executing:
731731
h5cc -o myprog myprog.c
732732
\endcode
733733

734-
As an application's file base evolves, there are better solutions using autotools and makefiles or
734+
As an application's file base evolves, there are better solutions using
735735
CMake and CMakeLists.txt files. Many tutorials and references can be found with a simple search.
736736

737737
This tutorial section will discuss the use of compile scripts on Linux.

doxygen/dox/ThreadSafe.dox

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ The following code is placed at the beginning of H5private.h:
1212
\endcode
1313

1414
<code>H5_HAVE_THREADSAFE</code> is defined when the HDF5 library is
15-
compiled with the <em>--enable-threadsafe</em> configuration option using autotools or
16-
<em>HDF5_ENABLE_THREADSAFE=ON</em> using CMake. In general,
15+
compiled with the <em>HDF5_ENABLE_THREADSAFE=ON</em> using CMake. In general,
1716
code for the non-threadsafe version of HDF5 library are placed within
1817
the <code># else</code> part of the conditional compilation. The exception
1918
to this rule are the changes to the <code>FUNC_ENTER</code> (in

release_docs/AutotoolsToCMakeOptions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ release_docs/INSTALL_CMake.txt file for more information on the CMake build syst
3131
| threads[Enable threads capability. A prerequisite for enabling threadsafe API calls. [default=yes] | HDF5_THREADS_ENABLED "Enable thread support" [ON] | |
3232
| threadsafe[Enable thread-safe capability. Not compatible with the high-level library, Fortran, or C++ wrappers. [default=no]] | HDF5_ENABLE_THREADSAFE "Enable Threadsafety" [OFF] | |
3333
| file-locking[Sets the default for whether or not to use file locking when opening files. [default=best-effort]] | HDF5_USE_FILE_LOCKING "Use file locking by default (mainly for SWMR)" [ON] | HDF5_IGNORE_DISABLED_FILE_LOCKS "Ignore file locks when disabled on file system" [ON] |
34+
| enable-concurrency[Support for concurrent multithreaded operation of supported API routines [default=no]] | HDF5_ENABLE_CONCURRENCY "Enable multi-threaded concurrency" [OFF] | This option also provides threadsafe execution of all other, non-concurrent operations. |
3435

3536
| Autotools Language Options | CMake Language Options | Notes |
3637
| ------- | ------- | ------------ |

release_docs/INSTALL_Cygwin.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Build, Test and Install HDF5 on Cygwin
130130

131131
"make check" fails when building shared lib files is enabled. The default
132132
on Cygwin has been changed to disable shared. It can be enabled with
133-
the --enable-shared configure option but is likely to fail "make check"
133+
the BUILD_SHARED_LIBS configure option but is likely to fail "make check"
134134
with GCC compilers.
135135

136136
-----------------------------------------------------------------------

release_docs/RELEASE.txt

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CONTENTS
3939
- Bug Fixes since HDF5-2.0.0
4040
- Platforms Tested
4141
- Known Problems
42-
- CMake vs. Autotools installations
42+
- CMake Installations
4343

4444

4545
New Features
@@ -90,7 +90,6 @@ New Features
9090
- Added configuration option for API concurrency support:
9191

9292
CMake: HDF5_ENABLE_CONCURRENCY (ON/OFF) (Default: OFF)
93-
Autotools: --enable-concurrency (yes/no) (Default: no)
9493

9594
This option enables support for concurrent multithreaded operation
9695
of supported API routines. This option also provides threadsafe
@@ -111,8 +110,8 @@ New Features
111110

112111
- Added support for MinGW + MSYS2 when building with CMake
113112

114-
We previously added support for this to the Autotools and the appropriate
115-
configure-time checks have been added to CMake.
113+
We added support for this to the appropriate
114+
configure-time checks in CMake.
116115

117116
CMake + MinGW + MSYS2 is now tested with the following environments:
118117

@@ -657,9 +656,6 @@ New Features
657656
repository in the future.
658657

659658
This also removes the following configure options:
660-
661-
Autotools: --(dis|en)able-hlgiftools
662-
663659
CMake: HDF5_BUILD_HL_GIF_TOOLS
664660

665661
High-Level APIs:
@@ -846,12 +842,6 @@ Bug Fixes since HDF5-2.0.0 release
846842
find_package in config mode. The choice then is to either build szip, with libaec,
847843
inline or find a system installed szip library, built with CMake.
848844

849-
- Changed name of libhdf5hl_fortran installed by autotools to libhdf5_hl_fortran. The
850-
new name is consistent with the name of the lib when installed by CMake and with the
851-
other hl libs.
852-
853-
Fixes GitHub issue #4811
854-
855845

856846
Tools
857847
-----
@@ -950,14 +940,14 @@ Platforms Tested
950940
GNU/Linux Ubuntu 24.04 Ubuntu clang version 18.1.3 (1ubuntu1)
951941
Intel(R) oneAPI DPC++/C++ Compiler 2024.2.0
952942
ifx (IFX) 2024.2.0 20240602
953-
(cmake and autotools)
943+
(cmake )
954944

955945
Linux 6.5.0-1018-aws GNU gcc, gfortran, g++
956946
#18-Ubuntu SMP x86_64 GNU/Linux (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
957947
Ubuntu 22.04 Ubuntu clang version 14.0.0-1ubuntu1
958948
Intel(R) oneAPI DPC++/C++ Compiler 2024.0.2
959949
ifx (IFX) 2024.0.2 20231213
960-
(cmake and autotools)
950+
(cmake)
961951

962952
Linux 5.14.21-cray_shasta_c cray-mpich/8.1.28
963953
#1 SMP x86_64 GNU/Linux cce/15.0.0
@@ -968,7 +958,7 @@ Platforms Tested
968958
#1 SMP x86_64 GNU/Linux clang version 17.0.6
969959
Rocky 9 Intel(R) oneAPI DPC++/C++ Compiler 2024.2.0
970960
ifx (IFX) 2024.2.0
971-
(cmake and autotools)
961+
(cmake)
972962

973963
Linux-4.18.0-553.16.1.1toss.t4 openmpi/4.1.2
974964
#1 SMP x86_64 GNU/Linux clang 14.0.6
@@ -1020,7 +1010,7 @@ Platforms Tested
10201010
x86_64;
10211011
Versions 18.4.0 and 19.10-0
10221012
NVIDIA nvc, nvfortran and nvc++ version 22.5-0
1023-
(autotools and cmake)
1013+
(cmake)
10241014

10251015

10261016
Linux-3.10.0-1160.119.1.1chaos openmpi/4.1.4
@@ -1057,11 +1047,6 @@ Platforms Tested
10571047
Known Problems
10581048
==============
10591049

1060-
- When building with the NAG Fortran compiler using the Autotools and libtool
1061-
2.4.2 or earlier, the -shared flag will be missing '-Wl,', which will cause
1062-
compilation to fail. This is due to a bug in libtool that was fixed in 2012
1063-
and released in 2.4.4 in 2014.
1064-
10651050
- When the library detects and builds in support for the _Float16 datatype, an
10661051
issue has been observed on at least one MacOS 14 system where the library
10671052
fails to initialize due to not being able to detect the byte order of the
@@ -1075,7 +1060,6 @@ Known Problems
10751060
with a configuration option:
10761061

10771062
CMake: HDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF
1078-
Autotools: --disable-nonstandard-feature-float16
10791063

10801064
- When HDF5 is compiled with NVHPC versions 23.5 - 23.9 (additional versions may
10811065
also be applicable) and with -O2 (or higher) and -DNDEBUG, test failures occur
@@ -1135,28 +1119,23 @@ Known Problems
11351119
11361120

11371121

1138-
CMake vs. Autotools installations
1122+
CMake Installations
11391123
=================================
1140-
While both build systems produce similar results, there are differences.
1141-
Each system produces the same set of folders on Linux (only CMake works
1142-
on standard Windows); bin, include, lib and share. Autotools places the
1143-
LICENSE and RELEASE.txt file in the root folder, CMake places them in
1144-
the share folder.
1124+
See the AutotoolsToCMakeOptions.md file for CMake options for former Autotools options.
1125+
CMake produces the following set of folders; bin, include, lib and share. The
1126+
LICENSE and RELEASE.txt file are placed in the share folder.
11451127

11461128
The bin folder contains the tools and the build scripts. Additionally, CMake
1147-
creates dynamic versions of the tools with the suffix "-shared". Autotools
1148-
installs one set of tools depending on the "--enable-shared" configuration
1149-
option.
1129+
creates dynamic versions of the tools with the suffix "-shared".
11501130
build scripts
11511131
-------------
1152-
Autotools: h5c++, h5cc, h5fc
11531132
CMake: h5c++, h5cc, h5hlc++, h5hlcc
11541133

11551134
The include folder holds the header files and the fortran mod files. CMake
11561135
places the fortran mod files into separate shared and static subfolders,
1157-
while Autotools places one set of mod files into the include folder. Because
1158-
CMake produces a tools library, the header files for tools will appear in
1159-
the include folder.
1136+
however the use of HDF5_INSTALL_MOD_FORTRAN places one set of mod files into
1137+
the include folder. Because CMake produces a tools library, the header files
1138+
for tools will appear in the include folder.
11601139

11611140
The lib folder contains the library files, and CMake adds the pkgconfig
11621141
subfolder with the hdf5*.pc files used by the bin/build scripts created by
@@ -1165,15 +1144,13 @@ creating C-stub libraries for each Fortran library. In addition, only CMake
11651144
installs the tools library. The names of the szip libraries are different
11661145
between the build systems.
11671146

1168-
The share folder will have the most differences because CMake builds include
1169-
a number of CMake specific files for support of CMake's find_package and support
1170-
for the HDF5 Examples CMake project.
1147+
CMake builds include a number of CMake specific files for support of CMake's
1148+
find_package and support for the HDF5 Examples CMake project.
11711149

11721150
The issues with the gif tool are:
11731151
HDFFV-10592 CVE-2018-17433
11741152
HDFFV-10593 CVE-2018-17436
11751153
HDFFV-11048 CVE-2020-10809
11761154
These CVE issues have not yet been addressed and are avoided by not building
1177-
the gif tool by default. Enable building the High-Level tools with these options:
1178-
autotools: --enable-hlgiftools
1155+
the gif tool by default. Enable building the High-Level tools with this options:
11791156
cmake: HDF5_BUILD_HL_GIF_TOOLS=ON

src/H5Fpublic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,7 @@ H5_DLL herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize);
17751775
* pass the same values for \p file_id and \p flag.
17761776
*
17771777
* This function is available only when the HDF5 library is configured with parallel support
1778-
* (\TText{--enable-parallel | HDF5_ENABLE_PARALLEL}). It is useful only when used with the #H5FD_MPIO driver
1778+
* (\TText{HDF5_ENABLE_PARALLEL}). It is useful only when used with the #H5FD_MPIO driver
17791779
* (see H5Pset_fapl_mpio()).
17801780
* \endparblock
17811781
*

0 commit comments

Comments
 (0)