Remove EXIV2_EXT variable references

main
Miloš Komarčević 5 years ago
parent 2b807703c0
commit 8a68658f18

@ -181,7 +181,6 @@ set "P=%P%c:\Windows\System32;" # windows
set "P=%P%%USERPROFILE%\com;" # my home-made magic set "P=%P%%USERPROFILE%\com;" # my home-made magic
echo %P% echo %P%
set "PATH=%P%" set "PATH=%P%"
set "EXIV2_EXT=.exe"
set "EXIV2_BINDIR=%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\build\bin" set "EXIV2_BINDIR=%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\build\bin"
color 0d color 0d
cmd /S /K cd "%EXIV2_BINDIR%\..\.." cmd /S /K cd "%EXIV2_BINDIR%\..\.."

@ -708,7 +708,6 @@ On MinGW/msys2, I can directly access the share:
```bash ```bash
$ cd //Mac/Home/gnu/github/exiv2/0.27/maintenance/build_mingw_fedora $ cd //Mac/Home/gnu/github/exiv2/0.27/maintenance/build_mingw_fedora
$ export EXIV2_BINDIR=$pwd/bin $ export EXIV2_BINDIR=$pwd/bin
$ export EXIV2_EXT=.exe
$ cd ../test $ cd ../test
$ make tests $ make tests
``` ```
@ -833,8 +832,6 @@ If you build the code in the directory \<exiv2dir\>build, tests will run using t
| EXIV2_BINDIR | **\<exiv2dir\>/build/bin** | All Platforms | Path of built binaries (exiv2.exe) | | EXIV2_BINDIR | **\<exiv2dir\>/build/bin** | All Platforms | Path of built binaries (exiv2.exe) |
| EXIV2_PORT | **12762**<br>**12671**<br>**12760** | Cygwin<br>MinGW/msys2<br>Other Platforms | Test TCP/IP Port | | EXIV2_PORT | **12762**<br>**12671**<br>**12760** | Cygwin<br>MinGW/msys2<br>Other Platforms | Test TCP/IP Port |
| EXIV2_HTTP | **http://localhost** | All Platforms | Test http server | | EXIV2_HTTP | **http://localhost** | All Platforms | Test http server |
| EXIV2_EXT | **.exe** | msvc<br>Cygwin<br>MinGW/msys2 | Extension used by executable binaries |
| EXIV2_EXT | _**not set**_ | Linux<br>macOS<br>Unix| |
| EXIV2_ECHO | _**not set**_ | All Platforms | For debugging Bash scripts | | EXIV2_ECHO | _**not set**_ | All Platforms | For debugging Bash scripts |
| VALGRIND | _**not set**_ | All Platforms | For debugging Bash scripts | | VALGRIND | _**not set**_ | All Platforms | For debugging Bash scripts |
| VERBOSE | _**not set**_ | All Platforms | Causes make to report its actions | | VERBOSE | _**not set**_ | All Platforms | Causes make to report its actions |
@ -1190,7 +1187,6 @@ set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild
set "P=%P%c:\Windows\System32;" # windows set "P=%P%c:\Windows\System32;" # windows
set "P=%P%%USERPROFILE%\com;" # my home-made magic set "P=%P%%USERPROFILE%\com;" # my home-made magic
set "PATH=%P%" set "PATH=%P%"
set "EXIV2_EXT=.exe"
cmd /S /K cd "%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\" cmd /S /K cd "%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\"
endlocal endlocal
``` ```

@ -79,7 +79,6 @@ build_script:
- cmd: cd bin - cmd: cd bin
- cmd: if %UNIT_TESTS% == 1 unit_tests.exe - cmd: if %UNIT_TESTS% == 1 unit_tests.exe
- cmd: cd ../../tests/ - cmd: cd ../../tests/
- cmd: set EXIV2_EXT=.exe
- cmd: if %INTEGRATION_TESTS% == 1 %PYTHON%/python.exe runner.py -v - cmd: if %INTEGRATION_TESTS% == 1 %PYTHON%/python.exe runner.py -v
- cmd: cd ../build/bin - cmd: cd ../build/bin
- cmd: exiv2 --version --verbose - cmd: exiv2 --version --verbose

@ -427,10 +427,6 @@ prepareTest()
exe=.exe exe=.exe
fi fi
if [ ! -z $EXIV2_EXT ]; then
exe=$EXIV2_EXT
fi
## ##
# initialize globals # initialize globals
this=$(basename $0 .sh) this=$(basename $0 .sh)

@ -4,7 +4,7 @@ memcheck: ${ENV:valgrind}
[ENV] [ENV]
exiv2_path: EXIV2_BINDIR exiv2_path: EXIV2_BINDIR
binary_extension: EXIV2_EXT binary_extension:
valgrind: EXIV2_VALGRIND valgrind: EXIV2_VALGRIND
exiv2_http: EXIV2_HTTP exiv2_http: EXIV2_HTTP
exiv2_port: EXIV2_PORT exiv2_port: EXIV2_PORT

Loading…
Cancel
Save