diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-08-02 08:36:32 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-08-27 06:42:38 +0000 |
| commit | 835477b52fd03608d389d00c91dcee6c7f378d63 (patch) | |
| tree | 39290726e23d6112cb0039f04293ec9b2a253a8d /scripts | |
| parent | dcea77f2dd18c5679f955612384aecac28822e58 (diff) | |
Deploy clang-tidy binary for the ClangTools plugin
Change-Id: I4491c985cdcb93ca94be491d1acb9d960f96a190
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 4 | ||||
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index 4efe99761c..5c22b6ac39 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -224,6 +224,8 @@ def deploy_libclang(install_dir, llvm_install_dir, chrpath_bin): clangbindirtarget)) deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'clangd.exe'), clangbindirtarget)) + deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'clang-tidy.exe'), + clangbindirtarget)) resourcetarget = os.path.join(clanglibdirtarget, 'clang') else: libsources = glob(os.path.join(llvm_install_dir, 'lib', 'libclang.so*')) @@ -231,11 +233,13 @@ def deploy_libclang(install_dir, llvm_install_dir, chrpath_bin): deployinfo.append((libsource, os.path.join(install_dir, 'lib', 'qtcreator'))) clangbinary = os.path.join(llvm_install_dir, 'bin', 'clang') clangdbinary = os.path.join(llvm_install_dir, 'bin', 'clangd') + clangtidybinary = os.path.join(llvm_install_dir, 'bin', 'clang-tidy') clangbinary_targetdir = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'bin') if not os.path.exists(clangbinary_targetdir): os.makedirs(clangbinary_targetdir) deployinfo.append((clangbinary, clangbinary_targetdir)) deployinfo.append((clangdbinary, clangbinary_targetdir)) + deployinfo.append((clangtidybinary, clangbinary_targetdir)) # copy link target if clang is actually a symlink if os.path.islink(clangbinary): linktarget = os.readlink(clangbinary) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 9219e42629..f2086ce2b9 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -119,6 +119,8 @@ if [ $LLVM_INSTALL_DIR ]; then fi clangdsource="$LLVM_INSTALL_DIR"/bin/clangd cp -Rf "$clangdsource" "$resource_path/clang/bin/" || exit 1 + clangtidysource="$LLVM_INSTALL_DIR"/bin/clang-tidy + cp -Rf "$clangtidysource" "$resource_path/clang/bin/" || exit 1 fi clangbackendArgument="-executable=$resource_path/clangbackend" clangpchmanagerArgument="-executable=$resource_path/clangpchmanagerbackend" |