diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-10 14:08:29 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-10 14:08:29 +0200 |
commit | d6da70916d566bec517aedeeae3f224b8d0489a1 (patch) | |
tree | 55c20439f5c65a81647eb7999a25c472d20c7fc5 /scripts/deployqt.py | |
parent | c69d3ded6b67b5501b9caf0d6f29148f389007ad (diff) | |
parent | a32a9b3d2a82d38edde1b4b55cbdececd7f5333d (diff) | |
download | qt-creator-d6da70916d566bec517aedeeae3f224b8d0489a1.tar.gz |
Merge remote-tracking branch 'origin/3.5'
Diffstat (limited to 'scripts/deployqt.py')
-rwxr-xr-x | scripts/deployqt.py | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index 23d2074785..00b70d1af4 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -191,7 +191,9 @@ def copy_qt_libs(install_dir, qt_libs_dir, qt_plugin_dir, qt_import_dir, qt_qml_ target = os.path.join(install_dir, 'bin', 'imports', qtimport) if (os.path.exists(target)): shutil.rmtree(target) - shutil.copytree(os.path.join(qt_import_dir, qtimport), target, ignore=copy_ignore_func, symlinks=True) + import_path = os.path.join(qt_import_dir, qtimport) + if os.path.exists(import_path): + shutil.copytree(import_path, target, ignore=copy_ignore_func, symlinks=True) if (os.path.exists(qt_qml_dir)): print "Copying qt quick 2 imports" @@ -230,20 +232,33 @@ def copyPreservingLinks(source, destination): shutil.copy(source, destination) def copy_libclang(install_dir, llvm_install_dir): - libsources = [] - libtarget = "" + # contains pairs of (source, target directory) + deployinfo = [] if sys.platform.startswith("win"): - libsources = [os.path.join(llvm_install_dir, 'bin', 'libclang.dll')] - libtarget = os.path.join(install_dir, 'bin') + deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'libclang.dll'), + os.path.join(install_dir, 'bin'))) + deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'clang-cl.exe'), + os.path.join(install_dir, 'bin'))) else: libsources = glob(os.path.join(llvm_install_dir, 'lib', 'libclang.so*')) - libtarget = os.path.join(install_dir, 'lib', 'qtcreator') + for libsource in libsources: + deployinfo.append((libsource, os.path.join(install_dir, 'lib', 'qtcreator'))) + clangbinary = os.path.join(llvm_install_dir, 'bin', 'clang') + clangbinary_targetdir = os.path.join(install_dir, 'bin') + deployinfo.append((clangbinary, clangbinary_targetdir)) + # copy link target if clang is actually a symlink + if os.path.islink(clangbinary): + linktarget = os.readlink(clangbinary) + deployinfo.append((os.path.join(os.path.dirname(clangbinary), linktarget), + os.path.join(clangbinary_targetdir, linktarget))) + resourcesource = os.path.join(llvm_install_dir, 'lib', 'clang') resourcetarget = os.path.join(install_dir, 'share', 'qtcreator', 'cplusplus', 'clang') + print "copying libclang..." - for libsource in libsources: - print libsource, '->', libtarget - copyPreservingLinks(libsource, libtarget) + for source, target in deployinfo: + print source, '->', target + copyPreservingLinks(source, target) print resourcesource, '->', resourcetarget if (os.path.exists(resourcetarget)): shutil.rmtree(resourcetarget) |