From cab9c56b4e9beda21bc8b4bbd1bdbde634f75673 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Tue, 31 Mar 2020 16:16:53 +0100 Subject: [PATCH 1/4] Revising scripts cmd64.bat, cygwin64.bat and msys64.bat --- README-CONAN.md | 5 ++--- README.md | 17 +++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/README-CONAN.md b/README-CONAN.md index c720491e..9c123e94 100644 --- a/README-CONAN.md +++ b/README-CONAN.md @@ -182,9 +182,8 @@ I use the following batch file to start cmd.exe. I do this to reduce the comple ```bat @echo off setlocal -cd %HOMEPATH% -set "PATH=C:\Python34\;C:\Python27\;C:\Python27\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" -cmd +set "PATH=C:\Python37\;C:\Python37\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" +cmd /S /K cd %HOMEDRIVE%%HOMEPATH% ``` ### Profiles for Visual Studio diff --git a/README.md b/README.md index 6b7405c8..654d2217 100644 --- a/README.md +++ b/README.md @@ -758,13 +758,12 @@ I use the following batch file to start the MinGW/msys2 64 bit bash shell from t ```bat @echo off setlocal -set "PS1=\! MSYS64:\u@\h:\w \$ " -set PATH="/usr/local/bin/:/usr/bin:/mingw64/bin:/bin:/usr/sbin:/sbin" -set "HOME=c:\msys64\home\%USERNAME%" +set "PATH=c:\msys64\usr\bin;c:\msys64\usr\local\bin;" +set "PS1=\! MSYS \u@\h:\w \$ " +set "HOME=c:\msys64\home\rmills" if NOT EXIST %HOME% mkdir %HOME% cd %HOME% c:\msys64\usr\bin\bash.exe -norc - ``` #### Install MinGW Dependencies @@ -822,12 +821,11 @@ I use the following batch file "cygwin64.bat" to start the Cygwin/64 bash shell ```bat @echo off setlocal +set "PS1=\! CYGWIN \u@\h:\w \$ " set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" -if NOT EXIST %HOME% mkdir %HOME% set "HOME=c:\cygwin64\home\rmills" cd %HOME% -set "PS1=\! CYGWIN64:\u@\h:\w \$ " -bash.exe -norc +c:\cygwin64\bin\bash.exe -norc ``` [TOC](#TOC) @@ -848,9 +846,8 @@ I use the following batch file to start cmd.exe. I do this to reduce the comple ```bat @echo off setlocal -cd %HOMEPATH% -set "PATH=C:\Python37\;C:\Python27\;C:\Python27\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" -cmd +set "PATH=C:\Python37\;C:\Python37\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" +cmd /S /K cd %HOMEDRIVE%%HOMEPATH% ``` [TOC](#TOC) From b207b733d865cef643fcadcb1b83ee27f6974665 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 1 Apr 2020 16:23:50 +0100 Subject: [PATCH 2/4] Documentation Maintenance. --- README-CONAN.md | 70 +++++++++++++++++++---------------- README.md | 23 ++++++------ releasenotes/releasenotes.txt | 4 ++ 3 files changed, 55 insertions(+), 42 deletions(-) diff --git a/README-CONAN.md b/README-CONAN.md index 9c123e94..a7d2e872 100644 --- a/README-CONAN.md +++ b/README-CONAN.md @@ -62,13 +62,13 @@ $ pip install conan --upgrade ```bash $ conan --version -Conan version 1.4.1 +Conan version 1.23.0 ``` ##### 1.3) Create a build directory -Create a build directory and will run the conan commands: +Create a build directory and run the conan commands: ```bash $ mkdir build @@ -76,33 +76,39 @@ $ cd build $ conan profile list ``` -**IMPORTANT** _**Visual Studio Users**_ require the profile msvc2017Release64 in %HOMEPATH%\.conan\profiles\msvc2017Release64 - -```ini -[build_requires] -[settings] -arch=x86_64 -build_type=Release -compiler=Visual Studio -compiler.runtime=MD -compiler.version=15 -os=Windows -arch_build=x86_64 -os_build=Windows -[options] -[env] -``` - ##### 1.4) Build dependencies and install conan artefacts in your build directory Execute `$ conan install` pointing to the directory containing `conanfile.py`. ```bash -$ conan install .. --build missing # --profile msvc2017Release64 +$ conan install .. --build missing # --profile msvc2019Release ``` -_**Visual Studio Users**_ should use `--profile msvc2017Release64` +_**Visual Studio Users**_ should use: + +```bash +> $ conan install .. --build missing --profile msvc2019Release` +``` + +The profile msvc2019Release `%USERPROFILE%\.conan\profiles\msvc2019Release` is: + +```ini +[build_requires] +[settings] +arch=x86_64 +build_type=Release +compiler=Visual Studio +compiler.runtime=MD +compiler.version=16 +os=Windows +arch_build=x86_64 +os_build=Windows +[options] +[env] +``` + +Profiles for Visual Studio are discussed in detail here: [Visual Studio Notes](#2-2) The output from this command is quite long as conan downloads or builds zlib, expat, curl and other dependencies. @@ -110,7 +116,7 @@ The output from this command is quite long as conan downloads or builds zlib, ex ##### 1.5) Execute cmake to generate build files for your environment. ```bash -$ cmake .. # -G "Visual Studio 15 2017 Win64" +$ cmake .. # -G "Visual Studio 16 2019" ``` @@ -182,13 +188,15 @@ I use the following batch file to start cmd.exe. I do this to reduce the comple ```bat @echo off setlocal -set "PATH=C:\Python37\;C:\Python37\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" -cmd /S /K cd %HOMEDRIVE%%HOMEPATH% +cd %HOMEPATH% +set "PATH=C:\Python34\;C:\Python27\;C:\Python27\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" +cmd ``` + ### Profiles for Visual Studio -Exiv2 v0.27 can be built with VS 2008, 2010, 2012, 2013, 2015 and 2017. +Exiv2 v0.27 can be built with VS 2008, 2010, 2012, 2013, 2015 , 2017 and 2019. Exiv2 v0.27.1 (and later) can be built with VS 2015, 2017 and 2019. I believe Exiv2 will build with 2013 and earlier, however we don't actively support these version of Visual Studio. @@ -204,7 +212,7 @@ Bits := { 64 | 32 } # 32 bit build is not provided for 2019 Examples: msvc2019Release msvc2017Release64 msvc2015Debug32 ``` -The profile msvc2017Release64 is as follows: +The profile msvc2019Release is as follows: ```ini [build_requires] @@ -213,7 +221,7 @@ arch=x86_64 build_type=Release compiler=Visual Studio compiler.runtime=MD -compiler.version=15 +compiler.version=16 os=Windows arch_build=x86_64 os_build=Windows @@ -236,7 +244,7 @@ the default CMake generator. Always use the generator for your version of Visua ```bat c:\....\exiv2\build> conan install .. --profile msvc2017Release64 --build missing -c:\....\exiv2\build> cmake .. -G "Visual Studio 15 2017 Win64" +c:\....\exiv2\build> cmake .. -G "Visual Studio 16 2019" c:\....\exiv2\build> cmake --build . --config Release ``` @@ -251,7 +259,7 @@ CMake provides Generators for different editions of Visual Studio. The 64 and 3 ##### 64 bit Release Build -| | Visual Studio 2017 | Visual Studio 2017 | Visual Studio 2015| +| | Visual Studio 2019 | Visual Studio 2017 | Visual Studio 2015| |:---------|--------------------|--------------------|--------------| | _**conan install .. --profile**_ | msvc2019Release | msvc2017Release64 | msvc2015Release64 | | _**cmake -G**_ | "Visual Studio 16 2019" | "Visual Studio 15 2017 Win64" | "Visual Studio 14 2015 Win64" | @@ -544,7 +552,7 @@ Other platforms such as Cygwin are not supported by Adobe. Adobe/XMPsdk is buil Applications which wish use the Adobe XMPsdk directly should build Exiv2 in this configuration and the library can be used by the application and Exiv2. The Adobe XMPsdk can be built as a static or shared library (.DLL) -To build Exiv2 with Adobe XMPsdk 2016, should perform steps 1.1, 1.2 and 1.3 described above, then perform the following: +To build Exiv2 with Adobe XMPsdk 2016, perform steps 1.1, 1.2 and 1.3 described above, then perform the following: ##### 4.1) Add a remote directory to conan's recipe search path @@ -599,4 +607,4 @@ $ cmake -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_ENABLE_SSH=ON [TOC](#TOC) -Written by Robin Mills
robin@clanmills.com
Updated: 2019-04-18 +Written by Robin Mills
robin@clanmills.com
Updated: 2020-04-01 diff --git a/README.md b/README.md index 654d2217..96b9b561 100644 --- a/README.md +++ b/README.md @@ -758,12 +758,13 @@ I use the following batch file to start the MinGW/msys2 64 bit bash shell from t ```bat @echo off setlocal -set "PATH=c:\msys64\usr\bin;c:\msys64\usr\local\bin;" -set "PS1=\! MSYS \u@\h:\w \$ " -set "HOME=c:\msys64\home\rmills" +set "PS1=\! MSYS64:\u@\h:\w \$ " +set PATH="/usr/local/bin/:/usr/bin:/mingw64/bin:/bin:/usr/sbin:/sbin" +set "HOME=c:\msys64\home\%USERNAME%" if NOT EXIST %HOME% mkdir %HOME% cd %HOME% c:\msys64\usr\bin\bash.exe -norc + ``` #### Install MinGW Dependencies @@ -821,11 +822,12 @@ I use the following batch file "cygwin64.bat" to start the Cygwin/64 bash shell ```bat @echo off setlocal -set "PS1=\! CYGWIN \u@\h:\w \$ " set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" +if NOT EXIST %HOME% mkdir %HOME% set "HOME=c:\cygwin64\home\rmills" cd %HOME% -c:\cygwin64\bin\bash.exe -norc +set "PS1=\! CYGWIN64:\u@\h:\w \$ " +bash.exe -norc ``` [TOC](#TOC) @@ -846,8 +848,9 @@ I use the following batch file to start cmd.exe. I do this to reduce the comple ```bat @echo off setlocal -set "PATH=C:\Python37\;C:\Python37\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" -cmd /S /K cd %HOMEDRIVE%%HOMEPATH% +cd %HOMEPATH% +set "PATH=C:\Python37\;C:\Python27\;C:\Python27\Scripts;C:\Perl64\site\bin;C:\Perl64\bin;C:\WINDOWS\system32;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;c:\Program Files\cmake\bin;" +cmd ``` [TOC](#TOC) @@ -859,7 +862,7 @@ Exiv2 can be built on many Unix and Linux distros. With v0.27.2, we are startin I have provided notes here based on my experience with these platforms. Feedback is welcome. -I am willing to support Exiv2 on other commercial Unix distributions such as AIX, HP-UX and OSF/1 provided you provide with an ssh account for your platform. I will require super-user privileges to install software. +I am willing to support Exiv2 on other commercial Unix distributions such as AIX, HP-UX and OSF/1 if you provide with an ssh account for your platform. I will require super-user privileges to install software. #### NetBSD @@ -902,6 +905,4 @@ Work in progress: [https://github.com/Exiv2/exiv2/issues/902](https://github.co [TOC](#TOC) -Robin Mills - -Revised: 2020-03-23 +Written by Robin Mills
robin@clanmills.com
Updated: 2020-04-01 diff --git a/releasenotes/releasenotes.txt b/releasenotes/releasenotes.txt index 30538985..7fc32bb7 100644 --- a/releasenotes/releasenotes.txt +++ b/releasenotes/releasenotes.txt @@ -4,6 +4,10 @@ Headline Features of Exiv2 v0.27.3 ---------------------------------- To be written +Changes since 0.27.2 +-------------------- + +https://github.com/Exiv2/exiv2/milestone/5?closed=1 Headline Features of Exiv2 v0.27.2 ---------------------------------- From b6ccf039d9c7659ebd1a4869f65125d439317cf5 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 1 Apr 2020 16:34:09 +0100 Subject: [PATCH 3/4] Documentation maitenance. --- releasenotes/msvc/ReadMe.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt index 17348c74..5c7360ec 100644 --- a/releasenotes/msvc/ReadMe.txt +++ b/releasenotes/msvc/ReadMe.txt @@ -1,4 +1,4 @@ -@RV@ Visual Studio Bundle @RC@ +@RV@ Visual Studio @VS@ Bundle @RC@ Structure of the bundle: ------------------------ @@ -34,12 +34,12 @@ c:\> cd \bin To compile and link your own code: -+-------------------------------------------------------------------------------+ -| Caution: You must use the same version of Visual Studio as the build | -| You will need to use the "Visual Studio Command Prompt" | -| or initialise the DOS environment by calling vcvarsall.bat | -| C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64>vcvars64.bat | -+-------------------------------------------------------------------------------+ ++------------------------------------------------------------------------------------------------+ +| Caution: You must use the same version of Visual Studio as the build | +| You will need to use the "Visual Studio Command Prompt" | +| or initialise the DOS environment by calling vcvarsall.bat | +| c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" | ++------------------------------------------------------------------------------------------------+ c:\> cd > cl /EHsc -Iinclude /MD samples\exifprint.cpp /link lib\exiv2.lib From 4cd8f2114f936149571b6129d2c2e33f1ce0c996 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 1 Apr 2020 16:40:20 +0100 Subject: [PATCH 4/4] Documentation maintenance. --- releasenotes/msvc/ReadMe.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt index 5c7360ec..4a75a385 100644 --- a/releasenotes/msvc/ReadMe.txt +++ b/releasenotes/msvc/ReadMe.txt @@ -34,12 +34,12 @@ c:\> cd \bin To compile and link your own code: -+------------------------------------------------------------------------------------------------+ -| Caution: You must use the same version of Visual Studio as the build | -| You will need to use the "Visual Studio Command Prompt" | -| or initialise the DOS environment by calling vcvarsall.bat | -| c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" | -+------------------------------------------------------------------------------------------------+ ++-------------------------------------------------------------------------------+ +| Caution: You must use the same version of Visual Studio as the build | +| You will need to use the "Visual Studio Command Prompt" | +| or initialise the DOS environment by calling vcvarsall.bat | +| C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64>vcvars64.bat | ++-------------------------------------------------------------------------------+ c:\> cd > cl /EHsc -Iinclude /MD samples\exifprint.cpp /link lib\exiv2.lib