diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-01-11 14:12:18 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2019-01-11 18:22:16 +0000 |
| commit | 34e23de0523e0a4250584a74d56cab35ca28f3a7 (patch) | |
| tree | 277cd003493a7b2ce1859aa7565fd072916e2631 | |
| parent | d3ad948fd87263bebe5709b136911e0b0efdb9d1 (diff) | |
windows: More fixes for spaces in the path
Fix the path separator in the ivigenerator Makefile to also work for
nmake (worked only for jom before).
Fix deploy-virtualenv.bat to also handle spaces in the python path
Change-Id: I79f23c6874f718cc00aa457f3fe3e6fb58ad325e
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rw-r--r-- | src/tools/ivigenerator/deploy-virtualenv.bat | 6 | ||||
| -rw-r--r-- | src/tools/ivigenerator/qface_internal_build.pri | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/ivigenerator/deploy-virtualenv.bat b/src/tools/ivigenerator/deploy-virtualenv.bat index 3f2f59c..9be976d 100644 --- a/src/tools/ivigenerator/deploy-virtualenv.bat +++ b/src/tools/ivigenerator/deploy-virtualenv.bat @@ -67,15 +67,15 @@ echo "copying files from %ORIG_LIB% to %VIRTUALENV_LIB%" FOR /f %%i in (%SCRIPT%\deploy-virtualenv-files.txt) DO ( IF EXIST "%ORIG_LIB%%%i\" ( IF NOT EXIST %VIRTUALENV_LIB%\%%i mkdir %VIRTUALENV_LIB%\%%i - xcopy %ORIG_LIB%%%i %VIRTUALENV_LIB%\%%i /E /Q /H /Y >NUL 2>&1 + xcopy "%ORIG_LIB%%%i" "%VIRTUALENV_LIB%\%%i" /E /Q /H /Y >NUL 2>&1 ) else ( - xcopy %ORIG_LIB%%%i %VIRTUALENV_LIB% /H /Q /Y >NUL 2>&1 + xcopy "%ORIG_LIB%%%i" "%VIRTUALENV_LIB%" /H /Q /Y >NUL 2>&1 ) ) IF EXIST %ORIG_PREFIX%\DLLs\ ( IF NOT EXIST %VIRTUALENV%\DLLs mkdir %VIRTUALENV%\DLLs - xcopy %ORIG_PREFIX%\DLLs %VIRTUALENV%\DLLs /E /Q /H /Y >NUL 2>&1 + xcopy "%ORIG_PREFIX%\DLLs" "%VIRTUALENV%\DLLs" /E /Q /H /Y >NUL 2>&1 ) echo "done" diff --git a/src/tools/ivigenerator/qface_internal_build.pri b/src/tools/ivigenerator/qface_internal_build.pri index 25a9676..ab71377 100644 --- a/src/tools/ivigenerator/qface_internal_build.pri +++ b/src/tools/ivigenerator/qface_internal_build.pri @@ -68,7 +68,7 @@ QMAKE_EXTRA_TARGETS += qtivi_qface_install # Otherwise it still needs some modules from the system deploy_virtualenv.target = .stamp-deploy_virtualenv equals(QMAKE_HOST.os, Windows) { - deploy_virtualenv.commands = $$PWD/deploy-virtualenv.bat qtivi_qface_virtualenv $$escape_expand(\n\t) + deploy_virtualenv.commands = $$shell_path($$PWD/deploy-virtualenv.bat) qtivi_qface_virtualenv $$escape_expand(\n\t) deploy_virtualenv.commands += @type nul > $$shell_path($$OUT_PWD/.stamp-deploy_virtualenv) } else { deploy_virtualenv.commands = $$PWD/deploy-virtualenv.sh qtivi_qface_virtualenv $$escape_expand(\n\t) |