flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix xswiftbus library install on Unix

Browse Source 
Summary:
With Qt 5.9, the install executable changed from coreutils 'install'
 to qmake. This changed the behaviour for symbol links and wild cards.
 Previously, the symbol link target was installed as deep copy but with
 the name of the symbol link on MacOS. Now qmake just creates a new symbol
 link everywhere. Wild cards at install time also do not work anymore.
 Install files are only resolved properly, if they existed when qmake was
 running. This is not the case for our build products.
 To address both issues, we need to manually call cp command. cp command
 does deep copy symbol links, therefore copy only one with the major version
 number only.

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: msutcliffe, jenkins

Differential Revision: https://dev.swift-project.org/D38
This commit is contained in:
Roland Winklmeier
2017-07-21 11:19:50 +02:00
committed by Mathew Sutcliffe
parent bcdf842176
commit b9c06c8581
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/xswiftbus/xswiftbus.pro
View File

@@ -112,7 +112,6 @@ win32 {
legacy_data_target.path = $$PREFIX/xswiftbus
legacy_data_target.files *= LegacyData
} else:macx: {
dep_target.files *= $$PREFIX/lib/libblackmisc.0.dylib
dep_target.extra += rsync -avz --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtCore.framework/ $${PREFIX}/$$XSWIFTBUS_DIR/QtCore.framework/ &&
dep_target.extra += rsync -avz --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtGui.framework/ $${PREFIX}/$$XSWIFTBUS_DIR/QtGui.framework/ &&
dep_target.extra += rsync -avz --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtWidgets.framework/ $${PREFIX}/$$XSWIFTBUS_DIR/QtWidgets.framework/ &&
@@ -121,6 +120,15 @@ win32 {
dep_target.extra += rsync -avz --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtXml.framework/ $${PREFIX}/$$XSWIFTBUS_DIR/QtXml.framework/
dep_target.CONFIG += no_check_exist
# Manually copy to workaround shortcomings introduced
# when qmake migrated away from GNU install in Qt 5.9
dep_target.depends += copy_blackmisc
copy_blackmisc.target = copy_blackmisc
source_path = $$PREFIX/lib/libblackmisc.0.dylib
dest_path = $$PREFIX/$$XSWIFTBUS_DIR
copy_blackmisc.commands = cp $$shell_path($$source_path) $$shell_path($$dest_path)
QMAKE_EXTRA_TARGETS += copy_blackmisc
legacy_data_target.path = $$PREFIX/xswiftbus
legacy_data_target.files *= LegacyData
@@ -148,7 +156,6 @@ win32 {
QMAKE_EXTRA_TARGETS += fix_misc_rpath
} else:unix: {
dep_target.files *= $$PREFIX/lib/libblackmisc.so*
dep_target.files *= $$[QT_INSTALL_LIBS]/libQt5Core.so.5
dep_target.files *= $$[QT_INSTALL_LIBS]/libQt5Gui.so.5
dep_target.files *= $$[QT_INSTALL_LIBS]/libQt5Widgets.so.5
@@ -160,6 +167,15 @@ win32 {
dep_target.files *= $$[QT_INSTALL_LIBS]/libicudata.so.56
dep_target.CONFIG += no_check_exist
# Manually copy to workaround shortcomings introduced
# when qmake migrated away from GNU install in Qt 5.9
dep_target.depends += copy_blackmisc
copy_blackmisc.target = copy_blackmisc
source_path = $$PREFIX/lib/libblackmisc.so.0
dest_path = $$PREFIX/$$XSWIFTBUS_DIR
copy_blackmisc.commands = cp $$shell_path($$source_path) $$shell_path($$dest_path)
QMAKE_EXTRA_TARGETS += copy_blackmisc
legacy_data_target.path = $$PREFIX/xswiftbus
legacy_data_target.files *= LegacyData
}