refactor: add in-tree QuaZip

2022-01-24 22:55:57 +01:00
parent efa414c442
commit 3aa809b8c0
18 changed files with 106 additions and 16 deletions
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@ -899,7 +899,6 @@ endif()
 add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
 target_link_libraries(Launcher_logic
    systeminfo
-    Launcher_quazip
    Launcher_classparser
    ${NBT_NAME}
    ${ZLIB_LIBRARIES}
@ -917,7 +916,7 @@ target_link_libraries(Launcher_logic
 )
 target_link_libraries(Launcher_logic
    Launcher_iconfix
-    ${QUAZIP_LIBRARIES}
+    QuaZip::QuaZip
    hoedown
    Launcher_rainbow
    LocalPeer
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@ -29,7 +29,12 @@
 #include "modplatform/flame/FileResolvingTask.h"
 #include "modplatform/flame/PackManifest.h"
 #include "Json.h"
+
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazipdir.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
+#endif
 #include "modplatform/technic/TechnicPackProcessor.h"

 #include "icons/IconList.h"
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@ -12,10 +12,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#include <quazip/quazipdir.h>
+#include <quazip/quazipfile.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
+#endif
 #include "MMCZip.h"
 #include "FileSystem.h"

--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@ -19,13 +19,14 @@
 #include <QFileInfo>
 #include <QSet>
 #include "minecraft/mod/Mod.h"
+#include "nonstd/optional"
 #include <functional>

-//#include <QuaZip-Qt5-1.2/quazip/JlCompress.h>
-// TODO: Blocked by https://github.com/stachenov/quazip/pull/141
-// For now, checkout https://github.com/Scrumplex/quazip/tree/expose-jlcompress-fns at ../../quazip
-#include <../../quazip/quazip/JlCompress.h>
-#include <nonstd/optional>
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/JlCompress.h>
+#else
+#include <QuaZip-Qt5-1.2/quazip/JlCompress.h>
+#endif

 namespace MMCZip
 {
--- a/launcher/minecraft/MinecraftLoadAndCheck.h
+++ b/launcher/minecraft/MinecraftLoadAndCheck.h
@ -20,7 +20,12 @@
 #include <QUrl>

 #include "tasks/Task.h"
+
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
+#endif

 #include "QObjectPtr.h"

--- a/launcher/minecraft/MinecraftUpdate.h
+++ b/launcher/minecraft/MinecraftUpdate.h
@ -22,7 +22,12 @@
 #include "net/NetJob.h"
 #include "tasks/Task.h"
 #include "minecraft/VersionFilterData.h"
+
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
+#endif

 class MinecraftVersion;
 class MinecraftInstance;
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@ -26,9 +26,16 @@
 #include <io/stream_reader.h>
 #include <tag_string.h>
 #include <tag_primitive.h>
+
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
+#include <quazip/quazipdir.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
+#endif

 #include <QCoreApplication>

--- a/launcher/minecraft/launch/ExtractNatives.cpp
+++ b/launcher/minecraft/launch/ExtractNatives.cpp
@ -17,8 +17,14 @@
 #include <minecraft/MinecraftInstance.h>
 #include <launch/LaunchTask.h>

+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#include <quazip/quazipdir.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
+#endif
+
 #include "MMCZip.h"
 #include "FileSystem.h"
 #include <QDir>
--- a/launcher/minecraft/mod/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/LocalModParseTask.cpp
@ -4,8 +4,15 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
+#endif
+
 #include <toml.h>

 #include "settings/INIFile.h"
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@ -19,7 +19,11 @@

 #include <QtConcurrent/QtConcurrent>

+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
+#endif

 #include "MMCZip.h"
 #include "minecraft/OneSixVersionFormat.h"
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@ -1,8 +1,15 @@
 #pragma once
 #include "InstanceTask.h"
 #include "net/NetJob.h"
+
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#include <quazip/quazipdir.h>
+#else
 #include "QuaZip-Qt5-1.2/quazip/quazip.h"
 #include "QuaZip-Qt5-1.2/quazip/quazipdir.h"
+#endif
+
 #include "meta/Index.h"
 #include "meta/Version.h"
 #include "meta/VersionList.h"
--- a/launcher/modplatform/technic/SingleZipPackInstallTask.h
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h
@ -18,7 +18,11 @@
 #include "InstanceTask.h"
 #include "net/NetJob.h"

+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#else
 #include "QuaZip-Qt5-1.2/quazip/quazip.h"
+#endif

 #include <QFutureWatcher>
 #include <QStringList>
--- a/launcher/modplatform/technic/TechnicPackProcessor.cpp
+++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp
@ -19,9 +19,17 @@
 #include <Json.h>
 #include <minecraft/MinecraftInstance.h>
 #include <minecraft/PackProfile.h>
+
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/quazip.h>
+#include <quazip/quazipdir.h>
+#include <quazip/quazipfile.h>
+#else
 #include <QuaZip-Qt5-1.2/quazip/quazip.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
 #include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
+#endif
+
 #include <settings/INISettingsObject.h>

 #include <memory>