diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-20 15:38:53 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-06-21 12:13:59 +0000 |
| commit | 6ce79c1a9c5f87a6e07edbd38b05da88768ac171 (patch) | |
| tree | 768e04db7d7b6e34960e794cdd9313f41ee5b011 /mkspecs | |
| parent | 1aa2403401b1e58afaa76bec1eb175595a214925 (diff) | |
ivigenerator: Make the virtualenv relocatable
The '-e' flag doesn't install qface into the virtualenv, but creates
a link to the source instead. Removing it, installs qface as expected.
The virtualenv needs to be make relocatable after it was created,
otherwise it will stop working after copying it during 'make install'
Instead of relying on the activate scripts of the virtualenv we set
the correct PATH by our own, as the active script is not updated
by the "virtual --relocatable" call
Task-number: QTAUTO-289
Change-Id: I6182eb2707aefb7785b1e4d0899294629b5fcf7a
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 4894f49..05d9972 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -39,9 +39,9 @@ IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator IVI_GENERATOR_PATH = $$QTIVI_ROOT/src/tools/ivigenerator } -win32: VIRTUALENV_ACTIVATION = $$VIRTUALENV_PATH/Scripts/activate && -else: VIRTUALENV_ACTIVATION = . $$VIRTUALENV_PATH/bin/activate && -IVI_GENERATOR = $$VIRTUALENV_ACTIVATION python $$IVI_GENERATOR_PATH/generate.py +win32: VIRTUALENV_PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe +else: VIRTUALENV_PYTHON = $$VIRTUALENV_PATH/bin/python +IVI_GENERATOR = $$VIRTUALENV_PYTHON $$IVI_GENERATOR_PATH/generate.py # The 'click' library used by the generator needs to have a utf8 locale setup. win32: ENV = chcp 65001 && |