diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2021-02-09 21:31:09 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-09 21:31:09 (GMT) |
commit | 88960489604861813b3676bc234f49ca8ee937d3 (patch) | |
tree | 7cee9befe030b886d2a319a91822ead2b490fd72 /hl | |
parent | 345892de238beebf02ca733ef519574601b5fdce (diff) | |
download | hdf5-88960489604861813b3676bc234f49ca8ee937d3.zip hdf5-88960489604861813b3676bc234f49ca8ee937d3.tar.gz hdf5-88960489604861813b3676bc234f49ca8ee937d3.tar.bz2 |
Hdf5 1 8 (#328)
* close #195. (#196)
* Update HDF5PluginMacros.cmake
* Update HDF5PluginMacros.cmake
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add script bin/switch_maint_mode.
Add file changes generated by bin reconfigure in
src/H5Edefin.h
src/H5Einit.h
src/H5Epubgen.h
src/H5Eterm.h
* Update MANIFEST for switch_maint_mode.
* Update so numbers to match 1.8.22 release.
* Updated configure with reconfigure.
* Updates and corrections following HDF5 1.8.22 release.
* Commit Makefile.ins with so version numbers updated by bin/reconfigure.
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Diffstat (limited to 'hl')
-rw-r--r-- | hl/c++/src/Makefile.in | 12 | ||||
-rw-r--r-- | hl/fortran/examples/run-hlfortran-ex.sh.in | 25 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 12 | ||||
-rw-r--r-- | hl/src/Makefile.in | 12 |
4 files changed, 42 insertions, 19 deletions
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 564525f..aea6f3f 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -689,23 +689,23 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 14 LT_VERS_REVISION = 0 LT_VERS_AGE = 4 -LT_CXX_VERS_INTERFACE = 15 +LT_CXX_VERS_INTERFACE = 16 LT_CXX_VERS_REVISION = 1 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 -LT_F_VERS_REVISION = 6 +LT_F_VERS_REVISION = 7 LT_F_VERS_AGE = 0 LT_HL_VERS_INTERFACE = 12 -LT_HL_VERS_REVISION = 2 +LT_HL_VERS_REVISION = 3 LT_HL_VERS_AGE = 2 LT_HL_CXX_VERS_INTERFACE = 12 -LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_REVISION = 3 LT_HL_CXX_VERS_AGE = 1 LT_HL_F_VERS_INTERFACE = 10 -LT_HL_F_VERS_REVISION = 5 +LT_HL_F_VERS_REVISION = 6 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 7 +LT_TOOLS_VERS_REVISION = 8 LT_TOOLS_VERS_AGE = 0 # This is our main target diff --git a/hl/fortran/examples/run-hlfortran-ex.sh.in b/hl/fortran/examples/run-hlfortran-ex.sh.in index 7a21563..30ce8ed 100644 --- a/hl/fortran/examples/run-hlfortran-ex.sh.in +++ b/hl/fortran/examples/run-hlfortran-ex.sh.in @@ -30,9 +30,32 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 +# +# Try to derive the path to the installation $prefix established +# by ./configure relative to the examples directory established by +# ./configure. If successful, set `prefix_relto_examplesdir` to the +# relative path. Otherwise, set `prefix_relto_examplesdir` to the +# absolute installation $prefix. +# +# This script uses the value of `prefix` in the user's environment, if +# it is set, below. The content of $() is evaluated in a sub-shell, so +# if `prefix` is set in the user's environment, the shell statements in +# $() won't clobbered it. +# +prefix_relto_examplesdir=$( +prefix=@prefix@ +examplesdir=@examplesdir@ +if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then + echo $(echo ${examplesdir##${prefix}/} | \ + sed 's,[^/][^/]*,..,g') +else + echo $prefix +fi +) + # Where the tool is installed. # default is relative path to installed location of the tools -prefix="${prefix:-@prefix@}" +prefix="${prefix:-../../${prefix_relto_examplesdir}}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 3ef6634..c02d331 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -707,23 +707,23 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 14 LT_VERS_REVISION = 0 LT_VERS_AGE = 4 -LT_CXX_VERS_INTERFACE = 15 +LT_CXX_VERS_INTERFACE = 16 LT_CXX_VERS_REVISION = 1 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 -LT_F_VERS_REVISION = 6 +LT_F_VERS_REVISION = 7 LT_F_VERS_AGE = 0 LT_HL_VERS_INTERFACE = 12 -LT_HL_VERS_REVISION = 2 +LT_HL_VERS_REVISION = 3 LT_HL_VERS_AGE = 2 LT_HL_CXX_VERS_INTERFACE = 12 -LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_REVISION = 3 LT_HL_CXX_VERS_AGE = 1 LT_HL_F_VERS_INTERFACE = 10 -LT_HL_F_VERS_REVISION = 5 +LT_HL_F_VERS_REVISION = 6 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 7 +LT_TOOLS_VERS_REVISION = 8 LT_TOOLS_VERS_AGE = 0 # Our main target, the high-level fortran library diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index cba7048..609b35f 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -688,23 +688,23 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 14 LT_VERS_REVISION = 0 LT_VERS_AGE = 4 -LT_CXX_VERS_INTERFACE = 15 +LT_CXX_VERS_INTERFACE = 16 LT_CXX_VERS_REVISION = 1 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 -LT_F_VERS_REVISION = 6 +LT_F_VERS_REVISION = 7 LT_F_VERS_AGE = 0 LT_HL_VERS_INTERFACE = 12 -LT_HL_VERS_REVISION = 2 +LT_HL_VERS_REVISION = 3 LT_HL_VERS_AGE = 2 LT_HL_CXX_VERS_INTERFACE = 12 -LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_REVISION = 3 LT_HL_CXX_VERS_AGE = 1 LT_HL_F_VERS_INTERFACE = 10 -LT_HL_F_VERS_REVISION = 5 +LT_HL_F_VERS_REVISION = 6 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 7 +LT_TOOLS_VERS_REVISION = 8 LT_TOOLS_VERS_AGE = 0 # This library is our main target. |