NOISSUE debranding for real, initial work

This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
This commit is contained in:
Petr Mrázek
2021-10-13 01:59:25 +02:00
parent 6a4130c914
commit 441ab7eedc
112 changed files with 944 additions and 663 deletions

View File

@ -88,13 +88,13 @@ set(CORE_SOURCES
add_unit_test(FileSystem
SOURCES FileSystem_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
DATA testdata
)
add_unit_test(GZip
SOURCES GZip_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
)
set(PATHMATCHER_SOURCES
@ -158,13 +158,13 @@ set(UPDATE_SOURCES
add_unit_test(UpdateChecker
SOURCES updater/UpdateChecker_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
DATA updater/testdata
)
add_unit_test(DownloadTask
SOURCES updater/DownloadTask_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
DATA updater/testdata
)
@ -337,14 +337,14 @@ set(MINECRAFT_SOURCES
add_unit_test(GradleSpecifier
SOURCES minecraft/GradleSpecifier_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
)
add_executable(PackageManifest
mojang/PackageManifest_test.cpp
)
target_link_libraries(PackageManifest
MultiMC_logic
Launcher_logic
Qt5::Test
)
target_include_directories(PackageManifest
@ -358,25 +358,25 @@ add_test(
add_unit_test(MojangVersionFormat
SOURCES minecraft/MojangVersionFormat_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
DATA minecraft/testdata
)
add_unit_test(Library
SOURCES minecraft/Library_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
)
# FIXME: shares data with FileSystem test
add_unit_test(ModFolderModel
SOURCES minecraft/mod/ModFolderModel_test.cpp
DATA testdata
LIBS MultiMC_logic
LIBS Launcher_logic
)
add_unit_test(ParseUtils
SOURCES minecraft/ParseUtils_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
)
# the screenshots feature
@ -414,7 +414,7 @@ set(SETTINGS_SOURCES
add_unit_test(INIFile
SOURCES settings/INIFile_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
)
set(JAVA_SOURCES
@ -437,7 +437,7 @@ set(JAVA_SOURCES
add_unit_test(JavaVersion
SOURCES java/JavaVersion_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
)
set(TRANSLATIONS_SOURCES
@ -523,7 +523,7 @@ set(ATLAUNCHER_SOURCES
add_unit_test(Index
SOURCES meta/Index_test.cpp
LIBS MultiMC_logic
LIBS Launcher_logic
)
################################ COMPILE ################################
@ -557,8 +557,8 @@ set(LOGIC_SOURCES
SET(MULTIMC_SOURCES
# Application base
MultiMC.h
MultiMC.cpp
Launcher.h
Launcher.cpp
UpdateController.cpp
UpdateController.h
@ -678,8 +678,8 @@ SET(MULTIMC_SOURCES
pages/global/LanguagePage.h
pages/global/MinecraftPage.cpp
pages/global/MinecraftPage.h
pages/global/MultiMCPage.cpp
pages/global/MultiMCPage.h
pages/global/LauncherPage.cpp
pages/global/LauncherPage.h
pages/global/ProxyPage.cpp
pages/global/ProxyPage.h
pages/global/PasteEEPage.cpp
@ -831,7 +831,7 @@ SET(MULTIMC_UIS
pages/global/ExternalToolsPage.ui
pages/global/JavaPage.ui
pages/global/MinecraftPage.ui
pages/global/MultiMCPage.ui
pages/global/LauncherPage.ui
pages/global/ProxyPage.ui
pages/global/PasteEEPage.ui
@ -891,11 +891,11 @@ qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS})
qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
# Add executable
add_library(MultiMC_logic STATIC ${LOGIC_SOURCES} ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES})
target_link_libraries(MultiMC_logic
add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES})
target_link_libraries(Launcher_logic
systeminfo
MultiMC_quazip
MultiMC_classparser
Launcher_quazip
Launcher_classparser
${NBT_NAME}
${ZLIB_LIBRARIES}
optional-bare
@ -903,46 +903,46 @@ target_link_libraries(MultiMC_logic
BuildConfig
Katabasis
)
target_link_libraries(MultiMC_logic
target_link_libraries(Launcher_logic
Qt5::Core
Qt5::Xml
Qt5::Network
Qt5::Concurrent
Qt5::Gui
)
target_link_libraries(MultiMC_logic
MultiMC_iconfix
target_link_libraries(Launcher_logic
Launcher_iconfix
${QUAZIP_LIBRARIES}
hoedown
MultiMC_rainbow
Launcher_rainbow
LocalPeer
ganalytics
)
add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
target_link_libraries(MultiMC MultiMC_logic)
target_link_libraries(Launcher_logic secrets)
if(DEFINED MultiMC_APP_BINARY_NAME)
set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "${MultiMC_APP_BINARY_NAME}")
add_executable(${Launcher_Name} MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
target_link_libraries(${Launcher_Name} Launcher_logic)
if(DEFINED Launcher_APP_BINARY_NAME)
set_target_properties(${Launcher_Name} PROPERTIES OUTPUT_NAME "${Launcher_APP_BINARY_NAME}")
endif()
if(DEFINED MultiMC_BINARY_RPATH)
SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}")
if(DEFINED Launcher_BINARY_RPATH)
SET_TARGET_PROPERTIES(${Launcher_Name} PROPERTIES INSTALL_RPATH "${Launcher_BINARY_RPATH}")
endif()
if(DEFINED MultiMC_APP_BINARY_DEFS)
target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS})
target_compile_definitions(MultiMC_logic PRIVATE ${MultiMC_APP_BINARY_DEFS})
if(DEFINED Launcher_APP_BINARY_DEFS)
target_compile_definitions(${Launcher_Name} PRIVATE ${Launcher_APP_BINARY_DEFS})
target_compile_definitions(Launcher_logic PRIVATE ${Launcher_APP_BINARY_DEFS})
endif()
install(TARGETS MultiMC
install(TARGETS ${Launcher_Name}
BUNDLE DESTINATION ${BUNDLE_DEST_DIR} COMPONENT Runtime
LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime
RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime
)
target_link_libraries(MultiMC_logic secrets)
#### The MultiMC bundle mess! ####
#### The bundle mess! ####
# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system.
# NOTE: it seems that this absolutely has to be here, and nowhere else.
if(INSTALL_BUNDLE STREQUAL "full")