Packed resources

Dynamically load packed resources from a separate file. This reduces amount of main memory required for linking stage.
telegramdesktop · Jan 17, 2022 · d99218f · d99218f
1 parent 64b5269
commit d99218f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
@@ -51,7 +51,12 @@ if (WIN32)
 endif()
 
 set_target_properties(Telegram PROPERTIES AUTOMOC ON)
-target_prepare_qrc(Telegram)
+if (LINUX)
+    # Do not repeat app name in path of a resource archive.
+    target_prepare_qrc(Telegram tresources.rcc)
+else()
+    target_prepare_qrc(Telegram)
+endif()
 
 target_link_libraries(Telegram
 PRIVATE
@@ -1536,7 +1541,11 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
     configure_file("../lib/xdg/telegramdesktop.metainfo.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.metainfo.xml" @ONLY)
     generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.metainfo.xml")
-    install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
+    install(TARGETS Telegram
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        RESOURCE DESTINATION "${CMAKE_INSTALL_DATADIR}/TelegramDesktop"
+    )
     install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "telegram.png")

diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
@@ -293,11 +293,11 @@ rpl::producer<bool> Session::termsLockValue() const {
 }
 
 QString Session::createInternalLink(const QString &query) const {
-	return createInternalLink({ .text = query }).text;
+	return createInternalLink(TextWithEntities{ .text = query }).text;
 }
 
 QString Session::createInternalLinkFull(const QString &query) const {
-	return createInternalLinkFull({ .text = query }).text;
+	return createInternalLinkFull(TextWithEntities{ .text = query }).text;
 }
 
 TextWithEntities Session::createInternalLink(

diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "platform/linux/launcher_linux.h"
 
+#include "base/base_file_utilities.h"
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
 #include "webview/platform/linux/webview_linux_webkit2gtk.h"
@@ -82,6 +83,8 @@ void Launcher::initHook() {
 
 		return qsl(QT_STRINGIFY(TDESKTOP_LAUNCHER_BASENAME) ".desktop");
 	}());
+
+	base::RegisterResourceArchive(u"tresources.rcc"_q);
 }
 
 bool Launcher::launchUpdater(UpdaterLaunch action) {

diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm
@@ -27,7 +27,7 @@
 	// macOS Retina display support is working fine, others are not.
 	QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, false);
 
-	base::RegisterBundledResources(u"Telegram.rcc"_q);
+	base::RegisterResourceArchive(u"Telegram.rcc"_q);
 }
 
 bool Launcher::launchUpdater(UpdaterLaunch action) {