diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-05-09 11:00:37 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-05-09 12:47:24 +0000 |
| commit | 88773675135d61c47cece80c76e02b20de13e06f (patch) | |
| tree | fec4d1353a2b6fc7dba65ca3b727ae5816375a2b | |
| parent | a9a6c34a2b079f7c97c82906868e8d7dc755c187 (diff) | |
Improve deploy-virtualenv.sh to also fix wrong permissions
On mac some libs where installed with read-only permissions. This
will result in errors when other tools try to write to these files
e.g. the installer
Task-number: QTAUTO-1047
Change-Id: I0af23b5dce742fabd3a36c5f2fa45c3102a232b8
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rwxr-xr-x | src/tools/ivigenerator/deploy-virtualenv.sh | 3 | ||||
| -rw-r--r-- | src/tools/ivigenerator/ivigenerator.pro | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/ivigenerator/deploy-virtualenv.sh b/src/tools/ivigenerator/deploy-virtualenv.sh index 14419f6..2fa4dc4 100755 --- a/src/tools/ivigenerator/deploy-virtualenv.sh +++ b/src/tools/ivigenerator/deploy-virtualenv.sh @@ -107,6 +107,9 @@ if [ "$PLATFORM" == "linux" ]; then fi fi +# some files might have wrong permissions, e.g. readonly +chmod -R ug+rw $VIRTUALENV + if [ "$(readlink -- "$VIRTUALENV/lib64")" != "lib" ] ; then rm -f "$VIRTUALENV/lib64" cd "$VIRTUALENV" diff --git a/src/tools/ivigenerator/ivigenerator.pro b/src/tools/ivigenerator/ivigenerator.pro index 57406ff..d81914d 100644 --- a/src/tools/ivigenerator/ivigenerator.pro +++ b/src/tools/ivigenerator/ivigenerator.pro @@ -128,6 +128,10 @@ INSTALLS += generator \ templates_generation_validator \ templates_test \ +OTHER_FILES += deploy-virtualenv.bat \ + deploy-virtualenv.sh \ + deploy-virtualenv-files.txt \ + # Ensure files are installed to qtbase for non-prefixed builds !force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { for (install_target, INSTALLS) { |