feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

scripts: Do not deploly clang and clang-cl executables

Browse Source 
They were used in debugging of the libclang code model, and having
only the compiler is not very useful.

Users can install complete LLVM toolchains from llvm.org

Change-Id: If19a0b75c8505ba7589b377292bd96f855e91c00
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2022-06-14 18:21:17 +02:00
parent 153ff77a6b
commit cdedc71182
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/deployqt.py
View File

@@ -238,7 +238,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin):
clanglibdirtarget = os.path.join(install_dir, 'bin', 'clang', 'lib') clanglibdirtarget = os.path.join(install_dir, 'bin', 'clang', 'lib')
if not os.path.exists(clanglibdirtarget): if not os.path.exists(clanglibdirtarget):
os.makedirs(clanglibdirtarget) os.makedirs(clanglibdirtarget)
for binary in ['clang', 'clang-cl', 'clangd', 'clang-tidy', 'clazy-standalone']: for binary in ['clangd', 'clang-tidy', 'clazy-standalone']:
binary_filepath = os.path.join(llvm_install_dir, 'bin', binary + '.exe') binary_filepath = os.path.join(llvm_install_dir, 'bin', binary + '.exe')
if os.path.exists(binary_filepath): if os.path.exists(binary_filepath):
deployinfo.append((binary_filepath, clangbindirtarget)) deployinfo.append((binary_filepath, clangbindirtarget))
@@ -248,7 +248,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin):
clangbinary_targetdir = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'bin') clangbinary_targetdir = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'bin')
if not os.path.exists(clangbinary_targetdir): if not os.path.exists(clangbinary_targetdir):
os.makedirs(clangbinary_targetdir) os.makedirs(clangbinary_targetdir)
for binary in ['clang', 'clangd', 'clang-tidy', 'clazy-standalone']: for binary in ['clangd', 'clang-tidy', 'clazy-standalone']:
binary_filepath = os.path.join(llvm_install_dir, 'bin', binary) binary_filepath = os.path.join(llvm_install_dir, 'bin', binary)
if os.path.exists(binary_filepath): if os.path.exists(binary_filepath):
deployinfo.append((binary_filepath, clangbinary_targetdir)) deployinfo.append((binary_filepath, clangbinary_targetdir))

6
scripts/deployqtHelper_mac.sh
View File

@@ -120,12 +120,6 @@ if [ $LLVM_INSTALL_DIR ]; then
cp -Rf "$LLVM_INSTALL_DIR"/lib/clang "$libexec_path/clang/lib/" || exit 1 cp -Rf "$LLVM_INSTALL_DIR"/lib/clang "$libexec_path/clang/lib/" || exit 1
cp -Rf "$LLVM_INSTALL_DIR"/lib/libclang-cpp.dylib "$libexec_path/clang/lib/" || exit 1 cp -Rf "$LLVM_INSTALL_DIR"/lib/libclang-cpp.dylib "$libexec_path/clang/lib/" || exit 1
cp -Rf "$LLVM_INSTALL_DIR"/lib/ClazyPlugin.dylib "$libexec_path/clang/lib/" || exit 1 cp -Rf "$LLVM_INSTALL_DIR"/lib/ClazyPlugin.dylib "$libexec_path/clang/lib/" || exit 1
clangsource="$LLVM_INSTALL_DIR"/bin/clang
clanglinktarget="$(readlink "$clangsource")"
cp -Rf "$clangsource" "$libexec_path/clang/bin/" || exit 1
if [ $clanglinktarget ]; then
cp -Rf "$(dirname "$clangsource")/$clanglinktarget" "$libexec_path/clang/bin/$clanglinktarget" || exit 1
fi
clangdsource="$LLVM_INSTALL_DIR"/bin/clangd clangdsource="$LLVM_INSTALL_DIR"/bin/clangd
cp -Rf "$clangdsource" "$libexec_path/clang/bin/" || exit 1 cp -Rf "$clangdsource" "$libexec_path/clang/bin/" || exit 1
clangtidysource="$LLVM_INSTALL_DIR"/bin/clang-tidy clangtidysource="$LLVM_INSTALL_DIR"/bin/clang-tidy