0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: include TLS plugins in bundle

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2022-05-17 21:56:35 +02:00
parent fdf5748029
commit 3e4d1c04de
No known key found for this signature in database
GPG Key ID: C10411294912A422
2 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
launcher/CMakeLists.txt
View File

@ -1051,6 +1051,14 @@ if(INSTALL_BUNDLE STREQUAL "full")
COMPONENT Runtime
)
endif()
# TLS plugins (Qt 6 only)
if(EXISTS "${QT_PLUGINS_DIR}/tls")
install(
DIRECTORY "${QT_PLUGINS_DIR}/tls"
DESTINATION ${PLUGIN_DEST_DIR}
COMPONENT Runtime
)
endif()
else()
# Image formats
install(
@ -1093,6 +1101,17 @@ if(INSTALL_BUNDLE STREQUAL "full")
REGEX "\\.dSYM" EXCLUDE
)
endif()
# TLS plugins (Qt 6 only)
if(EXISTS "${QT_PLUGINS_DIR}/tls")
install(
DIRECTORY "${QT_PLUGINS_DIR}/tls"
DESTINATION ${PLUGIN_DEST_DIR}
COMPONENT Runtime
REGEX "d\\." EXCLUDE
REGEX "_debug\\." EXCLUDE
REGEX "\\.dSYM" EXCLUDE
)
endif()
endif()
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"

52
program_info/win_install.nsi.in
View File

@ -129,6 +129,7 @@ Section "@Launcher_CommonName@"
File /r "jars"
File /r "platforms"
File /r "styles"
File /nonfatal /r "tls"
; Write the installation path into the registry
WriteRegStr HKCU Software\@Launcher_CommonName@ "InstallDir" "$INSTDIR"
@ -182,60 +183,17 @@ Section "Uninstall"
DeleteRegKey HKCU SOFTWARE\@Launcher_CommonName@
Delete $INSTDIR\@Launcher_APP_BINARY_NAME@.exe
Delete $INSTDIR\uninstall.exe
Delete $INSTDIR\portable.txt
Delete $INSTDIR\libbrotlicommon.dll
Delete $INSTDIR\libbrotlidec.dll
Delete $INSTDIR\libbz2-1.dll
Delete $INSTDIR\libcrypto-1_1-x64.dll
Delete $INSTDIR\libcrypto-1_1.dll
Delete $INSTDIR\libdouble-conversion.dll
Delete $INSTDIR\libfreetype-6.dll
Delete $INSTDIR\libgcc_s_seh-1.dll
Delete $INSTDIR\libgcc_s_dw2-1.dll
Delete $INSTDIR\libglib-2.0-0.dll
Delete $INSTDIR\libgraphite2.dll
Delete $INSTDIR\libharfbuzz-0.dll
Delete $INSTDIR\libiconv-2.dll
Delete $INSTDIR\libicudt69.dll
Delete $INSTDIR\libicuin69.dll
Delete $INSTDIR\libicuuc69.dll
Delete $INSTDIR\libintl-8.dll
Delete $INSTDIR\libjasper-4.dll
Delete $INSTDIR\libjpeg-8.dll
Delete $INSTDIR\libmd4c.dll
Delete $INSTDIR\libpcre-1.dll
Delete $INSTDIR\libpcre2-16-0.dll
Delete $INSTDIR\libpng16-16.dll
Delete $INSTDIR\libssl-1_1-x64.dll
Delete $INSTDIR\libssl-1_1.dll
Delete $INSTDIR\libssp-0.dll
Delete $INSTDIR\libstdc++-6.dll
Delete $INSTDIR\libwebp-7.dll
Delete $INSTDIR\libwebpdemux-2.dll
Delete $INSTDIR\libwebpmux-3.dll
Delete $INSTDIR\libwinpthread-1.dll
Delete $INSTDIR\libzstd.dll
Delete $INSTDIR\Qt5Core.dll
Delete $INSTDIR\Qt5Gui.dll
Delete $INSTDIR\Qt5Network.dll
Delete $INSTDIR\Qt5Qml.dll
Delete $INSTDIR\Qt5QmlModels.dll
Delete $INSTDIR\Qt5Quick.dll
Delete $INSTDIR\Qt5Svg.dll
Delete $INSTDIR\Qt5WebSockets.dll
Delete $INSTDIR\Qt5Widgets.dll
Delete $INSTDIR\Qt5Xml.dll
Delete $INSTDIR\zlib1.dll
Delete $INSTDIR\qt.conf
Delete $INSTDIR\*.dll
Delete $INSTDIR\uninstall.exe
RMDir /r $INSTDIR\iconengines
RMDir /r $INSTDIR\imageformats
RMDir /r $INSTDIR\jars
RMDir /r $INSTDIR\platforms
RMDir /r $INSTDIR\styles
RMDir /r $INSTDIR\tls
Delete "$SMPROGRAMS\@Launcher_CommonName@.lnk"
Delete "$DESKTOP\@Launcher_CommonName@.lnk"