Packed resources

Dynamically load packed resources from separate file. This reduces amount of main memory required for linking stage.
telegramdesktop · Dec 3, 2021 · e5dfb13 · e5dfb13
1 parent 0e9a7ff
commit e5dfb13
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 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
@@ -1519,7 +1524,11 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
     configure_file("../lib/xdg/telegramdesktop.appdata.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml" @ONLY)
     generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.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/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"
@@ -92,6 +93,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) {

diff --git a/Telegram/lib_base b/Telegram/lib_base
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
diff --git a/cmake b/cmake
+8 −4		base/base_file_utilities.cpp
+1 −1		base/base_file_utilities.h
+1 −1		base/platform/base_platform_file_utilities.h
+9 −2		base/platform/linux/base_file_utilities_linux.cpp
+2 −2		base/platform/mac/base_file_utilities_mac.mm
+4 −2		base/platform/win/base_file_utilities_win.cpp