diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a70a3dc..7034bb67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,8 @@ SET( PACKAGE_STRING "exiv2 0.26" ) SET( PACKAGE_TARNAME "exiv2" ) SET( PACKAGE_VERSION "0.26" ) SET( PACKAGE_URL "http://www.exiv2.org" ) -SET( GENERIC_LIB_VERSION "15.0.0" ) -SET( GENERIC_LIB_SOVERSION "15" ) +SET( GENERIC_LIB_VERSION "26.0.0" ) +SET( GENERIC_LIB_SOVERSION "26" ) # options and their default values OPTION( EXIV2_ENABLE_SHARED "Build exiv2 as a shared library (dll)" ON ) @@ -75,7 +75,7 @@ IF( MINGW OR UNIX ) -W ) ENDIF() - + execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE COMPILER_VERSION) string(REGEX MATCHALL "[a-z\+]+" GCC_COMPILER_COMPONENTS ${COMPILER_VERSION}) list(GET GCC_COMPILER_COMPONENTS 0 COMPILER) diff --git a/config/configure.ac b/config/configure.ac index 93a75f1a..9d325624 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ(2.61) AC_INIT(exiv2, 0.26, ahuggel@gmx.net) # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -EXIV2_LTVERSION=15:0:0 +EXIV2_LTVERSION=26:0:0 PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") diff --git a/config/ltmain.sh b/config/ltmain.sh index 3506ead3..96488d7a 100755 --- a/config/ltmain.sh +++ b/config/ltmain.sh @@ -6266,7 +6266,7 @@ func_mode_link () major=.$func_arith_result versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 + func_arith $current + 0 #1293 do not bump current because it makes CMake/automake builds incompatible minor_current=$func_arith_result xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" diff --git a/contrib/buildserver/dailyReadMe.txt b/contrib/buildserver/dailyReadMe.txt index b377e230..9894441b 100644 --- a/contrib/buildserver/dailyReadMe.txt +++ b/contrib/buildserver/dailyReadMe.txt @@ -9,10 +9,9 @@ platform = linux Structure of the bundle: dist/linux/bin/exiv2 exiv2 and sample applications -dist/linux/lib/libexiv2.so.15.0.0 shared library - .../lib/exiv2.lib libraries for exiv2/expat/zlib - /include/exiv2/ include files - /share/ man pages +dist/linux/lib/libexiv2.so.26.0.0 shared library +dist/linux/include/exiv2/ include files +dist/linux/share/ man pages dist/samples/ sample code dist/logs/ log files dist/contrib/Qt Qt code and notes @@ -38,10 +37,9 @@ platform = macosx Structure of the bundle: dist/macosx/bin/exiv2 exiv2 and sample applications - .../lib/libexiv2.so.15.0.0.dylib shared library - /lib/exiv2.lib libraries for exiv2/expat/zlib - /include/exiv2/ include files - /share/ man pages +dist/macosx/lib/libexiv2.26.0.0.dylib shared library +dist/macosx/include/exiv2/ include files +dist/macosx/share/ man pages dist/samples/ sample code dist/logs/ log files dist/contrib/Qt Qt code and notes @@ -66,10 +64,10 @@ platform = cygwin ----------------- dist/cygwin/bin/exiv2.exe exiv2.exe and sample applications - .../bin/cygexiv2-14.dll shared library - /lib/exiv2.dll.a libraries for exiv2/expat/zlib - /include/exiv2/ include files - /share/ man pages + .../bin/cygexiv2-26.dll shared library + .../lib/exiv2.dll.a link library + .../include/exiv2/ include files + .../share/ man pages dist/samples/ sample code dist/logs/ log files dist/contrib/Qt Qt code and notes @@ -97,10 +95,10 @@ platform = mingw This a 32bit build of Exiv2 aimed at Qt/MinGW users. dist/mingw/bin/exiv2.exe exiv2.exe and sample applications - .../bin/libexiv2-14.dll shared library - /lib/exiv2.dll.a libraries for exiv2/expat/zlib - /include/exiv2/ include files - /share/ man pages + .../bin/libexiv2-26.dll (+zlib+expat) shared libraries + .../lib/exiv2.dll.a (+zlib+expat) link libraries + .../include/exiv2/ (+zlib+expat) include files + .../share/ man pages dist/samples/ sample code dist/logs/ log files dist/contrib/Qt Qt code and notes @@ -127,12 +125,12 @@ platform = msvc dist\2013\x64\dll\Release\bin\exiv2.exe exiv2.exe and sample applications ...\bin\exiv2.dll dlls for exiv2/expat/zlib - \lib\exiv2.lib libraries for exiv2/expat/zlib - \include\exiv2/ include files - \share\ man pages + ...\lib\exiv2.lib link library + ...\include\exiv2\ include files + ...\share\ man pages dist\samples\ sample code dist\logs\ log files -dist/contrib/Qt Qt code and notes +dist\contrib\Qt Qt code and notes dist\vcvars.bat script used by test_daily.sh To run exiv2.exe: @@ -155,4 +153,4 @@ c:\temp\dist> Robin Mills robin@clanmills.com -2017-03-15 +2017-04-26