tjh.dev
1diff --git a/littlenavmap.pro b/littlenavmap.pro
2index 7c8ed0c6..31590e2c 100644
3--- a/littlenavmap.pro
4+++ b/littlenavmap.pro
5@@ -777,18 +777,6 @@ OTHER_FILES += \
6 # Linux - Copy help and Marble plugins and data
7 unix:!macx {
8 copydata.commands = mkdir -p $$OUT_PWD/plugins &&
9- copydata.commands += cp -avfu \
10- $$MARBLE_LIB_PATH/marble/plugins/libCachePlugin.so \
11- $$MARBLE_LIB_PATH/marble/plugins/libAtmospherePlugin.so \
12- $$MARBLE_LIB_PATH/marble/plugins/libCompassFloatItem.so \
13- $$MARBLE_LIB_PATH/marble/plugins/libGraticulePlugin.so \
14- $$MARBLE_LIB_PATH/marble/plugins/libKmlPlugin.so \
15- $$MARBLE_LIB_PATH/marble/plugins/libLatLonPlugin.so \
16- $$MARBLE_LIB_PATH/marble/plugins/libPn2Plugin.so \
17- $$MARBLE_LIB_PATH/marble/plugins/libMapScaleFloatItem.so \
18- $$MARBLE_LIB_PATH/marble/plugins/libNavigationFloatItem.so \
19- $$MARBLE_LIB_PATH/marble/plugins/libOverviewMap.so \
20- $$OUT_PWD/plugins &&
21 copydata.commands += mkdir -p $$OUT_PWD/translations &&
22 copydata.commands += cp -avfu $$PWD/*.qm $$OUT_PWD/translations &&
23 copydata.commands += cp -avfu $$ATOOLS_INC_PATH/../*.qm $$OUT_PWD/translations &&
24@@ -796,8 +784,7 @@ unix:!macx {
25 copydata.commands += cp -avfu $$PWD/web $$OUT_PWD &&
26 copydata.commands += cp -avfu $$PWD/customize $$OUT_PWD &&
27 copydata.commands += cp -avfu $$PWD/marble/data $$OUT_PWD &&
28- copydata.commands += cp -vf $$PWD/desktop/littlenavmap*.sh $$OUT_PWD &&
29- copydata.commands += chmod -v a+x $$OUT_PWD/littlenavmap*.sh
30+ copydata.commands += true
31 }
32
33 # Mac OS X - Copy help and Marble plugins and data
34@@ -820,73 +807,20 @@ unix:!macx {
35
36 deploy.commands += rm -Rfv $$DEPLOY_DIR &&
37 deploy.commands += mkdir -pv $$DEPLOY_DIR/translations &&
38- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB &&
39- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/iconengines &&
40- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/imageformats &&
41- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platforms &&
42- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platformthemes &&
43- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/printsupport &&
44- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/sqldrivers &&
45 deploy.commands += echo $$VERSION_NUMBER > $$DEPLOY_DIR/version.txt &&
46- deploy.commands += echo $$GIT_REVISION_FULL > $$DEPLOY_DIR/revision.txt &&
47- deploy.commands += cp -Rvf $$MARBLE_LIB_PATH/*.so* $$DEPLOY_DIR_LIB &&
48- deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libmarblewidget-qt5.so* &&
49- deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libastro.so* &&
50- deploy.commands += cp -Rvf $$OUT_PWD/plugins $$DEPLOY_DIR &&
51 deploy.commands += cp -Rvf $$OUT_PWD/data $$DEPLOY_DIR &&
52 deploy.commands += cp -Rvf $$OUT_PWD/help $$DEPLOY_DIR &&
53 deploy.commands += cp -Rvf $$OUT_PWD/web $$DEPLOY_DIR &&
54 deploy.commands += cp -Rvf $$OUT_PWD/customize $$DEPLOY_DIR &&
55 deploy.commands += cp -Rvf $$OUT_PWD/littlenavmap $$DEPLOY_DIR &&
56- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??.qm $$DEPLOY_DIR/translations &&
57- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??_??.qm $$DEPLOY_DIR/translations &&
58- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qtbase*.qm $$DEPLOY_DIR/translations &&
59 deploy.commands += cp -Rvf $$OUT_PWD/translations $$DEPLOY_DIR &&
60 exists($$DATABASE_BASE) : deploy.commands += cp -Rvf $$DATABASE_BASE $$DEPLOY_DIR &&
61 exists($$HELP_BASE) : deploy.commands += cp -Rvf $$HELP_BASE/* $$DEPLOY_DIR/help &&
62- deploy.commands += cp -vf $$PWD/desktop/\"Little Navmap Portable Linux.sh\" $$DEPLOY_DIR/\"Little Navmap Portable.sh\" &&
63- deploy.commands += cp -vf $$PWD/desktop/linux-qt.conf $$DEPLOY_DIR/qt.conf &&
64 deploy.commands += cp -vf $$PWD/CHANGELOG.txt $$DEPLOY_DIR &&
65 deploy.commands += cp -vf $$PWD/README.txt $$DEPLOY_DIR &&
66 deploy.commands += cp -vf $$PWD/LICENSE.txt $$DEPLOY_DIR &&
67 deploy.commands += cp -vf $$PWD/resources/icons/littlenavmap.svg $$DEPLOY_DIR &&
68- deploy.commands += cp -vf \"$$PWD/desktop/Little Navmap.desktop\" $$DEPLOY_DIR &&
69- exists(/usr/lib/x86_64-linux-gnu/libssl.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libssl.so.1.1 $$DEPLOY_DIR_LIB &&
70- exists(/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 $$DEPLOY_DIR_LIB &&
71- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/iconengines/libqsvgicon.so* $$DEPLOY_DIR_LIB/iconengines &&
72- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqgif.so* $$DEPLOY_DIR_LIB/imageformats &&
73- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqjpeg.so* $$DEPLOY_DIR_LIB/imageformats &&
74- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqsvg.so* $$DEPLOY_DIR_LIB/imageformats &&
75- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwbmp.so* $$DEPLOY_DIR_LIB/imageformats &&
76- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwebp.so* $$DEPLOY_DIR_LIB/imageformats &&
77- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqeglfs.so* $$DEPLOY_DIR_LIB/platforms &&
78- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqlinuxfb.so* $$DEPLOY_DIR_LIB/platforms &&
79- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimal.so* $$DEPLOY_DIR_LIB/platforms &&
80- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimalegl.so* $$DEPLOY_DIR_LIB/platforms &&
81- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqoffscreen.so* $$DEPLOY_DIR_LIB/platforms &&
82- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqxcb.so* $$DEPLOY_DIR_LIB/platforms &&
83- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platformthemes/libqgtk*.so* $$DEPLOY_DIR_LIB/platformthemes &&
84- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/printsupport/libcupsprintersupport.so* $$DEPLOY_DIR_LIB/printsupport &&
85- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/sqldrivers/libqsqlite.so* $$DEPLOY_DIR_LIB/sqldrivers &&
86- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicudata.so* $$DEPLOY_DIR_LIB &&
87- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicui18n.so* $$DEPLOY_DIR_LIB &&
88- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicuuc.so* $$DEPLOY_DIR_LIB &&
89- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Concurrent.so* $$DEPLOY_DIR_LIB &&
90- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Core.so* $$DEPLOY_DIR_LIB &&
91- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5DBus.so* $$DEPLOY_DIR_LIB &&
92- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Gui.so* $$DEPLOY_DIR_LIB &&
93- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Network.so* $$DEPLOY_DIR_LIB &&
94- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5PrintSupport.so* $$DEPLOY_DIR_LIB &&
95- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Qml.so* $$DEPLOY_DIR_LIB &&
96- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Quick.so* $$DEPLOY_DIR_LIB &&
97- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Sql.so* $$DEPLOY_DIR_LIB &&
98- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Svg.so* $$DEPLOY_DIR_LIB &&
99- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Widgets.so* $$DEPLOY_DIR_LIB &&
100- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5X11Extras.so* $$DEPLOY_DIR_LIB &&
101- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5XcbQpa.so* $$DEPLOY_DIR_LIB &&
102- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5QmlModels.so* $$DEPLOY_DIR_LIB &&
103- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Xml.so* $$DEPLOY_DIR_LIB &&
104- deploy.commands += rm -fv $$DEPLOY_DIR_LIB/lib*.so.*.debug $$DEPLOY_DIR_LIB/*/lib*.so.*.debug
105+ deploy.commands += true
106 }
107
108 # Mac specific deploy target