Skip to content

Commit

Permalink
Update script cmd64.bat following review by @tester0077
Browse files Browse the repository at this point in the history
  • Loading branch information
@clanmills
clanmills committed Nov 22, 2020
1 parent 25b488a commit 01b95de
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 14 deletions.
19 changes: 10 additions & 9 deletions README-CONAN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
14 changes: 9 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down

4 comments on commit 01b95de

@tester0077
Copy link

@tester0077 tester0077 commented on 01b95de Apr 6, 2021 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clanmills
Copy link
Author

@clanmills clanmills commented on 01b95de Apr 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With Exiv2 v0.27.4 RC1 and later, you won't need cmd64.bat (unless you want it). All the bash code has been removed from the test harness.

Before this, you needed bash (and make) to execute the test harness. cmd64.bat sets up the path correctly for testing msvc builds from cmd.exe. So, you can forget about it.

I'm curious to hear about your experience with vcpkg. I haven't used that yet. I've decided that v0.27.4 will be the final release for which we will provide binary builds. From Exiv2 v1.00, users should use a package manager or build from source. Exiv2#1521

@clanmills
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, you get an acknowledgment in the release notes for Exiv2 v0.27.4: Exiv2#1018 (comment)

@tester0077
Copy link

@tester0077 tester0077 commented on 01b95de Apr 6, 2021 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.