mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r29379] Add individual LT_VERS_* variables for wrapper libraries: c++, fortran, java, hl, hl/c++, hl/fortran to so that the shared object version numbers can be incremented independently.

Browse Source 
Disabled auto-increment of shared object version numbers by h5vers.

Files modified:
    config/lt_vers.am
    java/src/jni/Makefile.am
    hl/src/Makefile.am
    hl/c++/src/Makefile.am
    hl/fortran/src/Makefile.am
    c++/src/Makefile.am
    bin/h5vers
    fortran/src/Makefile.am
This commit is contained in:
Larry Knox 2016-03-09 13:55:31 -05:00
parent 23e97565cf
commit f5234cd194
8 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/h5vers
View File

@ -277,13 +277,17 @@ if ($LT_VERS && $version_increased) {
local($_) = $contentsy; local($_) = $contentsy;
my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m; # As of the HDF5 v1.8.16 release, h5vers should not increment
my $new_lt_revision = $lt_revision+1; # the LT_VERS numbers, so the next 6 lines are commented out.
($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m; # A future version may copy the numbers to H5public.h, so this
# section is retained for future reference.
# my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m;
# my $new_lt_revision = $lt_revision+1;
# ($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m;
open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n"; # open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n";
print FILE $contentsy; # print FILE $contentsy;
close FILE; # close FILE;
} }
# Update the README.txt file # Update the README.txt file

2
c++/src/Makefile.am
View File

@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src
lib_LTLIBRARIES=libhdf5_cpp.la lib_LTLIBRARIES=libhdf5_cpp.la
# Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am) # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) libhdf5_cpp_la_LDFLAGS= -version-info $(LT_CXX_VERS_INTERFACE):$(LT_CXX_VERS_REVISION):$(LT_CXX_VERS_AGE) $(AM_LDFLAGS)
bin_SCRIPTS=h5c++ bin_SCRIPTS=h5c++

33
config/lt_vers.am
View File

@ -19,8 +19,8 @@
# After making changes, run bin/reconfigure to update other configure related # After making changes, run bin/reconfigure to update other configure related
# files like Makefile.in. # files like Makefile.in.
LT_VERS_INTERFACE = 6 LT_VERS_INTERFACE = 6
LT_VERS_REVISION = 224
LT_VERS_AGE = 0 LT_VERS_AGE = 0
LT_VERS_REVISION = 224
## If the API changes *at all*, increment LT_VERS_INTERFACE and ## If the API changes *at all*, increment LT_VERS_INTERFACE and
## reset LT_VERS_REVISION to 0. ## reset LT_VERS_REVISION to 0.
@ -40,9 +40,34 @@ LT_VERS_AGE = 0
## Note that this versioning system doesn't attempt to handle ## Note that this versioning system doesn't attempt to handle
## the effects of the H5_V1_x_COMPAT flag. ## the effects of the H5_V1_x_COMPAT flag.
## ##
## Since the revision number is automatically incremented by ## Version numbers for wrapper shared library files.
## bin/h5vers, don't move LT_VERS_REVISION from the fourth line LT_CXX_VERS_INTERFACE = 6
## without also editing the script! LT_CXX_VERS_REVISION = 224
LT_CXX_VERS_AGE = 0
LT_F_VERS_INTERFACE = 6
LT_F_VERS_REVISION = 224
LT_F_VERS_AGE = 0
LT_HL_VERS_INTERFACE = 6
LT_HL_VERS_REVISION = 224
LT_HL_VERS_AGE = 0
LT_HL_CXX_VERS_INTERFACE = 6
LT_HL_CXX_VERS_REVISION = 224
LT_HL_CXX_VERS_AGE = 0
LT_HL_F_VERS_INTERFACE = 6
LT_HL_F_VERS_REVISION = 224
LT_HL_F_VERS_AGE = 0
LT_JAVA_VERS_INTERFACE = 6
LT_JAVA_VERS_REVISION = 224
LT_JAVA_VERS_AGE = 0
LT_TOOLS_VERS_INTERFACE = 6
LT_TOOLS_VERS_REVISION = 224
LT_TOOLS_VERS_AGE = 0
# Copyright by The HDF Group. # Copyright by The HDF Group.

2
fortran/src/Makefile.am
View File

@ -32,7 +32,7 @@ AM_FCLIBS=$(LIBHDF5)
lib_LTLIBRARIES=libhdf5_fortran.la lib_LTLIBRARIES=libhdf5_fortran.la
# Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am) # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am)
libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) libhdf5_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS)
# Some Fortran compilers can't build shared libraries, so sometimes we # Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so, # want to build a shared C library and a static Fortran library. If so,

2
hl/c++/src/Makefile.am
View File

@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
lib_LTLIBRARIES=libhdf5_hl_cpp.la lib_LTLIBRARIES=libhdf5_hl_cpp.la
# Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am) # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_HL_CXX_VERS_INTERFACE):$(LT_HL_CXX_VERS_REVISION):$(LT_HL_CXX_VERS_AGE) $(AM_LDFLAGS)
# Source files for the library # Source files for the library
# At the moment, only the H5PT Packet Table has a C++ API. # At the moment, only the H5PT Packet Table has a C++ API.

2
hl/fortran/src/Makefile.am
View File

@ -30,7 +30,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s
lib_LTLIBRARIES=libhdf5hl_fortran.la lib_LTLIBRARIES=libhdf5hl_fortran.la
# Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am) # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS)
# Some Fortran compilers can't build shared libraries, so sometimes we # Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so, # want to build a shared C library and a static Fortran library. If so,

2
hl/src/Makefile.am
View File

@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src
lib_LTLIBRARIES=libhdf5_hl.la lib_LTLIBRARIES=libhdf5_hl.la
# Add libtool numbers to the HDF5 hl library (from config/lt_vers.am) # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am)
libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) libhdf5_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS)
# List sources to include in the HDF5 HL Library. # List sources to include in the HDF5 HL Library.
libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c

2
java/src/jni/Makefile.am
View File

@ -31,7 +31,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/java/src/jni $(JNIFLAGS)
lib_LTLIBRARIES=libhdf5_java.la lib_LTLIBRARIES=libhdf5_java.la
# Add libtool numbers to the HDF5 Java (JNI) library (from config/lt_vers.am) # Add libtool numbers to the HDF5 Java (JNI) library (from config/lt_vers.am)
libhdf5_java_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) libhdf5_java_la_LDFLAGS= -version-info $(LT_JAVA_VERS_INTERFACE):$(LT_JAVA_VERS_REVISION):$(LT_JAVA_VERS_AGE) $(AM_LDFLAGS)
# Source files for the library # Source files for the library
libhdf5_java_la_SOURCES=exceptionImp.c h5Constants.c nativeData.c h5util.c h5Imp.c \ libhdf5_java_la_SOURCES=exceptionImp.c h5Constants.c nativeData.c h5util.c h5Imp.c \