diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-08 09:12:52 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-08 07:52:17 +0000 |
| commit | 2a8a39f12b92ab24c344d690ceea310398efec5a (patch) | |
| tree | 2300df1835009a6e3eda05058876c1af95bbb6dc /scripts | |
| parent | ed2dadae028686fbb6001e3524cba25f9e53dddc (diff) | |
| download | qt-creator-2a8a39f12b92ab24c344d690ceea310398efec5a.tar.gz | |
Deploy clazy-standalone for the ClangTools plugin
Change-Id: If554d3ade48da8d3877770d7e42af7185b30ceb6
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 5c22b6ac39..2b98e3ca42 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -226,6 +226,8 @@ def deploy_libclang(install_dir, llvm_install_dir, chrpath_bin): clangbindirtarget)) deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'clang-tidy.exe'), clangbindirtarget)) + deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'clazy-standalone.exe'), + clangbindirtarget)) resourcetarget = os.path.join(clanglibdirtarget, 'clang') else: libsources = glob(os.path.join(llvm_install_dir, 'lib', 'libclang.so*')) @@ -234,12 +236,14 @@ def deploy_libclang(install_dir, llvm_install_dir, chrpath_bin): 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') + clazybinary = os.path.join(llvm_install_dir, 'bin', 'clazy-standalone') 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)) + deployinfo.append((clazybinary, 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 f2086ce2b9..1b312b0820 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -121,6 +121,8 @@ if [ $LLVM_INSTALL_DIR ]; then 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 + clazysource="$LLVM_INSTALL_DIR"/bin/clazy-standalone + cp -Rf "$clazysource" "$resource_path/clang/bin/" || exit 1 fi clangbackendArgument="-executable=$resource_path/clangbackend" clangpchmanagerArgument="-executable=$resource_path/clangpchmanagerbackend" |