From 4dde2b61d2fe8f7d370eb4f70b8d1f81d81941dc Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 23 Mar 2016 21:45:25 +0100 Subject: [PATCH 1/7] COPYING: - year in copyright changed to 2016 --- COPYING | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index 59c0886..db1b433 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ *** Copyright Notice *** -H5hut Copyright (c) 2006-2010, The Regents of the University of California, +H5hut Copyright (c) 2006-2016, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy) and the Paul Scherrer Institut (Switzerland). All rights reserved. @@ -25,7 +25,7 @@ and to permit others to do so. *** License agreement *** -H5Part Copyright (c) 2006-2009, The Regents of the University of California, +H5hut Copyright (c) 2006-2016, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy) and the Paul Scherrer Institut (Switzerland). All rights reserved. From 3c8b11f9eb59ad3e14ffd34a2cde063374439a32 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 23 Mar 2016 21:46:37 +0100 Subject: [PATCH 2/7] src/{C,Fortran}/Makefile.am: - include_HEADERS fixed --- src/C/Makefile.am | 15 ++++++++++----- src/Fortran/Makefile.am | 6 ++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/C/Makefile.am b/src/C/Makefile.am index 9e76b9c..8753d9a 100644 --- a/src/C/Makefile.am +++ b/src/C/Makefile.am @@ -3,11 +3,6 @@ if ENABLE_C # Header files that I wish to install in $(prefix)/include include_HEADERS = \ $(top_srcdir)/src/include/H5.h \ - $(top_srcdir)/src/include/H5_attribs.h \ - $(top_srcdir)/src/include/H5_model.h \ - $(top_srcdir)/src/include/H5Part.h \ - $(top_srcdir)/src/include/H5Part_io.h \ - $(top_srcdir)/src/include/H5Part_model.h \ $(top_srcdir)/src/include/H5Block.h \ $(top_srcdir)/src/include/H5Block_attribs.h \ $(top_srcdir)/src/include/H5Block_io.h \ @@ -18,6 +13,16 @@ include_HEADERS = \ $(top_srcdir)/src/include/H5Fed_retrieve.h \ $(top_srcdir)/src/include/H5Fed_store.h \ $(top_srcdir)/src/include/H5Fed_tags.h \ + $(top_srcdir)/src/include/H5Part.h \ + $(top_srcdir)/src/include/H5Part_io.h \ + $(top_srcdir)/src/include/H5Part_model.h \ + $(top_srcdir)/src/include/H5_debug.h \ + $(top_srcdir)/src/include/H5_error.h \ + $(top_srcdir)/src/include/H5_file.h \ + $(top_srcdir)/src/include/H5_file_attribs.h \ + $(top_srcdir)/src/include/H5_log.h \ + $(top_srcdir)/src/include/H5_model.h \ + $(top_srcdir)/src/include/H5_step_attribs.h \ $(top_srcdir)/src/include/H5hut.h # Listing of all possible headers that I may include diff --git a/src/Fortran/Makefile.am b/src/Fortran/Makefile.am index 88710a1..8803b68 100644 --- a/src/Fortran/Makefile.am +++ b/src/Fortran/Makefile.am @@ -4,10 +4,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/include F90_FILES = \ $(top_srcdir)/src/include/H5hut.f90 \ - $(top_srcdir)/src/include/H5.f90 \ $(top_srcdir)/src/include/H5_const.f90 \ - $(top_srcdir)/src/include/H5_attribs.f90 \ + $(top_srcdir)/src/include/H5_file.f90 \ $(top_srcdir)/src/include/H5_model.f90 \ + $(top_srcdir)/src/include/H5_attribs.f90 \ + $(top_srcdir)/src/include/H5_debug.f90 \ + $(top_srcdir)/src/include/H5_error.f90 \ $(top_srcdir)/src/include/H5Part_model.f90 \ $(top_srcdir)/src/include/H5Part_io.f90 \ $(top_srcdir)/src/include/H5Block_model.f90 \ From 851905361ddd5e851b51eb309ba42f8c92d6fe79 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 23 Mar 2016 21:47:40 +0100 Subject: [PATCH 3/7] src/Fortran/H5.c: - h5_setprop_file_corevfd(): bugfix --- src/Fortran/H5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Fortran/H5.c b/src/Fortran/H5.c index 4199020..0b5974a 100644 --- a/src/Fortran/H5.c +++ b/src/Fortran/H5.c @@ -105,7 +105,7 @@ h5_setprop_file_corevfd ( "prop=%lld, increment=%lld", (long long int)*_prop, (long long int)*increment); h5_prop_t prop = (h5_prop_t)*_prop; - H5_API_RETURN ((h5_int64_t)h5_set_prop_file_core_vfd (prop, increment)); + H5_API_RETURN ((h5_int64_t)h5_set_prop_file_core_vfd (prop, *increment)); } #define h5_setprop_file_align FC_MANGLING ( \ From 5362498a95ed6bdfe8dbd53e79340aed7c7c6ecd Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 23 Mar 2016 21:49:34 +0100 Subject: [PATCH 4/7] src/include/H5_const.f90: - bugfix in definition of H5_FAILED --- src/include/H5_const.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/H5_const.f90 b/src/include/H5_const.f90 index 197a9b9..c0861f5 100644 --- a/src/include/H5_const.f90 +++ b/src/include/H5_const.f90 @@ -30,7 +30,7 @@ INTEGER*8, PARAMETER :: H5_OK = H5_SUCCESS INTEGER*8, PARAMETER :: H5_NOK = -1 INTEGER*8, PARAMETER :: H5_FAILURE = -2 - INTEGER*8, PARAMETER :: H5_FAILED = H5_FAILED + INTEGER*8, PARAMETER :: H5_FAILED = H5_FAILURE INTEGER*8, PARAMETER :: H5_ERR_BADF = -9 INTEGER*8, PARAMETER :: H5_ERR_NOMEM = -12 INTEGER*8, PARAMETER :: H5_ERR_INVAL = -22 From f0c2f29091e4407b37c288abaf05bf2164d751f3 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 23 Mar 2016 21:50:10 +0100 Subject: [PATCH 5/7] src/include/H5hut.f90: - bugfix in included files --- src/include/H5hut.f90 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/include/H5hut.f90 b/src/include/H5hut.f90 index 0749f5b..d0137b6 100644 --- a/src/include/H5hut.f90 +++ b/src/include/H5hut.f90 @@ -11,8 +11,7 @@ MODULE H5hut include 'H5_file.f90' include 'H5_model.f90' - include 'H5_file_attribs.f90' - include 'H5_step_attribs.f90' + include 'H5_attribs.f90' include 'H5_log.f90' include 'H5_debug.f90' include 'H5_error.f90' From 2a8a43af39072ee9300b0518b981c8ffb716a327 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 23 Mar 2016 21:51:00 +0100 Subject: [PATCH 6/7] src/include/H5_debug.f90: - h5_set_debug_mask(): bugfix --- src/include/H5_debug.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/H5_debug.f90 b/src/include/H5_debug.f90 index af941fa..d15202b 100644 --- a/src/include/H5_debug.f90 +++ b/src/include/H5_debug.f90 @@ -28,7 +28,7 @@ !! \see h5_get_debug_mask() SUBROUTINE h5_set_debug_mask ( mask ) - INTEGER*9, INTEGER(IN) :: mask !< [in] debug mask + INTEGER*8, INTENT(IN) :: mask !< [in] debug mask END SUBROUTINE h5_set_debug_mask !> From 7002b73e82f0b000415b4f752de69e2f505f05b0 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 23 Mar 2016 22:01:55 +0100 Subject: [PATCH 7/7] src/{Fortran,h5core}/Makefile.am: - do not install the libs in src/lib --- src/Fortran/Makefile.am | 2 +- src/h5core/Makefile.am | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Fortran/Makefile.am b/src/Fortran/Makefile.am index 8803b68..c26383d 100644 --- a/src/Fortran/Makefile.am +++ b/src/Fortran/Makefile.am @@ -52,7 +52,7 @@ $(top_srcdir)/src/include/H5hut.f: $(F90_FILES) awk '/INTEGER\*8 FUNCTION/{print " " $$1 " " $$3}' $^ >>$@ all-local: $(top_srcdir)/src/include/H5hut.f - $(INSTALL) -m644 .libs/libH5hutF.a $(top_builddir)/src/lib + endif clean: clean-am diff --git a/src/h5core/Makefile.am b/src/h5core/Makefile.am index 09a386d..7db5297 100644 --- a/src/h5core/Makefile.am +++ b/src/h5core/Makefile.am @@ -99,14 +99,9 @@ libH5hut_la_DEPENDENCIES = $(EXTRA_HEADERS) libH5hut_la_LDFLAGS = -version-info 2:0:0 -#all-local: -# $(INSTALL) -m0755 -d $(top_builddir)/src/lib -# $(INSTALL) -m644 .libs/libH5hut.a $(top_builddir)/src/lib - install-exec-local: @$(INSTALL) -d $(DESTDIR)$(includedir)/h5core @$(INSTALL) -m644 $(top_srcdir)/src/include/h5core/*.h $(DESTDIR)$(includedir)/h5core/ clean-local: - $(RM) -f $(top_srcdir)/src/lib/libH5hut.* $(RM) -f *~