diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-30 08:42:44 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-09 08:21:21 +0000 |
| commit | a6c9fc50fbddd7d05db89dfe23c279ef70b722a5 (patch) | |
| tree | 244c165c5c3f4ce5e07f0d0949090ee86a4dd465 /static.pro | |
| parent | 08b00f86891ec157e3fb354afc04ff33ebfdb44c (diff) | |
Fix installation of Python-related resources
They should also be copied for non-installed builds.
Change-Id: Ic90af9990506e942ddab969ea0b7f38594d87622
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'static.pro')
| -rw-r--r-- | static.pro | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/static.pro b/static.pro index 0b1585a42..562b68303 100644 --- a/static.pro +++ b/static.pro @@ -1,20 +1,33 @@ TEMPLATE = aux DATA_DIRS = share/qbs/imports share/qbs/modules +PYTHON_DATA_DIRS = src/3rdparty/python/lib win32:DATA_FILES = $$PWD/bin/ibmsvc.xml $$PWD/bin/ibqbs.bat +LIBEXEC_FILES = $$PWD/src/3rdparty/python/bin/dmgbuild # For use in custom compilers which just copy files defineReplace(stripSrcDir) { return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) } +defineReplace(stripPythonSrcDir) { + return($$relative_path($$absolute_path($$1, $$OUT_PWD), \ + $$_PRO_FILE_PWD_/src/3rdparty/python/lib/python2.7/site-packages)) +} + for(data_dir, DATA_DIRS) { files = $$files($$PWD/$$data_dir/*, true) for(file, files):!exists($$file/*):FILES += $$file } FILES += $$DATA_FILES -OTHER_FILES += $$FILES +for(data_dir, PYTHON_DATA_DIRS) { + files = $$files($$PWD/$$data_dir/*, true) + for(file, files):!exists($$file/*):PYTHON_FILES += $$file +} +PYTHON_FILES += $$PYTHON_DATA_FILES + +OTHER_FILES += $$FILES $$LIBEXEC_FILES !isEqual(PWD, $$OUT_PWD)|!isEmpty(QBS_RESOURCES_BUILD_DIR) { copy2build.input = FILES @@ -26,6 +39,26 @@ OTHER_FILES += $$FILES copy2build.name = COPY ${QMAKE_FILE_IN} copy2build.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += copy2build + + copy2build_python.input = PYTHON_FILES + !isEmpty(QBS_RESOURCES_BUILD_DIR): \ + copy2build_python.output = \ + $${QBS_RESOURCES_BUILD_DIR}/share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} + else: \ + copy2build_python.output = share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} + copy2build_python.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + copy2build_python.name = COPY ${QMAKE_FILE_IN} + copy2build_python.CONFIG += no_link target_predeps + QMAKE_EXTRA_COMPILERS += copy2build_python +} + +!isEqual(PWD, $$OUT_PWD) { + libexec_copy.input = LIBEXEC_FILES + libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} + libexec_copy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + libexec_copy.name = COPY ${QMAKE_FILE_IN} + libexec_copy.CONFIG += no_link target_predeps + QMAKE_EXTRA_COMPILERS += libexec_copy } include(src/install_prefix.pri) |