From 01b95de651398ac404a673bdc7c5cb7bfa52d2e6 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Sun, 22 Nov 2020 16:44:30 +0000
Subject: [PATCH] Update script cmd64.bat following review by @tester0077

---
 README-CONAN.md | 19 ++++++++++---------
 README.md       | 14 +++++++++-----
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/README-CONAN.md b/README-CONAN.md
index a47f633e..5ef900a7 100644
--- a/README-CONAN.md
+++ b/README-CONAN.md
@@ -175,19 +175,20 @@ I use the following batch file `cmd64.bat` to start cmd.exe.  I do this to reduc
 
 ```bat
 @echo off
+@echo off
 setlocal
+if NOT EXIST c:\Python39\python3.exe copy c:\Python39\python.exe c:\Python39\python3.exe
 set "P="
-set "P=%P%C:\Python37\;C:\Python37\Scripts;" # DOS Python3
+set "P=%P%C:\Python39\;C:\Python39\Scripts;%USERPROFILE%\AppData\Roaming\Python\Python39" # DOS Python3
 set "P=%P%c:\Program Files\cmake\bin;"       # DOS cmake
-set "P=%P%c:\msys64\usr\bin;"                # msys2 make, bash etc
-set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;"
-set "P=%P%c:\Windows\System32;"              # windows
-set "P=%P%%USERPROFILE%\com;"                # my home-made magic
-echo %P%
+set "P=%P%c:\msys64\usr\bin;"                # OPTIONAL to run test suite msys2 make, bash etc
+set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin;"
+set "P=%P%c:\Windows\System32;"              # Windows
+set "P=%P%%USERPROFILE%\com;"                # OPTIONAL my home-made magic
 set "PATH=%P%"
-set "EXIV2_BINDIR=%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\build\bin"
-color 0d
-cmd /S /K cd "%EXIV2_BINDIR%\..\.."
+set "EXIV2_EXT=.exe"
+color 1e
+cmd /S /K cd "%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\"
 color
 endlocal
 ```
diff --git a/README.md b/README.md
index 9a91a850..c74e98af 100644
--- a/README.md
+++ b/README.md
@@ -1190,15 +1190,19 @@ I use the following batch file `cmd64.bat` to start cmd.exe.  I do this to reduc
 ```bat
 @echo off
 setlocal
+if NOT EXIST c:\Python39\python3.exe copy c:\Python39\python.exe c:\Python39\python3.exe
 set "P="
-set "P=%P%C:\Python37\;C:\Python37\Scripts;" # DOS Python3
+set "P=%P%C:\Python39\;C:\Python39\Scripts;%USERPROFILE%\AppData\Roaming\Python\Python39" # DOS Python3
 set "P=%P%c:\Program Files\cmake\bin;"       # DOS cmake
-set "P=%P%c:\msys64\usr\bin;"                # MinGW/msys2 make, bash etc
-set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;"
-set "P=%P%c:\Windows\System32;"              # windows
-set "P=%P%%USERPROFILE%\com;"                # my home-made magic
+set "P=%P%c:\msys64\usr\bin;"                # OPTIONAL to run test suite msys2 make, bash etc
+set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin;"
+set "P=%P%c:\Windows\System32;"              # Windows
+set "P=%P%%USERPROFILE%\com;"                # OPTIONAL my home-made magic
 set "PATH=%P%"
+set "EXIV2_EXT=.exe"
+color 1e
 cmd /S /K cd "%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\"
+color
 endlocal
 ```