From c45fa016c0f0e5c8a03f029488de29bde8dadcc4 Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Mon, 23 Jan 2023 18:36:58 -0700 Subject: [PATCH 1/3] fix: let jars be found from inside build dir for debug builds debug bug builds run form inside the build dir before they are bundled can't find the jars Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- launcher/Application.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 5f70ab94..537ffb68 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1547,7 +1547,10 @@ QString Application::getJarPath(QString jarFile) FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_APP_BINARY_NAME), #endif FS::PathCombine(m_rootPath, "jars"), - FS::PathCombine(applicationDirPath(), "jars") + FS::PathCombine(applicationDirPath(), "jars"), +#if !defined(NDEBUG) + FS::PathCombine(applicationDirPath(), "..", "jars") // from inside build dir , for debuging +#endif }; for(QString p : potentialPaths) { From 085e067fc1c34c08db369dbf9136faca50ed048c Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Tue, 24 Jan 2023 02:26:21 -0700 Subject: [PATCH 2/3] remove NDEBUG check per Scrumplex's orders Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- launcher/Application.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 537ffb68..608fc618 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1548,9 +1548,7 @@ QString Application::getJarPath(QString jarFile) #endif FS::PathCombine(m_rootPath, "jars"), FS::PathCombine(applicationDirPath(), "jars"), -#if !defined(NDEBUG) FS::PathCombine(applicationDirPath(), "..", "jars") // from inside build dir , for debuging -#endif }; for(QString p : potentialPaths) { From 3ddf41333230cd8d04c18bac27df75941d14ce6e Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Tue, 24 Jan 2023 09:24:12 -0700 Subject: [PATCH 3/3] Update launcher/Application.cpp Co-authored-by: Sefa Eyeoglu Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- launcher/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 608fc618..6a798822 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1548,7 +1548,7 @@ QString Application::getJarPath(QString jarFile) #endif FS::PathCombine(m_rootPath, "jars"), FS::PathCombine(applicationDirPath(), "jars"), - FS::PathCombine(applicationDirPath(), "..", "jars") // from inside build dir , for debuging + FS::PathCombine(applicationDirPath(), "..", "jars") // from inside build dir, for debuging }; for(QString p : potentialPaths) {