[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:58 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c5136b4
The following commit has been merged in the master branch:
commit c5136b444be89c1ab71d2b1e290a91f4557103cb
Author: Robin Mills <robin at clanmills.com>
Date: Sat Nov 28 21:12:20 2015 +0000
Added cmakeBuild --static option. Fixed issues with include <stdint.h> in include/exiv2/types.hpp Documentation update.
---
contrib/cmake/msvc/ReadMe.txt | 14 +++++-----
contrib/cmake/msvc/cmakeBuild.cmd | 51 +++++++++++++++++++++-------------
contrib/cmake/msvc/cmakeRebuildAll.cmd | 13 +--------
include/exiv2/types.hpp | 3 ++
4 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/contrib/cmake/msvc/ReadMe.txt b/contrib/cmake/msvc/ReadMe.txt
index 8293a75..9e6dec9 100755
--- a/contrib/cmake/msvc/ReadMe.txt
+++ b/contrib/cmake/msvc/ReadMe.txt
@@ -170,13 +170,13 @@ How to use this
12 build+test cycles of about 5 minutes each.
TODO:
-Build static (currently we always build shared)
-Build other configs (eg --config Debug)
---webready isn't working
+--webready isn't working (Daniel to fix)
Status:
-2015-11-27 Ready for use by others
- Minor changes. Solved 'cygwin tee' issue (redirect and tail -f)
+2015-11-28 Added option -static
+ Build into: dist/2005/x64/dll/Release/{lib|bin|include}
+
+2015-11-27 Minor changes. Solved 'cygwin tee' issue (redirect and tail -f)
Reinstalled MSVC 2010 and 2012 on laptop and retested.
Documentation update.
@@ -204,8 +204,8 @@ Status:
2015-11-16 "Work in Progress" = Not working yet.
These script are not for public use at the moment by Daniel or anybody else.
-Rather than endlessly discuss these scripts with Daniel
-I'm going to do parallel development and see how that goes.
+ Rather than endlessly discuss these scripts with Daniel
+ I'm going to do parallel development and see how that goes.
I'll discuss this with Daniel when I'm convinced my versions are working well.
diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 0cfdee5..103bb0f 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -13,7 +13,7 @@ if /I "%1" == "--config" set "_CONFIG_=%2"& shift
if /I "%1" == "--temp" set "_TEMP_=%2"& shift
if /I "%1" == "--generator" set "_GENERATOR_=%2"& shift
if /I "%1" == "--exiv2" set "_EXIV2_=%2"& shift
-if /I "%1" == "--verbose" set "_VERBOSE_=1"
+if /I "%1" == "--verbose" set ("_VERBOSE_=1 && echo on)"
if /I "%1" == "--dryrun" set "_DRYRUN_=1"
if /I "%1" == "--rebuild" set "_REBUILD_=1"
if /I "%1" == "--silent" set "_SILENT_=1"
@@ -27,12 +27,13 @@ if /I "%1" == "--libssh" set "_LIBSSH_=%2"& shift
if /I "%1" == "--curl" set "_CURL_=%2"& shift
if /I "%1" == "--openssl" set "_OPENSSL_=%2"& shift
if /I "%1" == "--test" set "_TEST_=1"
+if /I "%1" == "--static" set "_TYPE_=1"
if /I "%1" == "--bash" set "_BASH_=%2"& shift
shift
if not (%1) EQU () goto GETOPTS
-set _VERBOSE_=1
+if NOT DEFINED _SILENT_ set _VERBOSE_=1
rem ----
call:echo calling cmakeDefaults.cmd
@@ -81,21 +82,27 @@ call:echo setting CMake Generator
if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 14" (
set "VS_CMAKE=Visual Studio 14 2015"
set "VS_OPENSSL=vs2015"
+ set "_VC_=2015"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 12" (
set "VS_CMAKE=Visual Studio 12 2013"
set "VS_OPENSSL=vs2013"
+ set "_VC_=2013"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 11" (
set "VS_CMAKE=Visual Studio 11 2012"
set "VS_OPENSSL=vs2012"
+ set "_VC_=2012"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 10" (
set "VS_CMAKE=Visual Studio 10 2010"
set "VS_OPENSSL=vs2010"
+ set "_VC_=2010"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 9" (
set "VS_CMAKE=Visual Studio 9 2008"
set "VS_OPENSSL=vs2008"
+ set "_VC_=2008"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 8" (
set "VS_CMAKE=Visual Studio 8 2005"
set "VS_OPENSSL=vs2005"
+ set "_VC_=2005"
) else (
echo "*** Unsupported version of Visual Studio in '%VSINSTALLDIR%' ***"
GOTO error_end
@@ -159,16 +166,19 @@ IF ERRORLEVEL 1 (
)
rem ----
-call:echo testing temporary directory
+call:echo testing temporary directory _TEMP_ = %_TEMP_%
+if defined _REBUILD_ if EXIST "%_TEMP_%" rmdir/s/q "%_TEMP_%"
IF NOT EXIST "%_TEMP_%" mkdir "%_TEMP_%"
pushd "%_TEMP_%"
set "_TEMP_=%CD%"
popd
-call:echo _TEMP_ = %_TEMP_%
+call:echo _TEMP_ = %_TEMP_%
rem ----
call:echo testing INSTALL
-SET _INSTALL_=dist
+if defined _TYPE_ SET _INSTALL_=dist\%_VC_%\%Platform%\static\%_CONFIG_%
+if NOT defined _TYPE_ SET _INSTALL_=dist\%_VC_%\%Platform%\dll\%_CONFIG_%
+if NOT EXIST %_INSTALL_% mkdir %_INSTALL_%
IF NOT EXIST %_INSTALL_% mkdir %_INSTALL_%
pushd %_INSTALL_%
set "_INSTALL_=%CD%"
@@ -189,25 +199,28 @@ if defined _TEST_ if NOT EXIST "%_BASH_%" (
if NOT DEFINED _GENERATOR_ set "_GENERATOR_=%VS_CMAKE%"
if /I "%_GENERATOR_%" == "NMake" set "_GENERATOR_=NMake Makefiles"
-if defined _VIDEO_ set _VIDEO_=-DEXIV2_ENABLE_VIDEO=ON
+if defined _VIDEO_ set "_VIDEO_=-DEXIV2_ENABLE_VIDEO=ON"
+if defined _TYPE_ set "_TYPE_=-DCMAKE_LINK=static"
rem ------
echo.
+echo.bash = %_BASH_%
+echo.binpat = %_BINPATH_%
echo.config = %_CONFIG_%
-echo.video = %_VIDEO_%
-echo.webready = %_WEBREADY_%
+echo.curl = %_CURL_%
echo.exiv2 = %_EXIV2_%
-echo.generator = %_GENERATOR_%
echo.expat = %_EXPAT_%
-echo.zlib = %_ZLIB_%
+echo.generator = %_GENERATOR_%
+echo.incpat = %_INCPATH_%
+echo.libpat = %_LIBPATH_%
echo.libssh = %_LIBSSH_%
-echo.curl = %_CURL_%
echo.openssh = %_OPENSSL_%
-echo.libpat = %_LIBPATH_%
-echo.incpat = %_INCPATH_%
-echo.binpat = %_BINPATH_%
+echo.temp = %_TEMP_%
echo.test = %_TEST_%
-echo.bash = %_BASH_%
+echo.type = %_TYPE_%
+echo.video = %_VIDEO_%
+echo.webready = %_WEBREADY_%
+echo.zlib = %_ZLIB_%
echo.
IF DEFINED _DRYRUN_ exit /b 1
@@ -272,7 +285,7 @@ pushd "%EXIV_B%"
if defined _WEBREADY_ set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=ON
if defined _VIDEO_ set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=ON
- call:run cmake -G "%_GENERATOR_%" ^
+ call:run cmake -G "%_GENERATOR_%" %_TYPE_% ^
"-DCMAKE_INSTALL_PREFIX=%_INSTALL_%" "-DCMAKE_LIBRARY_PATH=%_LIBPATH_%" ^
"-DCMAKE_INCLUDE_PATH=%_INCPATH_%" ^
-DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_BUILD_SAMPLES=ON ^
@@ -303,10 +316,10 @@ pushd "%EXIV_B%"
if NOT defined _SILENT_ copy/y "samples\%_CONFIG_%\"*.exe "%_INSTALL_%in"
popd
+
if defined _TEST_ (
- for /f "tokens=*" %%a in ('cygpath -au .') do set BUILDDIR=%%a
pushd "%_EXIV2_% est"
- "%_BASH_%" -c "export 'PATH=/usr/bin:$PATH' ; ./testMSVC.sh ${BUILDDIR}/dist/bin"
+ "%_BASH_%" -c "export 'PATH=/usr/bin:$PATH' ; ./testMSVC.sh $(cygpath -au '%_BINPATH_%')"
popd
exit /b 0
)
@@ -364,7 +377,7 @@ if NOT EXIST "%LIB_B%" mkdir "%LIB_B%"
pushd "%LIB_B%"
- call:run cmake -G "%_GENERATOR_%" ^
+ call:run cmake -G "%_GENERATOR_%" %_TYPE_% ^
"-DCMAKE_INSTALL_PREFIX=%_INSTALL_%" ^
"-DCMAKE_LIBRARY_PATH=%_LIBPATH_%" ^
"-DCMAKE_INCLUDE_PATH=%_INCPATH_%" ^
diff --git a/contrib/cmake/msvc/cmakeRebuildAll.cmd b/contrib/cmake/msvc/cmakeRebuildAll.cmd
index 22cf679..a8957e6 100755
--- a/contrib/cmake/msvc/cmakeRebuildAll.cmd
+++ b/contrib/cmake/msvc/cmakeRebuildAll.cmd
@@ -1,14 +1,3 @@
-for %%a in (64 32) do for %%v in (2012 2010 2015 2013 2008 2005) do cmd /c "vcvars %%v %%a && cmakeBuild --rebuild --test 2>&1"
+for %%a in (64 32) do for %%v in (2015 2013 2012 2010 2008 2005) do cmd /c "vcvars %%v %%a && cmakeBuild --rebuild --test 2>&1"
rem cmd /c "vcvars 2012 64 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2012 32 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2015 64 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2015 32 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2013 64 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2013 32 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2005 64 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2005 32 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2010 64 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2010 32 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2008 64 && cmakeBuild --rebuild --test 2>&1"
-rem cmd /c "vcvars 2008 32 && cmakeBuild --rebuild --test 2>&1"
diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp
index 4098633..e7009f3 100644
--- a/include/exiv2/types.hpp
+++ b/include/exiv2/types.hpp
@@ -45,8 +45,11 @@
#include <sstream>
#ifdef _MSC_VER
+// Allow him to use Microsoft's stdint.h for 2015 and up
+# if _MSC_VER >= 1900
# ifdef EXV_HAVE_STDINT_H
# undef EXV_HAVE_STDINT_H
+# endif
# endif
#endif
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list