[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:47:15 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a3f62e3
The following commit has been merged in the master branch:
commit a3f62e3d9435a0886f06ef392da1ae61d725c43e
Author: Robin Mills <robin at clanmills.com>
Date: Tue Oct 25 23:14:43 2016 +0000
#1226 Rename msvc2005 as msvc. msvc2003 will be removed from trunk when development of v0.27 begins.
---
README | 25 +++----
README-CMAKE | 38 +++++-----
contrib/buildserver/jenkins_build.bat | 52 +++++++-------
contrib/cmake/msvc/ReadMe.txt | 127 ++++++++++++++--------------------
contrib/cmake/msvc/cmakeOpenssl.bat | 6 +-
msvc/ReadMe.txt | 102 +++++++++++++--------------
msvc/exiv2/cleaner.bat | 2 -
msvc/libssh/include/config.h | 2 +-
msvc2003/ReadMe.txt | 27 ++++----
test/verifyMSVC.sh | 32 ---------
website/bin/exiv2-tagrelease.sh | 5 +-
11 files changed, 178 insertions(+), 240 deletions(-)
diff --git a/README b/README
index a6fc11a..1b28bfd 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
- @@@@@@@@@@@@@b ;mm /##Gilles###\
+ @@@Marco@@@@@b ;mm /##Gilles###\
j@@@#Robin", Brad /@@@Thomas@@@@Q
@@@# \ ## @@@b |@@@b
@@@# .;;;;, ,;;;, ,;;;; ,;;;p .;;; 7@@ ]Alan
@@ -9,7 +9,7 @@
@@@# ,@@##@@m @@@b @@@p @@C #@@#C
@@@# ,/ s@@# @@@@ @@@b Volker @Tuan@
]@@@Abhinav@@\ /@@@\ \@@@Q @@@Q %@@@# /@@@@Mahesh@@#
- /@@@@@@@@@@@@@@\ /@@@@@\ C++ Metadata Library /@Sridhar@@@v0.26\
+ /@@Raphael@@@@@\ /@@@@@\ C++ Metadata Library /@Sridhar@@@v0.26\
Exiv2
*****
@@ -31,17 +31,17 @@ Building and Installing
You can build the libraries in the following ways:
-1 UNIX-like systems (including GNU/Linux, Mac OS X, Cygwin, MinGW)
+1 UNIX-like systems (including GNU/Linux, MacOS-X, Cygwin (32 and 64), MinGW (32 and 64)
- general notes follow
- FAQ concerning Cygwin/MSYS and Mac OS X:
http://dev.exiv2.org/projects/exiv2/wiki/FAQ
2 Microsoft Visual C++
- - see msvc2005/ReadMe.txt (32bit and 64bit build VC8/2005, 2008,2010,2012)
- - see msvc2003/ReadMe.txt (32bit build VC7.1/2003 2005,2008)
- Caution msvc2003 is deprecated with v0.26 and will be removed
+ - see msvc/ReadMe.txt (32bit and 64bit builds Visual Studio 2005,08,10,12,13,15)
+ - see msvc2003/ReadMe.txt (32bit build on Visual Studio 2003, 2005, 2008)
+ Caution msvc2003 is deprecated with v0.26 and will be removed.
-3 CMake (experimental support for cmake on all platforms)
+3 CMake (support for cmake on all platforms except MinGW)
- see README-CMAKE for more information
To build a commercial version of the Exiv2 library, see also section
@@ -53,10 +53,7 @@ build and install the library and utility:
$ ./configure
$ make
- $ sudo make install
-
-Users of Cygwin and MinGW can omit the 'sudo' to install:
- $ make install
+ $ sudo make install (Cygwin/MinGW $ make install)
Caution:
If you downloaded the source code from the subversion repository,
@@ -65,7 +62,7 @@ Caution:
$ make config
$ ./configure
$ make
- $ sudo make install
+ $ sudo make install (Cygwin/MinGW $ make install)
To build the sample applications:
@@ -130,7 +127,6 @@ If you have problems building Exiv2 on UNIX-like systems, check the
generated config/config.mk and config/config.h files. You should *not*
need to modify any Makefile directly, in particular not src/Makefile!
-
Support
=======
@@ -141,7 +137,6 @@ All project resources are accessible from the project website at
Please send feedback or queries to the Exiv2 forum. For new bug reports
and feature requests, please open an issue.
-
Linking your own code with Exiv2
================================
@@ -199,7 +194,7 @@ commercial version of the Exiv2 library.
To do this on Windows, compile the library with the preprocessor
symbol EXV_COMMERCIAL_VERSION defined in:
msvc2003\include\exv_msvc.h
-or msvc2005\include\exv_msvc.h
+or msvc\include\exv_msvc.h
On UNIX-like systems, run the configure
script with the options --enable-commercial --disable-nls
diff --git a/README-CMAKE b/README-CMAKE
index dc68602..1f6f305 100644
--- a/README-CMAKE
+++ b/README-CMAKE
@@ -1,4 +1,4 @@
- @@@@@@@@@@@@@b ;mm /##Gilles###\
+ @@@Marco@@@@@b ;mm /##Gilles###\
j@@@#Robin", Brad /@@@Thomas@@@@Q
@@@# \ ## @@@b |@@@b
@@@# .;;;;, ,;;;, ,;;;; ,;;;p .;;; 7@@ ]Alan
@@ -9,29 +9,34 @@
@@@# ,@@##@@m @@@b @@@p @@C #@@#C
@@@# ,/ s@@# @@@@ @@@b Volker @Tuan@
]@@@Abhinav@@\ /@@@\ \@@@Q @@@Q %@@@# /@@@@Mahesh@@#
- /@@@@@@@@@@@@@@\ /@@@@@\ C++ Metadata Library /@Sridhar@@@v0.26\
+ /@@Raphael@@@@@\ /@@@@@\ C++ Metadata Library /@Sridhar@@@v0.26\
-------------------------------------------------------------------------------
-NOTE:
+CMake is a cross-platform build system, to control the
+compilation process using platform/compiler independent configuration files.
+
+STATUS:
-* CMake scripts are functional and used to perform the daily build on the buildserver.
+* CMake scripts are functional and used to perform the daily build on the buildserver
+ for MacOS-X, Cygwin, Linux and Visual Studio (2005, 8, 10, 12, 13 and 15)
+ The daily build on MinGW/32 is performed using autotools for Qt/Windows Users.
-* The existing automake (./configure), and msvc2005 build files will continue
- to be supported by exiv2 for at least v0.27 (and probably longer)
+* The existing automake (./configure) will continue to be supported by exiv2
+ for at least v0.27 (and probably longer)
- The msvc-2003 build files are deprecated and will not be supported after v0.26.
+ The msvc2003 project/solutions files are deprecated and will not be supported after v0.26.
+ The msvc project/solutions files will continue to be supported by exiv2
+ for at least v0.27 (and probably longer)
- Exiv2 will not build on MinGW (neither 32bit nor 64bit)
+ Exiv2 is very difficult to build on MinGW with CMake.
This is discussed in TODO-CMAKE
Robin Mills
robin at clanmills.com
-2016-09-23
+2016-10-25
-------------------------------------------------------------------------------
-Exiv2 uses cmake, a cross-platform build system, to control the
-compilation process using platform/compiler independent configuration files.
TABLE OF CONTENTS
-----------------
@@ -55,7 +60,7 @@ FAQ: http://www.cmake.org/Wiki/CMake_FAQ
2 Building and Installing on Linux
==================================
-This process also covers MacOS-X Terminal, Cygwin and MinGW users.
+This process overs MacOS-X, Linux and Cygwin.
a) From the command line
@@ -64,7 +69,7 @@ file) to configure, build and install the library and utility:
$ mkdir build
$ cd build
- $ cmake ..
+ $ cmake .. -G "Unix Makefiles"
$ make
$ make install
@@ -117,7 +122,7 @@ b) Using the cmake GUI
exiv2 provides three build environment for users of Visual Studio:
cmake: This environment
-msvc2005: 32 bit AND 64 bit build environment for MSVC 2005 and later (2008/10/12/13)
+msvc: 32 bit AND 64 bit build environment for MSVC 2005 and later (2005/2008/10/12/13/15)
msvc2003: 32 bit build environment for MSVC 2003 (deprecated after v0.26)
CMake doesn't build code. It generates build environments.
@@ -154,10 +159,9 @@ We have two contributed CMake Build Environments:
4 Building and installing for MinGW Users
=========================================
- CMake/MinGW has a number of serious issues. This will be reported to Kitware.
-
- It is possible to use CMake/MinGW if you put in some effort. This is documented in TODO-CMAKE.
+ CMake/MinGW has a number of serious issues. This will be reported to Kitware.
+ It is possible to use CMake/MinGW if you put in some effort. This is documented in TODO-CMAKE.
# That's all Folks
##
diff --git a/contrib/buildserver/jenkins_build.bat b/contrib/buildserver/jenkins_build.bat
index 6472340..95e912b 100644
--- a/contrib/buildserver/jenkins_build.bat
+++ b/contrib/buildserver/jenkins_build.bat
@@ -42,7 +42,7 @@ rem adding additional MSVC compilers (2008, 2010, 2012, etc) should be simple
rem and has not been done for expediency
rem should only require:
rem 1 Invoke the appropriate vsvars32.bat script
-rem 2 Run devenv/upgrade
+rem 2 Run devenv/upgrade
rem 3 set Builder=2005
rem and all should be good
set BGOOD=0
@@ -59,7 +59,7 @@ if %Builder%==2003 (
if %Builder%==2005 (
call "C:\Program Files (x86)\Microsoft Visual Studio 8\Common7\Tools
svars32.bat"
- pushd msvc2005
+ pushd msvc
set BGOOD=1
)
@@ -88,7 +88,7 @@ if %curl% == true if %libssh% == true if %openssl% == true set webready=true
if %webready% == true (
copy/y exiv2-webready.sln e.sln
copy/y ..\include\exiv2\exv_msvc-webready.h ..\include\exiv2\exv_msvc.h
-)
+)
rem --
rem let the user know what's going on!
@@ -104,12 +104,12 @@ if %Win32%==true (
if %debug%==true (
if %static%==true (
if %Builder%==2003 (
- devenv e.sln %ACTION% "Debug"
+ devenv e.sln %ACTION% "Debug"
if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2003/bin/Debug'
)
if %Builder%==2005 (
- devenv e.sln %ACTION% "Debug|Win32"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/win32/Debug'
+ devenv e.sln %ACTION% "Debug|Win32"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/win32/Debug'
)
) ) )
@@ -117,12 +117,12 @@ if %Win32%==true (
if %release%==true (
if %static%==true (
if %Builder%==2003 (
- devenv e.sln %ACTION% "Release"
+ devenv e.sln %ACTION% "Release"
if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2003/bin/Release'
)
if %Builder%==2005 (
- devenv e.sln %ACTION% "Release|Win32"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/win32/Release'
+ devenv e.sln %ACTION% "Release|Win32"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/win32/Release'
)
) ) )
@@ -130,12 +130,12 @@ if %Win32%==true (
if %debug%==true (
if %dll%==true (
if %Builder%==2003 (
- devenv e.sln %ACTION% "DebugDLL"
+ devenv e.sln %ACTION% "DebugDLL"
if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2003/bin/DebugDLL'
)
if %Builder%==2005 (
- devenv e.sln %ACTION% "DebugDLL|Win32"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/win32/DebugDLL'
+ devenv e.sln %ACTION% "DebugDLL|Win32"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/win32/DebugDLL'
)
) ) )
@@ -143,41 +143,41 @@ if %Win32%==true (
if %release%==true (
if %dll%==true (
if %Builder%==2003 (
- devenv e.sln %ACTION% "ReleaseDLL"
+ devenv e.sln %ACTION% "ReleaseDLL"
if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2003/bin/ReleaseDLL'
)
if %Builder%==2005 (
- devenv e.sln %ACTION% "ReleaseDLL|Win32"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/win32/ReleaseDLL'
+ devenv e.sln %ACTION% "ReleaseDLL|Win32"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/win32/ReleaseDLL'
)
) ) )
if %x64%==true (
if %debug%==true (
if %static%==true (
- devenv e.sln %ACTION% "Debug|x64"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/x64/Debug'
+ devenv e.sln %ACTION% "Debug|x64"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/x64/Debug'
) ) )
if %x64%==true (
if %release%==true (
if %static%==true (
- devenv e.sln %ACTION% "Release|x64"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/x64/Release'
+ devenv e.sln %ACTION% "Release|x64"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/x64/Release'
) ) )
if %x64%==true (
if %debug%==true (
if %dll%==true (
- devenv e.sln %ACTION% "DebugDLL|x64"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/x64/DebugDLL'
+ devenv e.sln %ACTION% "DebugDLL|x64"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/x64/DebugDLL'
) ) )
if %x64%==true (
if %release%==true (
if %dll%==true (
- devenv e.sln %ACTION% "ReleaseDLL|x64"
- if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc2005/bin/x64/ReleaseDLL'
+ devenv e.sln %ACTION% "ReleaseDLL|x64"
+ if NOT ERRORLEVEL 1 if %tests%==true call bash -c 'cd %FOO%;cd test;./testMSVC.sh ../msvc/bin/x64/ReleaseDLL'
) ) )
rem --
@@ -187,12 +187,12 @@ popd
rem --
rem delete support libraries (with mozilla's native rm utility)
-if %Builder%==2003 msvc2005 oolsin
m.exe -rf ..\expat-2.0.1 ..\zlib-1.2.3
-if %Builder%==2005 msvc2005 oolsin
m.exe -rf ..\expat ..\zlib ..\openssl ..\libssh ..
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list