[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=5b05801
The following commit has been merged in the master branch:
commit 5b058011860779f58c5c5754d1bd21a8782f671f
Author: Robin Mills <robin at clanmills.com>
Date: Sat Dec 5 15:59:52 2015 +0000
#1041. curl is now building using nmake. exiv2+zlib+expat are OK. --webready still broken. libssh has broken, although OK yesterday.
---
contrib/cmake/msvc/cltest.cpp | 8 +++
contrib/cmake/msvc/cmakeBuild.cmd | 148 +++++++++++++++++++++-----------------
2 files changed, 90 insertions(+), 66 deletions(-)
diff --git a/contrib/cmake/msvc/cltest.cpp b/contrib/cmake/msvc/cltest.cpp
new file mode 100644
index 0000000..a762bc6
--- /dev/null
+++ b/contrib/cmake/msvc/cltest.cpp
@@ -0,0 +1,8 @@
+#include <stdio.h>
+#include <windows.h>
+
+int main(int,const char**)
+{
+ printf("%d sizeof(void*) = %d
",_MSC_VER,sizeof(void*));
+ return 0;
+}
diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 7167358..df1c043 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -210,17 +210,19 @@ 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"
-rem ------
-echo.
+call:cltest
+
+echo.&&echo.&&echo.
+echo.------ cmakeBuild Settings ----------
echo.bash = %_BASH_%
-echo.binpat = %_BINPATH_%
+echo.binpath = %_BINPATH_%
echo.config = %_CONFIG_%
echo.curl = %_CURL_%
echo.exiv2 = %_EXIV2_%
echo.expat = %_EXPAT_%
echo.generator = %_GENERATOR_%
-echo.incpat = %_INCPATH_%
-echo.libpat = %_LIBPATH_%
+echo.incpath = %_INCPATH_%
+echo.libpath = %_LIBPATH_%
echo.libssh = %_LIBSSH_%
echo.openssh = %_OPENSSL_%
echo.temp = %_TEMP_%
@@ -231,7 +233,7 @@ echo.vc = %_VC_%
echo.vs = %_VS_%
echo.webready = %_WEBREADY_%
echo.zlib = %_ZLIB_%
-echo.
+echo.&&echo.&&echo.
if defined _WEBREADY_ (
if /I "%_VS_%" == "2005" set "_UNSUPPORTED_=openssl not available for VS 2005"
@@ -243,16 +245,17 @@ if defined _UNSUPPORTED_ (
call:error_end
)
-IF DEFINED _DRYRUN_ call:end
+IF DEFINED _DRYRUN_ goto end
IF DEFINED _REBUILD_ rmdir/s/q "%_TEMP_%"
+IF DEFINED _PAUSE_ pause
echo ---------- ZLIB building with cmake ------------------
-call:buildLib %_ZLIB_%
+call:buildLib %_ZLIB_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_%
echo ---------- EXPAT building with cmake -----------------
-set "TARGET=--target expat"
-call:buildLib %_EXPAT_%
-set TARGET=
+set "_TARGET_=--target expat"
+call:buildLib %_EXPAT_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_%
+set _TARGET_=
if DEFINED _WEBREADY_ (
echo ---------- OPENSSL installing pre-built binaries -----------------
@@ -260,37 +263,39 @@ if DEFINED _WEBREADY_ (
if errorlevel 1 set _OPENSSL_=
echo ---------- LIBSSH building with cmake -----------------
- call:buildLib %_LIBSSH_% -DWITH_GSSAPI=OFF -DWITH_ZLIB=ON -DWITH_SFTP=ON -DWITH_SERVER=OFF -DWITH_EXAMPLES=OFF -DWITH_NACL=OFF -DWITH_PCAP=OFF
+ 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_=
- rem echo ---------- CURL building with cmake -----------------
- rem call:buildLib %_CURL_% -DBUILD_CURL_TESTS=OFF -DCMAKE_USE_OPENSSL=ON -DCMAKE_USE_LIBSSH2=OFF
- rem if errorlevel 1 set _CURL_=
-
- echo ---------- CURL building with nmake -----------------
- cd "%_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 ..
- xcopy/yesihq builds\libcurl-vc%_VC_%-%RawPlatform%-release-dll-ipv6-sspi-winssl\lib "%_LIBPATH_%"
- xcopy/yesihq builds\libcurl-vc%_VC_%-%RawPlatform%-release-dll-ipv6-sspi-winsslin "%_BINPATH_%"
- xcopy/yesihq builds\libcurl-vc%_VC_%-%RawPlatform%-release-dll-ipv6-sspi-winssl\inc "%_INCPATH_%"
-
+ set CURL_CMAKE=
+ if DEFINED CURL_CMAKE (
+ echo ---------- CURL building with cmake -----------------
+ 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