Skip to content

Commit db576b0

Browse files
authored
Merge branch 'HDFGroup:develop' into develop-s3-tools
2 parents 7381317 + 53f415d commit db576b0

33 files changed

+10
-1461
lines changed

.github/workflows/main-cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- "MacOS Clang"
4040

4141
# This is where we list the bulk of the options for each configuration.
42-
# The key-value pair values are usually appropriate for being CMake or
43-
# Autotools configure values, so be aware of that.
42+
# The key-value pair values are usually appropriate for being CMake
43+
# configure values, so be aware of that.
4444

4545
include:
4646

.github/workflows/tarball.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ jobs:
9797
path: hdfsrc
9898
ref: '${{needs.check_commits.outputs.branch_ref }}'
9999

100-
- name: Install Autotools Dependencies (Linux, serial)
100+
- name: Install Linux Dependencies (Linux, serial)
101101
run: |
102102
sudo apt update
103-
sudo apt install automake autoconf libtool libtool-bin gzip dos2unix
103+
sudo apt install gzip dos2unix
104104
105105
- name: Retrieve version
106106
id: version

.github/workflows/vol_adios2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
sudo apt-get update
26-
sudo apt-get install automake autoconf libtool libtool-bin libopenmpi-dev
26+
sudo apt-get install libopenmpi-dev
2727
2828
- name: Checkout HDF5
2929
uses: actions/[email protected]

.github/workflows/vol_ext_passthru.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install dependencies
2020
run: |
2121
sudo apt-get update
22-
sudo apt-get install automake autoconf libtool libtool-bin libopenmpi-dev
22+
sudo apt-get install libopenmpi-dev
2323
2424
- name: Checkout HDF5
2525
uses: actions/[email protected]

.github/workflows/vol_rest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install dependencies
4040
run: |
4141
sudo apt-get update
42-
sudo apt-get install automake autoconf libtool libtool-bin libcurl4-openssl-dev libyajl-dev
42+
sudo apt-get install libcurl4-openssl-dev libyajl-dev
4343
4444
- name: Checkout HDF5
4545
uses: actions/[email protected]

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ Please make sure that you check the items applicable to your pull request:
119119
* Code
120120
* [ ] Does the pull request have a corresponding GitHub issue and clear purpose?
121121
* [ ] Does the pull request follow HDF5 best practices (naming conventions, code portability, code structure, etc.)? <<TODO: link to the document>>
122-
* [ ] If changes were done to Autotools build, were they added to CMake and vice versa?
123122
* [ ] Is the pull request applicable to any other branches? If yes, which ones? Please document it in the GitHub issue.
124123
* [ ] Is the new code sufficiently documented for future maintenance?
125124
* [ ] Does the new feature require a change to an existing API? See "API Compatibility Macros" document (https://hdfgroup.github.io/hdf5/develop/d7/d26/api-compat-macros.html)

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
![HDF5 Logo][u3]
1515

1616
[![develop cmake build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/cmake.yml?branch=develop&label=HDF5%20develop%20CMake%20CI)](https://github.com/HDFGroup/hdf5/actions/workflows/cmake.yml?query=branch%3Adevelop)
17-
[![develop autotools build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/autotools.yml?branch=develop&label=HDF5%20develop%20Autotools%20CI)](https://github.com/HDFGroup/hdf5/actions/workflows/autotools.yml?query=branch%3Adevelop)
1817
[![HDF-EOS5 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/hdfeos5.yml?branch=develop&label=HDF-EOS5)](https://github.com/HDFGroup/hdf5/actions/workflows/hdfeos5.yml?query=branch%3Adevelop)
1918
[![netCDF build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/netcdf.yml?branch=develop&label=netCDF)](https://github.com/HDFGroup/hdf5/actions/workflows/netcdf.yml?query=branch%3Adevelop)
2019
[![h5py build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/h5py.yml?branch=develop&label=h5py)](https://github.com/HDFGroup/hdf5/actions/workflows/h5py.yml?query=branch%3Adevelop)

doxygen/dox/HDF5CompressionTroubleshooting.dox

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,7 @@ Everywhere in this document, the term \b szip refers to the \b szip filter and t
7171
\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)
7272
libraries, respectively, to be present on the system and to be enabled during HDF5 configuration with
7373
this autotools configure command:
74-
\code
75-
./configure –with-zlib=/path… –with-szlib=/path… <other flags>
76-
\endcode
77-
There is one important difference in the behavior of GNU Autotools configure between \b gzip and \b szip.
78-
On Unix systems,\b gzip compression is enabled automatically if the \b zlib library is present on the system
79-
in default locations without explicitly specifying <code>–with-zlib=/path</code>. For example, if
80-
<code>libz.so</code> is installed under <code>/usr/lib</code> with the
81-
header under <code>/usr/include</code> or under <code>/usr/local/lib</code> with the header under
82-
<code>/usr/local/include</code>, the following HDF5 configure command will find the \b gzip library and will
83-
configure the compression filter in:
84-
\code
85-
./configure
86-
\endcode
87-
With GNU Autotools configure will not fail if libraries supporting the requested compression method are not found, for example,
88-
because a specified path was not correct, or the library is missing.
89-
90-
Or CMake configure command:
74+
CMake configure command:
9175
\code
9276
cmake -G "Unix Makefiles" -DHDF5_ENABLE_ZLIB_SUPPORT=ON -DHDF5_ENABLE_SZIP_SUPPORT=ON -D<other flags>
9377
\endcode

doxygen/dox/branches-explained.dox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ support.
3131
\section sec_branchexpl_release Release branches
3232
Release branches are used to prepare a new production release. They are primarily used to allow for
3333
last minute dotting of i's and crossing of t's
34-
(things like setting the release version, finalizing release notes, and generating Autotools files)
34+
(things like setting the release version, finalizing release notes, and generating files)
3535
and do not include new development.
3636
They are created from the maintenance branch at the time of the maintenance release and have
3737
names like hdf5_1_10_N, where N is the minor release number. Once the release is done it is

doxygen/dox/file-locking.dox

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ You can set the file locking defaults at configure time. This sets the defaults
172172
for the associated properties in the fapl. Users can override the configure
173173
defaults using #H5Pset_file_locking or the <code>HDF5_USE_FILE_LOCKING</code>
174174
environment variable.
175-
176-
<h4>Autotools</h4>
177-
\li <code>--enable-file-locking=(yes</td><td>no</td><td>best-effort)</code> sets the file locking behavior.
178-
<code>on</code> and <code>off</code> should be self-explanatory. <code>best-effort</code> turns file locking
179-
on but ignores file locks when they are disabled (default: <code>best-effort</code>).
180-
181175
<h4>CMake</h4>
182176
\li set <code>IGNORE_DISABLED_FILE_LOCK</code> to <code>ON</code> to ignore file locks when they
183177
\li are disabled on the file system (default: <code>ON</code>).

test/test_abort_fail.sh.in

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

0 commit comments

Comments
 (0)