[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:59 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=0e3bc82
The following commit has been merged in the master branch:
commit 0e3bc824ba0ed363c2cef15ae164d3c234a0c1e5
Author: Robin Mills <robin at clanmills.com>
Date: Mon Dec 7 00:33:29 2015 +0000
#1041. We don't need openssl! curl is the only person using openssl and can be built with winssl support instead.
Code polishing. Documentation update.
---
contrib/cmake/msvc/ReadMe.txt | 10 +-
contrib/cmake/msvc/cmakeBuild.cmd | 194 +++++++++++++++++------------------
contrib/cmake/msvc/cmakeDefaults.cmd | 1 +
3 files changed, 98 insertions(+), 107 deletions(-)
diff --git a/contrib/cmake/msvc/ReadMe.txt b/contrib/cmake/msvc/ReadMe.txt
index 1838115..487a83e 100755
--- a/contrib/cmake/msvc/ReadMe.txt
+++ b/contrib/cmake/msvc/ReadMe.txt
@@ -5,13 +5,13 @@ How to use this
---------------
1 Setting up your machine
- You need cmake.exe, svn.exe, 7z.exe and curl.exe on your PATH.
+ You need cmake.exe, svn.exe and 7z.exe on your PATH.
- Please get "Windows" versions of cmake etc (NOT Cygwin versions)
+ Please get "Windows" versions of cmake/svn/7z etc (NOT Cygwin or MinGW versions)
You should initialize the Visual Studio environment
using the version of vcvars32.bat or vcvarsall.bat
- installed with Visual Studio. For example
+ installed with Visual Studio. For example:
call "C:\Program Files (x86)\Microsoft Visual Studio 8\VCin
cvars32.bat"
@@ -71,8 +71,8 @@ How to use this
cd ../build
rem download support libraries
- svn export svn://dev.exiv2.org/svn/team/libraries/zlib-1.2.8
- svn export svn://dev.exiv2.org/svn/team/libraries/expat-2.1.0
+ svn export svn://dev.exiv2.org/svn/team/libraries/zlib-1.2.8.tar.gz
+ svn export svn://dev.exiv2.org/svn/team/libraries/expat-2.1.0.tar.gz
...
for webready
diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index baf133c..f02fe18 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -4,35 +4,66 @@ setlocal enableextensions
set "_BUILDDIR_=%CD%"
:GETOPTS
-if /I "%1" == "--help" (
- call:Help
- exit /b
-)
-if /I "%1" == "--webready" set "_WEBREADY_=1"
+if /I "%1" == "--bash" set "_BASH_=%2"& shift
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" == "--curl" set "_CURL_=%2"& shift
if /I "%1" == "--exiv2" set "_EXIV2_=%2"& shift
-if /I "%1" == "--verbose" set ("_VERBOSE_=1 && echo on)"
+if /I "%1" == "--expat" set "_EXPAT_=%2"& shift
+if /I "%1" == "--generator" set "_GENERATOR_=%2"& shift
+if /I "%1" == "--libssh" set "_LIBSSH_=%2"& shift
+if /I "%1" == "--temp" set "_TEMP_=%2"& shift
+if /I "%1" == "--zlib" set "_ZLIB_=%2"& shift
+
+if /I "%1" == "--help" call:Help && goto end
if /I "%1" == "--dryrun" set "_DRYRUN_=1"
+if /I "%1" == "--pause" set "_PAUSE_=1"
if /I "%1" == "--rebuild" set "_REBUILD_=1"
if /I "%1" == "--silent" set "_SILENT_=1"
-if /I "%1" == "--silent" set "_QUIET_=1"
-if /I "%1" == "--quiet" set "_QUIET_=1"
-if /I "%1" == "--video" set "_VIDEO_=1"
-if /I "%1" == "--pause" set "_PAUSE_=1"
-if /I "%1" == "--zlib" set "_ZLIB_=%2"& shift
-if /I "%1" == "--expat" set "_EXPAT_=%2"& shift
-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" == "--static" set "_MODE_=static"
if /I "%1" == "--test" set "_TEST_=1"
-if /I "%1" == "--static" set "_TYPE_=1"
-if /I "%1" == "--bash" set "_BASH_=%2"& shift
+if /I "%1" == "--verbose" set ("_VERBOSE_=1 && echo on)"
+if /I "%1" == "--video" set "_VIDEO_=1"
+if /I "%1" == "--webready" set "_WEBREADY_=1"
shift
if not (%1) EQU () goto GETOPTS
+goto main
+
+:help
+call cmakeDefaults >NUL 2>NUL
+echo Options: --help ^| --webready ^| --rebuild ^| --video ^| --static
+echo. --silent ^| --verbose ^| --pause ^| --dryrun ^| --test
+echo. --exiv2 %_EXIV2_% ^| --temp %_TEMP_% ^| --config %_CONFIG_% ^| --generator generator
+echo. --zlib %_ZLIB_% ^| --expat %_EXPAT_% ^| --curl %_CURL_% ^| --libssh %_LIBSSH_%
+echo. --bash %_BASH_%
+exit /b 0
+
+:report
+echo.&&echo.&&echo.
+echo.------ cmakeBuild Settings ----------
+echo.bash = %_BASH_%
+echo.binpath = %_BINPATH_%
+echo.builddir = %_BUILDDIR_%
+echo.config = %_CONFIG_%
+echo.curl = %_CURL_%
+echo.exiv2 = %_EXIV2_%
+echo.expat = %_EXPAT_%
+echo.generator = %_GENERATOR_%
+echo.incpath = %_INCPATH_%
+echo.libpath = %_LIBPATH_%
+echo.libssh = %_LIBSSH_%
+echo.mode = %_MODE_%
+echo.temp = %_TEMP_%
+echo.test = %_TEST_%
+echo.video = %_VIDEO_%
+echo.vc = %_VC_%
+echo.vs = %_VS_%
+echo.webready = %_WEBREADY_%
+echo.zlib = %_ZLIB_%
+echo.&&echo.&&echo.
+exit /b 0
+:main
if NOT DEFINED _SILENT_ set _VERBOSE_=1
set _UNSUPPORTED_=
@@ -40,7 +71,7 @@ rem ----
call:echo calling cmakeDefaults.cmd
call cmakeDefaults
IF ERRORLEVEL 1 (
- echo "*** setenv.cmd has failed ***" >&2
+ echo "*** cmakeDefaults.cmd has failed ***" >&2
GOTO error_end
)
@@ -53,12 +84,16 @@ if NOT EXIST %_EXIV2_% (
pushd %_EXIV2_%
set _EXIV2_=%CD%
popd
+if NOT EXIST %_EXIV2_%\src
ersion.cpp (
+ echo "_EXIV2_ = %_EXIV2_% %_EXIV2_%\src
ersion.cpp does not exist ***" >&2
+ exit /b 1
+)
call:echo _EXIV2_ = %_EXIV2_%
rem ----
call:echo testing VSINSTALLDIR "%VSINSTALLDIR%"
IF NOT DEFINED VSINSTALLDIR (
- echo "VSINSTALLDIR not set. Run vcvars32.bat or vcvarsall.bat ***"
+ echo "VSINSTALLDIR not set. Run vcvars32.bat or vcvarsall.bat or vcvars.bat ***"
GOTO error_end
)
IF NOT EXIST "%VSINSTALLDIR%" (
@@ -82,32 +117,26 @@ rem ----
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 "_VS_=2015"
set "_VC_=14"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 12" (
set "VS_CMAKE=Visual Studio 12 2013"
- set "VS_OPENSSL=vs2013"
set "_VS_=2013"
set "_VC_=12"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 11" (
set "VS_CMAKE=Visual Studio 11 2012"
- set "VS_OPENSSL=vs2012"
set "_VS_=2012"
set "_VC_=11"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 10" (
set "VS_CMAKE=Visual Studio 10 2010"
- set "VS_OPENSSL=vs2010"
set "_VS_=2010"
set "_VC_=10"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 9" (
set "VS_CMAKE=Visual Studio 9 2008"
- set "VS_OPENSSL=vs2008"
set "_VS_=2008"
set "_VC_=9"
) else if /I "%VS_PROG_FILES%" == "Microsoft Visual Studio 8" (
set "VS_CMAKE=Visual Studio 8 2005"
- set "VS_OPENSSL=vs2005"
set "_VS_=2005"
set "_VC_=8"
) else (
@@ -175,6 +204,7 @@ IF ERRORLEVEL 1 (
rem ----
call:echo testing temporary directory _TEMP_ = %_TEMP_%
if defined _REBUILD_ if EXIST "%_TEMP_%" rmdir/s/q "%_TEMP_%"
+if defined _REBUILD_ del/s CMakeCache.txt >NUL 2>NUL
IF NOT EXIST "%_TEMP_%" mkdir "%_TEMP_%"
pushd "%_TEMP_%"
set "_TEMP_=%CD%"
@@ -183,8 +213,7 @@ call:echo _TEMP_ = %_TEMP_%
rem ----
call:echo testing INSTALL
-if defined _TYPE_ SET _INSTALL_=dist\%_VS_%\%Platform%\static\%_CONFIG_%
-if NOT defined _TYPE_ SET _INSTALL_=dist\%_VS_%\%Platform%\dll\%_CONFIG_%
+SET _INSTALL_=dist\%_VS_%\%Platform%\%_MODE_%\%_CONFIG_%
if NOT EXIST %_INSTALL_% mkdir %_INSTALL_%
IF NOT EXIST %_INSTALL_% mkdir %_INSTALL_%
pushd %_INSTALL_%
@@ -195,6 +224,7 @@ call:echo _INSTALL_ = %_INSTALL_%
set "_LIBPATH_=%_INSTALL_%in"
set "_INCPATH_=%_INSTALL_%\include"
set "_BINPATH_=%_INSTALL_%in"
+set "_ONCPATH_=%_INCPATH_"
set _LIBPATH_=%_LIBPATH_:\=/%
set _INCPATH_=%_INCPATH_:\=/%
set _BINPATH_=%_BINPATH_:\=/%
@@ -207,45 +237,12 @@ 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 _TYPE_ set "_TYPE_=-DCMAKE_LINK=static"
+if /I "%_MODE_%" == "static" "_LINK_=-DCMAKE_LINK=static"
call:cltest
-
-echo.&&echo.&&echo.
-echo.------ cmakeBuild Settings ----------
-echo.bash = %_BASH_%
-echo.binpath = %_BINPATH_%
-echo.config = %_CONFIG_%
-echo.curl = %_CURL_%
-echo.exiv2 = %_EXIV2_%
-echo.expat = %_EXPAT_%
-echo.generator = %_GENERATOR_%
-echo.incpath = %_INCPATH_%
-echo.libpath = %_LIBPATH_%
-echo.libssh = %_LIBSSH_%
-echo.openssh = %_OPENSSL_%
-echo.temp = %_TEMP_%
-echo.test = %_TEST_%
-echo.type = %_TYPE_%
-echo.video = %_VIDEO_%
-echo.vc = %_VC_%
-echo.vs = %_VS_%
-echo.webready = %_WEBREADY_%
-echo.zlib = %_ZLIB_%
-echo.&&echo.&&echo.
-
-if defined _WEBREADY_ (
- if /I "%_VS_%" == "2005" set "_UNSUPPORTED_=openssl not available for VS 2005"
-)
-
-if defined _UNSUPPORTED_ (
- echo %_UNSUPPORTED_%
- call:error_end
-)
+call:report
IF DEFINED _DRYRUN_ goto end
-IF DEFINED _REBUILD_ rmdir/s/q "%_TEMP_%"
IF DEFINED _PAUSE_ pause
echo ---------- ZLIB building with cmake ------------------
@@ -257,12 +254,6 @@ call:buildLib %_EXPAT_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_%
set _TARGET_=
if DEFINED _WEBREADY_ (
- echo ---------- OPENSSL installing pre-built binaries -----------------
- call:getOPENSSL %_OPENSSL_%
- if errorlevel 1 set _OPENSSL_= && set _WEBREADY_=
-)
-
-if DEFINED _WEBREADY_ (
echo ---------- LIBSSH building with cmake -----------------
call:buildLib %_LIBSSH_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DCMAKE_LIBRARY_PATH=%_LIBPATH_% -DCMAKE_INCLUDE_PATH=%_INCPATH_% -DWITH_GSSAPI=OFF -DWITH_ZLIB=ON -DWITH_SFTP=ON -DWITH_SERVER=OFF -DWITH_EXAMPLES=OFF -DWITH_NACL=OFF -DWITH_PCAP=OFF
if errorlevel 1 set _LIBSSH_= && set _WEBREADY_=
@@ -275,19 +266,23 @@ if DEFINED _WEBREADY_ (
call:buildLib %_CURL_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DCMAKE_LIBRARY_PATH=%_LIBPATH_% -DCMAKE_INCLUDE_PATH=%_INCPATH_% -DWITH_GSSAPI=OFF -DWITH_ZLIB=OFF -DWITH_SFTP=OFF -DWITH_SERVER=OFF -DWITH_EXAMPLES=OFF -DWITH_NACL=OFF -DWITH_PCAP=OFF -DCMAKE_USE_LIBSSH2=OFF -DCMAKE_USE_LIBSSH=OFF
if errorlevel 1 set _CURL_=
) ELSE (
- echo ---------- CURL building with nmake -----------------
- pushd "%_TEMP_%"
- IF EXIST %_CURL_% rmdir/s/q %_CURL_%
- IF NOT EXIST %_CURL_%.tar.gz svn export svn://dev.exiv2.org/svn/team/libraries/%_CURL_%.tar.gz >NUL
- IF NOT EXIST %_CURL_%.tar 7z x %_CURL_%.tar.gz
- 7z x %_CURL_%.tar
- cd "%_CURL_%\winbuild"
- call:run nmake /f Makefile.vc mode=dll vc=%_VC_% machine=%RawPlatform% "WITH_DEVEL=%_INSTALL_%" WITH_ZLIB=dll WITH_SSL=dll
- cd ..
- copy/y builds\libcurl-vc%_VC_%-%RawPlatform%-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib\* "%_LIBPATH_%"
- copy/y builds\libcurl-vc%_VC_%-%RawPlatform%-release-dll-ssl-dll-zlib-dll-ipv6-sspiin\* "%_BINPATH_%"
- xcopy/yesihq builds\libcurl-vc%_VC_%-%RawPlatform%-release-dll-ssl-dll-zlib-dll-ipv6-sspi\include
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list