summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt709
-rw-r--r--cmake/Coverity.cmake20
-rw-r--r--cmake/GitFunctions.cmake8
-rw-r--r--depends/javacheck/CMakeLists.txt2
-rw-r--r--depends/launcher/CMakeLists.txt38
-rw-r--r--depends/pack200/CMakeLists.txt32
-rw-r--r--depends/settings/CMakeLists.txt22
-rw-r--r--depends/util/CMakeLists.txt20
-rw-r--r--depends/xz-embedded/CMakeLists.txt20
-rw-r--r--tests/CMakeLists.txt46
10 files changed, 459 insertions, 458 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0278b7cd..6c9606b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,11 +49,11 @@ find_package(Qt5Concurrent REQUIRED)
find_package(Qt5LinguistTools REQUIRED)
include_directories(
- ${Qt5Core_INCLUDE_DIRS}
- ${Qt5Widgets_INCLUDE_DIRS}
- ${Qt5Concurrent_INCLUDE_DIRS}
- ${Qt5Network_INCLUDE_DIRS}
- ${Qt5Test_INCLUDE_DIRS}
+ ${Qt5Core_INCLUDE_DIRS}
+ ${Qt5Widgets_INCLUDE_DIRS}
+ ${Qt5Concurrent_INCLUDE_DIRS}
+ ${Qt5Network_INCLUDE_DIRS}
+ ${Qt5Test_INCLUDE_DIRS}
)
# The Qt5 cmake files don't provide its install paths, so ask qmake.
@@ -243,323 +243,323 @@ add_subdirectory(mmc_updater)
######## Sources and headers ########
set(MULTIMC_SOURCES
- # Application base
- MultiMC.h
- MultiMC.cpp
- MMCError.h
- BuildConfig.h
- ${PROJECT_BINARY_DIR}/BuildConfig.cpp
-
- # Logging
- logger/QsDebugOutput.cpp
- logger/QsDebugOutput.h
- logger/QsLog.cpp
- logger/QsLog.h
- logger/QsLogDest.cpp
- logger/QsLogDest.h
-
- # GUI - windows
- gui/MainWindow.h
- gui/MainWindow.cpp
- gui/ConsoleWindow.h
- gui/ConsoleWindow.cpp
-
- # GUI - dialogs
- gui/dialogs/SettingsDialog.h
- gui/dialogs/SettingsDialog.cpp
- gui/dialogs/CopyInstanceDialog.h
- gui/dialogs/CopyInstanceDialog.cpp
- gui/dialogs/NewInstanceDialog.cpp
- gui/dialogs/ProgressDialog.h
- gui/dialogs/ProgressDialog.cpp
- gui/dialogs/AboutDialog.h
- gui/dialogs/AboutDialog.cpp
- gui/dialogs/VersionSelectDialog.h
- gui/dialogs/VersionSelectDialog.cpp
- gui/dialogs/LwjglSelectDialog.h
- gui/dialogs/LwjglSelectDialog.cpp
- gui/dialogs/InstanceSettings.h
- gui/dialogs/InstanceSettings.cpp
- gui/dialogs/IconPickerDialog.h
- gui/dialogs/IconPickerDialog.cpp
- gui/dialogs/LegacyModEditDialog.h
- gui/dialogs/LegacyModEditDialog.cpp
- gui/dialogs/OneSixModEditDialog.h
- gui/dialogs/OneSixModEditDialog.cpp
- gui/dialogs/ModEditDialogCommon.h
- gui/dialogs/ModEditDialogCommon.cpp
- gui/dialogs/EditNotesDialog.h
- gui/dialogs/EditNotesDialog.cpp
- gui/dialogs/CustomMessageBox.h
- gui/dialogs/CustomMessageBox.cpp
- gui/dialogs/EditAccountDialog.h
- gui/dialogs/EditAccountDialog.cpp
- gui/dialogs/AccountListDialog.h
- gui/dialogs/AccountListDialog.cpp
- gui/dialogs/AccountSelectDialog.h
- gui/dialogs/AccountSelectDialog.cpp
- gui/dialogs/UpdateDialog.h
- gui/dialogs/UpdateDialog.cpp
- gui/dialogs/ScreenshotDialog.h
- gui/dialogs/ScreenshotDialog.cpp
- gui/dialogs/NotificationDialog.h
- gui/dialogs/NotificationDialog.cpp
-
- # GUI - widgets
- gui/widgets/Common.h
- gui/widgets/Common.cpp
- gui/widgets/ModListView.h
- gui/widgets/ModListView.cpp
- gui/widgets/VersionListView.h
- gui/widgets/VersionListView.cpp
- gui/widgets/LabeledToolButton.h
- gui/widgets/LabeledToolButton.cpp
- gui/widgets/MCModInfoFrame.h
- gui/widgets/MCModInfoFrame.cpp
-
- # GUI - instance group view
- gui/groupview/Group.cpp
- gui/groupview/Group.h
- gui/groupview/GroupedProxyModel.cpp
- gui/groupview/GroupedProxyModel.h
- gui/groupview/GroupView.cpp
- gui/groupview/GroupView.h
- gui/groupview/InstanceDelegate.cpp
- gui/groupview/InstanceDelegate.h
-
- # Base classes and infrastructure
- logic/BaseVersion.h
- logic/MinecraftVersion.h
- logic/InstanceFactory.h
- logic/InstanceFactory.cpp
- logic/BaseInstance.h
- logic/BaseInstance.cpp
- logic/BaseInstance_p.h
-
- logic/MinecraftProcess.h
- logic/MinecraftProcess.cpp
- logic/Mod.h
- logic/Mod.cpp
- logic/ModList.h
- logic/ModList.cpp
-
- # Basic instance launcher for starting from terminal
- logic/InstanceLauncher.h
- logic/InstanceLauncher.cpp
-
- # JSON parsing helpers
- logic/MMCJson.h
- logic/MMCJson.cpp
-
- # network stuffs
- logic/net/NetAction.h
- logic/net/MD5EtagDownload.h
- logic/net/MD5EtagDownload.cpp
- logic/net/ByteArrayDownload.h
- logic/net/ByteArrayDownload.cpp
- logic/net/CacheDownload.h
- logic/net/CacheDownload.cpp
- logic/net/ForgeMirrors.h
- logic/net/ForgeMirrors.cpp
- logic/net/ForgeXzDownload.h
- logic/net/ForgeXzDownload.cpp
- logic/net/NetJob.h
- logic/net/NetJob.cpp
- logic/net/HttpMetaCache.h
- logic/net/HttpMetaCache.cpp
- logic/net/PasteUpload.h
- logic/net/PasteUpload.cpp
- logic/net/URLConstants.h
- logic/net/URLConstants.cpp
-
- # Yggdrasil login stuff
- logic/auth/AuthSession.h
- logic/auth/AuthSession.cpp
- logic/auth/MojangAccountList.h
- logic/auth/MojangAccountList.cpp
- logic/auth/MojangAccount.h
- logic/auth/MojangAccount.cpp
- logic/auth/YggdrasilTask.h
- logic/auth/YggdrasilTask.cpp
- logic/auth/flows/AuthenticateTask.h
- logic/auth/flows/AuthenticateTask.cpp
- logic/auth/flows/RefreshTask.cpp
- logic/auth/flows/RefreshTask.cpp
- logic/auth/flows/ValidateTask.h
- logic/auth/flows/ValidateTask.cpp
-
- # Update system
- logic/updater/UpdateChecker.h
- logic/updater/UpdateChecker.cpp
- logic/updater/DownloadUpdateTask.h
- logic/updater/DownloadUpdateTask.cpp
- logic/updater/NotificationChecker.h
- logic/updater/NotificationChecker.cpp
-
- # News System
- logic/news/NewsChecker.h
- logic/news/NewsChecker.cpp
- logic/news/NewsEntry.h
- logic/news/NewsEntry.cpp
-
- # Status system
- logic/status/StatusChecker.h
- logic/status/StatusChecker.cpp
-
- # legacy instances
- logic/LegacyInstance.h
- logic/LegacyInstance.cpp
- logic/LegacyInstance_p.h
- logic/LegacyUpdate.h
- logic/LegacyUpdate.cpp
-
- logic/LegacyForge.h
- logic/LegacyForge.cpp
-
- # OneSix instances
- logic/OneSixUpdate.h
- logic/OneSixUpdate.cpp
- logic/OneSixInstance.h
- logic/OneSixInstance.cpp
- logic/OneSixInstance_p.h
-
- # OneSix version json infrastructure
- logic/OneSixVersionBuilder.h
- logic/OneSixVersionBuilder.cpp
- logic/VersionFile.h
- logic/VersionFile.cpp
- logic/VersionFinal.h
- logic/VersionFinal.cpp
- logic/OneSixLibrary.h
- logic/OneSixLibrary.cpp
- logic/OneSixRule.h
- logic/OneSixRule.cpp
- logic/OpSys.h
- logic/OpSys.cpp
-
- # Mod installers
- logic/BaseInstaller.h
- logic/BaseInstaller.cpp
- logic/ForgeInstaller.h
- logic/ForgeInstaller.cpp
- logic/LiteLoaderInstaller.h
- logic/LiteLoaderInstaller.cpp
-
- # Nostalgia
- logic/NostalgiaInstance.h
- logic/NostalgiaInstance.cpp
-
- # FTB
- logic/OneSixFTBInstance.h
- logic/OneSixFTBInstance.cpp
- logic/LegacyFTBInstance.h
- logic/LegacyFTBInstance.cpp
-
- # Lists
- logic/lists/InstanceList.h
- logic/lists/InstanceList.cpp
- logic/lists/BaseVersionList.h
- logic/lists/BaseVersionList.cpp
- logic/lists/MinecraftVersionList.h
- logic/lists/MinecraftVersionList.cpp
- logic/lists/LwjglVersionList.h
- logic/lists/LwjglVersionList.cpp
- logic/lists/ForgeVersionList.h
- logic/lists/ForgeVersionList.cpp
- logic/lists/JavaVersionList.h
- logic/lists/JavaVersionList.cpp
- logic/lists/LiteLoaderVersionList.h
- logic/lists/LiteLoaderVersionList.cpp
-
- # the screenshots feature
- logic/screenshots/Screenshot.h
- logic/screenshots/Screenshot.cpp
- logic/screenshots/ScreenshotList.h
- logic/screenshots/ScreenshotList.cpp
- logic/screenshots/ImgurUpload.h
- logic/screenshots/ImgurUpload.cpp
- logic/screenshots/ImgurAlbumCreation.h
- logic/screenshots/ImgurAlbumCreation.cpp
-
- # Icons
- logic/icons/MMCIcon.h
- logic/icons/MMCIcon.cpp
- logic/icons/IconList.h
- logic/icons/IconList.cpp
-
- # misc model/view
- logic/EnabledItemFilter.h
- logic/EnabledItemFilter.cpp
-
- # Tasks
- logic/tasks/ProgressProvider.h
- logic/tasks/Task.h
- logic/tasks/Task.cpp
- logic/tasks/ThreadTask.h
- logic/tasks/ThreadTask.cpp
- logic/tasks/SequentialTask.h
- logic/tasks/SequentialTask.cpp
-
- # Utilities
- logic/JavaChecker.h
- logic/JavaChecker.cpp
- logic/JavaUtils.h
- logic/JavaUtils.cpp
- logic/NagUtils.h
- logic/NagUtils.cpp
- logic/SkinUtils.h
- logic/SkinUtils.cpp
- logic/JavaCheckerJob.h
- logic/JavaCheckerJob.cpp
-
- # Assets
- logic/assets/AssetsMigrateTask.h
- logic/assets/AssetsMigrateTask.cpp
- logic/assets/AssetsUtils.h
- logic/assets/AssetsUtils.cpp
-
- # Tools
- logic/tools/BaseExternalTool.h
- logic/tools/BaseExternalTool.cpp
- logic/tools/MCEditTool.h
- logic/tools/MCEditTool.cpp
- logic/tools/BaseProfiler.h
- logic/tools/BaseProfiler.cpp
- logic/tools/JProfiler.h
- logic/tools/JProfiler.cpp
- logic/tools/JVisualVM.h
- logic/tools/JVisualVM.cpp
+ # Application base
+ MultiMC.h
+ MultiMC.cpp
+ MMCError.h
+ BuildConfig.h
+ ${PROJECT_BINARY_DIR}/BuildConfig.cpp
+
+ # Logging
+ logger/QsDebugOutput.cpp
+ logger/QsDebugOutput.h
+ logger/QsLog.cpp
+ logger/QsLog.h
+ logger/QsLogDest.cpp
+ logger/QsLogDest.h
+
+ # GUI - windows
+ gui/MainWindow.h
+ gui/MainWindow.cpp
+ gui/ConsoleWindow.h
+ gui/ConsoleWindow.cpp
+
+ # GUI - dialogs
+ gui/dialogs/SettingsDialog.h
+ gui/dialogs/SettingsDialog.cpp
+ gui/dialogs/CopyInstanceDialog.h
+ gui/dialogs/CopyInstanceDialog.cpp
+ gui/dialogs/NewInstanceDialog.cpp
+ gui/dialogs/ProgressDialog.h
+ gui/dialogs/ProgressDialog.cpp
+ gui/dialogs/AboutDialog.h
+ gui/dialogs/AboutDialog.cpp
+ gui/dialogs/VersionSelectDialog.h
+ gui/dialogs/VersionSelectDialog.cpp
+ gui/dialogs/LwjglSelectDialog.h
+ gui/dialogs/LwjglSelectDialog.cpp
+ gui/dialogs/InstanceSettings.h
+ gui/dialogs/InstanceSettings.cpp
+ gui/dialogs/IconPickerDialog.h
+ gui/dialogs/IconPickerDialog.cpp
+ gui/dialogs/LegacyModEditDialog.h
+ gui/dialogs/LegacyModEditDialog.cpp
+ gui/dialogs/OneSixModEditDialog.h
+ gui/dialogs/OneSixModEditDialog.cpp
+ gui/dialogs/ModEditDialogCommon.h
+ gui/dialogs/ModEditDialogCommon.cpp
+ gui/dialogs/EditNotesDialog.h
+ gui/dialogs/EditNotesDialog.cpp
+ gui/dialogs/CustomMessageBox.h
+ gui/dialogs/CustomMessageBox.cpp
+ gui/dialogs/EditAccountDialog.h
+ gui/dialogs/EditAccountDialog.cpp
+ gui/dialogs/AccountListDialog.h
+ gui/dialogs/AccountListDialog.cpp
+ gui/dialogs/AccountSelectDialog.h
+ gui/dialogs/AccountSelectDialog.cpp
+ gui/dialogs/UpdateDialog.h
+ gui/dialogs/UpdateDialog.cpp
+ gui/dialogs/ScreenshotDialog.h
+ gui/dialogs/ScreenshotDialog.cpp
+ gui/dialogs/NotificationDialog.h
+ gui/dialogs/NotificationDialog.cpp
+
+ # GUI - widgets
+ gui/widgets/Common.h
+ gui/widgets/Common.cpp
+ gui/widgets/ModListView.h
+ gui/widgets/ModListView.cpp
+ gui/widgets/VersionListView.h
+ gui/widgets/VersionListView.cpp
+ gui/widgets/LabeledToolButton.h
+ gui/widgets/LabeledToolButton.cpp
+ gui/widgets/MCModInfoFrame.h
+ gui/widgets/MCModInfoFrame.cpp
+
+ # GUI - instance group view
+ gui/groupview/Group.cpp
+ gui/groupview/Group.h
+ gui/groupview/GroupedProxyModel.cpp
+ gui/groupview/GroupedProxyModel.h
+ gui/groupview/GroupView.cpp
+ gui/groupview/GroupView.h
+ gui/groupview/InstanceDelegate.cpp
+ gui/groupview/InstanceDelegate.h
+
+ # Base classes and infrastructure
+ logic/BaseVersion.h
+ logic/MinecraftVersion.h
+ logic/InstanceFactory.h
+ logic/InstanceFactory.cpp
+ logic/BaseInstance.h
+ logic/BaseInstance.cpp
+ logic/BaseInstance_p.h
+
+ logic/MinecraftProcess.h
+ logic/MinecraftProcess.cpp
+ logic/Mod.h
+ logic/Mod.cpp
+ logic/ModList.h
+ logic/ModList.cpp
+
+ # Basic instance launcher for starting from terminal
+ logic/InstanceLauncher.h
+ logic/InstanceLauncher.cpp
+
+ # JSON parsing helpers
+ logic/MMCJson.h
+ logic/MMCJson.cpp
+
+ # network stuffs
+ logic/net/NetAction.h
+ logic/net/MD5EtagDownload.h
+ logic/net/MD5EtagDownload.cpp
+ logic/net/ByteArrayDownload.h
+ logic/net/ByteArrayDownload.cpp
+ logic/net/CacheDownload.h
+ logic/net/CacheDownload.cpp
+ logic/net/ForgeMirrors.h
+ logic/net/ForgeMirrors.cpp
+ logic/net/ForgeXzDownload.h
+ logic/net/ForgeXzDownload.cpp
+ logic/net/NetJob.h
+ logic/net/NetJob.cpp
+ logic/net/HttpMetaCache.h
+ logic/net/HttpMetaCache.cpp
+ logic/net/PasteUpload.h
+ logic/net/PasteUpload.cpp
+ logic/net/URLConstants.h
+ logic/net/URLConstants.cpp
+
+ # Yggdrasil login stuff
+ logic/auth/AuthSession.h
+ logic/auth/AuthSession.cpp
+ logic/auth/MojangAccountList.h
+ logic/auth/MojangAccountList.cpp
+ logic/auth/MojangAccount.h
+ logic/auth/MojangAccount.cpp
+ logic/auth/YggdrasilTask.h
+ logic/auth/YggdrasilTask.cpp
+ logic/auth/flows/AuthenticateTask.h
+ logic/auth/flows/AuthenticateTask.cpp
+ logic/auth/flows/RefreshTask.cpp
+ logic/auth/flows/RefreshTask.cpp
+ logic/auth/flows/ValidateTask.h
+ logic/auth/flows/ValidateTask.cpp
+
+ # Update system
+ logic/updater/UpdateChecker.h
+ logic/updater/UpdateChecker.cpp
+ logic/updater/DownloadUpdateTask.h
+ logic/updater/DownloadUpdateTask.cpp
+ logic/updater/NotificationChecker.h
+ logic/updater/NotificationChecker.cpp
+
+ # News System
+ logic/news/NewsChecker.h
+ logic/news/NewsChecker.cpp
+ logic/news/NewsEntry.h
+ logic/news/NewsEntry.cpp
+
+ # Status system
+ logic/status/StatusChecker.h
+ logic/status/StatusChecker.cpp
+
+ # legacy instances
+ logic/LegacyInstance.h
+ logic/LegacyInstance.cpp
+ logic/LegacyInstance_p.h
+ logic/LegacyUpdate.h
+ logic/LegacyUpdate.cpp
+
+ logic/LegacyForge.h
+ logic/LegacyForge.cpp
+
+ # OneSix instances
+ logic/OneSixUpdate.h
+ logic/OneSixUpdate.cpp
+ logic/OneSixInstance.h
+ logic/OneSixInstance.cpp
+ logic/OneSixInstance_p.h
+
+ # OneSix version json infrastructure
+ logic/OneSixVersionBuilder.h
+ logic/OneSixVersionBuilder.cpp
+ logic/VersionFile.h
+ logic/VersionFile.cpp
+ logic/VersionFinal.h
+ logic/VersionFinal.cpp
+ logic/OneSixLibrary.h
+ logic/OneSixLibrary.cpp
+ logic/OneSixRule.h
+ logic/OneSixRule.cpp
+ logic/OpSys.h
+ logic/OpSys.cpp
+
+ # Mod installers
+ logic/BaseInstaller.h
+ logic/BaseInstaller.cpp
+ logic/ForgeInstaller.h
+ logic/ForgeInstaller.cpp
+ logic/LiteLoaderInstaller.h
+ logic/LiteLoaderInstaller.cpp
+
+ # Nostalgia
+ logic/NostalgiaInstance.h
+ logic/NostalgiaInstance.cpp
+
+ # FTB
+ logic/OneSixFTBInstance.h
+ logic/OneSixFTBInstance.cpp
+ logic/LegacyFTBInstance.h
+ logic/LegacyFTBInstance.cpp
+
+ # Lists
+ logic/lists/InstanceList.h
+ logic/lists/InstanceList.cpp
+ logic/lists/BaseVersionList.h
+ logic/lists/BaseVersionList.cpp
+ logic/lists/MinecraftVersionList.h
+ logic/lists/MinecraftVersionList.cpp
+ logic/lists/LwjglVersionList.h
+ logic/lists/LwjglVersionList.cpp
+ logic/lists/ForgeVersionList.h
+ logic/lists/ForgeVersionList.cpp
+ logic/lists/JavaVersionList.h
+ logic/lists/JavaVersionList.cpp
+ logic/lists/LiteLoaderVersionList.h
+ logic/lists/LiteLoaderVersionList.cpp
+
+ # the screenshots feature
+ logic/screenshots/Screenshot.h
+ logic/screenshots/Screenshot.cpp
+ logic/screenshots/ScreenshotList.h
+ logic/screenshots/ScreenshotList.cpp
+ logic/screenshots/ImgurUpload.h
+ logic/screenshots/ImgurUpload.cpp
+ logic/screenshots/ImgurAlbumCreation.h
+ logic/screenshots/ImgurAlbumCreation.cpp
+
+ # Icons
+ logic/icons/MMCIcon.h
+ logic/icons/MMCIcon.cpp
+ logic/icons/IconList.h
+ logic/icons/IconList.cpp
+
+ # misc model/view
+ logic/EnabledItemFilter.h
+ logic/EnabledItemFilter.cpp
+
+ # Tasks
+ logic/tasks/ProgressProvider.h
+ logic/tasks/Task.h
+ logic/tasks/Task.cpp
+ logic/tasks/ThreadTask.h
+ logic/tasks/ThreadTask.cpp
+ logic/tasks/SequentialTask.h
+ logic/tasks/SequentialTask.cpp
+
+ # Utilities
+ logic/JavaChecker.h
+ logic/JavaChecker.cpp
+ logic/JavaUtils.h
+ logic/JavaUtils.cpp
+ logic/NagUtils.h
+ logic/NagUtils.cpp
+ logic/SkinUtils.h
+ logic/SkinUtils.cpp
+ logic/JavaCheckerJob.h
+ logic/JavaCheckerJob.cpp
+
+ # Assets
+ logic/assets/AssetsMigrateTask.h
+ logic/assets/AssetsMigrateTask.cpp
+ logic/assets/AssetsUtils.h
+ logic/assets/AssetsUtils.cpp
+
+ # Tools
+ logic/tools/BaseExternalTool.h
+ logic/tools/BaseExternalTool.cpp
+ logic/tools/MCEditTool.h
+ logic/tools/MCEditTool.cpp
+ logic/tools/BaseProfiler.h
+ logic/tools/BaseProfiler.cpp
+ logic/tools/JProfiler.h
+ logic/tools/JProfiler.cpp
+ logic/tools/JVisualVM.h
+ logic/tools/JVisualVM.cpp
)
######## UIs ########
set(MULTIMC_UIS
- # Windows
- gui/MainWindow.ui
- gui/ConsoleWindow.ui
-
- # Dialogs
- gui/dialogs/SettingsDialog.ui
- gui/dialogs/CopyInstanceDialog.ui
- gui/dialogs/NewInstanceDialog.ui
- gui/dialogs/AboutDialog.ui
- gui/dialogs/VersionSelectDialog.ui
- gui/dialogs/LwjglSelectDialog.ui
- gui/dialogs/InstanceSettings.ui
- gui/dialogs/ProgressDialog.ui
- gui/dialogs/IconPickerDialog.ui
- gui/dialogs/LegacyModEditDialog.ui
- gui/dialogs/OneSixModEditDialog.ui
- gui/dialogs/EditNotesDialog.ui
- gui/dialogs/AccountListDialog.ui
- gui/dialogs/AccountSelectDialog.ui
- gui/dialogs/EditAccountDialog.ui
- gui/dialogs/UpdateDialog.ui
- gui/dialogs/ScreenshotDialog.ui
- gui/dialogs/NotificationDialog.ui
-
- # Widgets/other
- gui/widgets/MCModInfoFrame.ui
+ # Windows
+ gui/MainWindow.ui
+ gui/ConsoleWindow.ui
+
+ # Dialogs
+ gui/dialogs/SettingsDialog.ui
+ gui/dialogs/CopyInstanceDialog.ui
+ gui/dialogs/NewInstanceDialog.ui
+ gui/dialogs/AboutDialog.ui
+ gui/dialogs/VersionSelectDialog.ui
+ gui/dialogs/LwjglSelectDialog.ui
+ gui/dialogs/InstanceSettings.ui
+ gui/dialogs/ProgressDialog.ui
+ gui/dialogs/IconPickerDialog.ui
+ gui/dialogs/LegacyModEditDialog.ui
+ gui/dialogs/OneSixModEditDialog.ui
+ gui/dialogs/EditNotesDialog.ui
+ gui/dialogs/AccountListDialog.ui
+ gui/dialogs/AccountSelectDialog.ui
+ gui/dialogs/EditAccountDialog.ui
+ gui/dialogs/UpdateDialog.ui
+ gui/dialogs/ScreenshotDialog.ui
+ gui/dialogs/NotificationDialog.ui
+
+ # Widgets/other
+ gui/widgets/MCModInfoFrame.ui
)
set(FILES_TO_TRANSLATE)
@@ -574,9 +574,9 @@ foreach(file ${MULTIMC_UIS})
endforeach()
set(MULTIMC_QRCS
- resources/backgrounds/backgrounds.qrc
- resources/multimc/multimc.qrc
- resources/instances/instances.qrc
+ resources/backgrounds/backgrounds.qrc
+ resources/multimc/multimc.qrc
+ resources/instances/instances.qrc
)
@@ -629,22 +629,22 @@ qt5_use_modules(MultiMC_common Core Widgets Network Xml Concurrent ${MultiMC_QT_
#### Executable ####
if(APPLE AND UNIX) ## OSX
install(TARGETS MultiMC
- BUNDLE DESTINATION . COMPONENT Runtime
- RUNTIME DESTINATION MultiMC.app/Contents/MacOS COMPONENT Runtime
+ BUNDLE DESTINATION . COMPONENT Runtime
+ RUNTIME DESTINATION MultiMC.app/Contents/MacOS COMPONENT Runtime
)
elseif(UNIX) ## LINUX and similar
install(TARGETS MultiMC
- BUNDLE DESTINATION . COMPONENT Runtime
- RUNTIME DESTINATION bin COMPONENT Runtime
+ BUNDLE DESTINATION . COMPONENT Runtime
+ RUNTIME DESTINATION bin COMPONENT Runtime
)
install(PROGRAMS package/linux/MultiMC DESTINATION .)
elseif(WIN32) ## WINDOWS
install(TARGETS MultiMC
- BUNDLE DESTINATION . COMPONENT Runtime
- LIBRARY DESTINATION . COMPONENT Runtime
- RUNTIME DESTINATION . COMPONENT Runtime
+ BUNDLE DESTINATION . COMPONENT Runtime
+ LIBRARY DESTINATION . COMPONENT Runtime
+ RUNTIME DESTINATION . COMPONENT Runtime
)
endif()
@@ -653,48 +653,48 @@ endif()
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
# Image formats
install(
- DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
- DESTINATION ${PLUGIN_DEST_DIR}
- COMPONENT Runtime
- REGEX "tga|svg|tiff|mng" EXCLUDE
+ DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+ DESTINATION ${PLUGIN_DEST_DIR}
+ COMPONENT Runtime
+ REGEX "tga|svg|tiff|mng" EXCLUDE
)
# Platform plugins
install(
- DIRECTORY "${QT_PLUGINS_DIR}/platforms"
- DESTINATION ${PLUGIN_DEST_DIR}
- COMPONENT Runtime
- REGEX "minimal|linuxfb|offscreen" EXCLUDE
+ DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+ DESTINATION ${PLUGIN_DEST_DIR}
+ COMPONENT Runtime
+ REGEX "minimal|linuxfb|offscreen" EXCLUDE
)
else()
# Image formats
install(
- DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
- DESTINATION ${PLUGIN_DEST_DIR}
- COMPONENT Runtime
- REGEX "tga|svg|tiff|mng" EXCLUDE
- REGEX "d\\." EXCLUDE
- REGEX "_debug\\." EXCLUDE
+ DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+ DESTINATION ${PLUGIN_DEST_DIR}
+ COMPONENT Runtime
+ REGEX "tga|svg|tiff|mng" EXCLUDE
+ REGEX "d\\." EXCLUDE
+ REGEX "_debug\\." EXCLUDE
)
# Platform plugins
install(
- DIRECTORY "${QT_PLUGINS_DIR}/platforms"
- DESTINATION ${PLUGIN_DEST_DIR}
- COMPONENT Runtime
- REGEX "minimal|linuxfb|offscreen" EXCLUDE
- REGEX "d\\." EXCLUDE
- REGEX "_debug\\." EXCLUDE
+ DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+ DESTINATION ${PLUGIN_DEST_DIR}
+ COMPONENT Runtime
+ REGEX "minimal|linuxfb|offscreen" EXCLUDE
+ REGEX "d\\." EXCLUDE
+ REGEX "_debug\\." EXCLUDE
)
if(APPLE)
# Accessible plugin to make buttons look decent on osx
install(
- DIRECTORY "${QT_PLUGINS_DIR}/accessible"
- DESTINATION ${PLUGIN_DEST_DIR}
- COMPONENT Runtime
- REGEX "quick" EXCLUDE
- REGEX "d\\." EXCLUDE
- REGEX "_debug\\." EXCLUDE
+ DIRECTORY "${QT_PLUGINS_DIR}/accessible"
+ DESTINATION ${PLUGIN_DEST_DIR}
+ COMPONENT Runtime
+ REGEX "quick" EXCLUDE
+ REGEX "d\\." EXCLUDE
+ REGEX "_debug\\." EXCLUDE
)
endif()
endif()
@@ -715,7 +715,8 @@ endif()
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
- @ONLY)
+ @ONLY
+)
install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
diff --git a/cmake/Coverity.cmake b/cmake/Coverity.cmake
index 899d9852..1fcec86f 100644
--- a/cmake/Coverity.cmake
+++ b/cmake/Coverity.cmake
@@ -17,19 +17,19 @@ find_program(CURL_EXECUTABLE NAMES curl PATHS /usr/bin)
if(NOT CURL_EXECUTABLE STREQUAL "" AND NOT MultiMC_COVERITY_TOKEN STREQUAL "" AND NOT MultiMC_COVERITY_EMAIL STREQUAL "")
add_custom_target(coverity_configure
- COMMAND ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-configure --comptype gcc --compiler ${CMAKE_C_COMPILER}
+ COMMAND ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-configure --comptype gcc --compiler ${CMAKE_C_COMPILER}
)
add_custom_target(coverity_create_tarball
- COMMAND ${CMAKE_COMMAND} -E echo "Cleaning..." && ${CMAKE_MAKE_PROGRAM} clean
- COMMAND ${CMAKE_COMMAND} -E echo "Building..." && ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-build --dir cov-int ${CMAKE_MAKE_PROGRAM} -j3
- COMMAND ${CMAKE_COMMAND} -E echo "Creating tarball..." && ${CMAKE_COMMAND} -E tar cfz multimc_coverity.tgz cov-int/
- COMMENT "Creating coverity build..."
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E echo "Cleaning..." && ${CMAKE_MAKE_PROGRAM} clean
+ COMMAND ${CMAKE_COMMAND} -E echo "Building..." && ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-build --dir cov-int ${CMAKE_MAKE_PROGRAM} -j3
+ COMMAND ${CMAKE_COMMAND} -E echo "Creating tarball..." && ${CMAKE_COMMAND} -E tar cfz multimc_coverity.tgz cov-int/
+ COMMENT "Creating coverity build..."
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
add_custom_target(coverity_upload
- COMMAND ${CURL_EXECUTABLE} --form project=02JanDal/MultiMC5 --form token=${MultiMC_COVERITY_TOKEN} --form email=${MultiMC_COVERITY_EMAIL} --form file=@multimc_coverity.tgz --form version=${MultiMC_GIT_COMMIT} --form description=${GIT_VERSION} http://scan5.coverity.com/cgi-bin/upload.py
- DEPENDS coverity_create_tarball
- COMMENT "Uploading to coverity..."
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND ${CURL_EXECUTABLE} --form project=02JanDal/MultiMC5 --form token=${MultiMC_COVERITY_TOKEN} --form email=${MultiMC_COVERITY_EMAIL} --form file=@multimc_coverity.tgz --form version=${MultiMC_GIT_COMMIT} --form description=${GIT_VERSION} http://scan5.coverity.com/cgi-bin/upload.py
+ DEPENDS coverity_create_tarball
+ COMMENT "Uploading to coverity..."
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
endif()
diff --git a/cmake/GitFunctions.cmake b/cmake/GitFunctions.cmake
index e0868725..898e7b01 100644
--- a/cmake/GitFunctions.cmake
+++ b/cmake/GitFunctions.cmake
@@ -14,10 +14,10 @@ if(GIT_FOUND)
cmake_parse_arguments(GIT_RUN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_RUN_COMMAND}
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- RESULT_VARIABLE GIT_RESULTVAR
- OUTPUT_VARIABLE GIT_OUTVAR
- OUTPUT_STRIP_TRAILING_WHITESPACE
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ RESULT_VARIABLE GIT_RESULTVAR
+ OUTPUT_VARIABLE GIT_OUTVAR
+ OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(GIT_RESULTVAR EQUAL 0)
diff --git a/depends/javacheck/CMakeLists.txt b/depends/javacheck/CMakeLists.txt
index 8396aabb..ac8009ff 100644
--- a/depends/javacheck/CMakeLists.txt
+++ b/depends/javacheck/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck)
set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
set(SRC
- JavaCheck.java
+ JavaCheck.java
)
add_jar(JavaCheck ${SRC})
diff --git a/depends/launcher/CMakeLists.txt b/depends/launcher/CMakeLists.txt
index 9db3aaeb..ad06fa7b 100644
--- a/depends/launcher/CMakeLists.txt
+++ b/depends/launcher/CMakeLists.txt
@@ -7,28 +7,28 @@ set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint)
set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
set(SRC
- # OSX things
- org/simplericity/macify/eawt/Application.java
- org/simplericity/macify/eawt/ApplicationAdapter.java
- org/simplericity/macify/eawt/ApplicationEvent.java
- org/simplericity/macify/eawt/ApplicationListener.java
- org/simplericity/macify/eawt/DefaultApplication.java
+ # OSX things
+ org/simplericity/macify/eawt/Application.java
+ org/simplericity/macify/eawt/ApplicationAdapter.java
+ org/simplericity/macify/eawt/ApplicationEvent.java
+ org/simplericity/macify/eawt/ApplicationListener.java
+ org/simplericity/macify/eawt/DefaultApplication.java
- # legacy applet wrapper thing.
- # The launcher has to be there for silly FML/Forge relauncher.
- net/minecraft/Launcher.java
- org/multimc/legacy/LegacyLauncher.java
- org/multimc/legacy/LegacyFrame.java
+ # legacy applet wrapper thing.
+ # The launcher has to be there for silly FML/Forge relauncher.
+ net/minecraft/Launcher.java
+ org/multimc/legacy/LegacyLauncher.java
+ org/multimc/legacy/LegacyFrame.java
- # onesix launcher
- org/multimc/onesix/OneSixLauncher.java
+ # onesix launcher
+ org/multimc/onesix/OneSixLauncher.java
- # generic launcher
- org/multimc/EntryPoint.java
- org/multimc/Launcher.java
- org/multimc/ParseException.java
- org/multimc/Utils.java
- org/multimc/IconLoader.java
+ # generic launcher
+ org/multimc/EntryPoint.java
+ org/multimc/Launcher.java
+ org/multimc/ParseException.java
+ org/multimc/Utils.java
+ org/multimc/IconLoader.java
)
add_jar(NewLaunch ${SRC})
diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt
index f1b699b2..4624b483 100644
--- a/depends/pack200/CMakeLists.txt
+++ b/depends/pack200/CMakeLists.txt
@@ -21,22 +21,22 @@ else(UNIX)
endif(UNIX)
set(PACK200_SRC
-include/unpack200.h
-src/bands.cpp
-src/bands.h
-src/bytes.cpp
-src/bytes.h
-src/coding.cpp
-src/coding.h
-src/constants.h
-src/defines.h
-src/unpack200.cpp
-src/unpack.cpp
-src/unpack.h
-src/utils.cpp
-src/utils.h
-src/zip.cpp
-src/zip.h
+ include/unpack200.h
+ src/bands.cpp
+ src/bands.h
+ src/bytes.cpp
+ src/bytes.h
+ src/coding.cpp
+ src/coding.h
+ src/constants.h
+ src/defines.h
+ src/unpack200.cpp
+ src/unpack.cpp
+ src/unpack.h
+ src/utils.cpp
+ src/utils.h
+ src/zip.cpp
+ src/zip.h
)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt
index aa44b731..346e15b5 100644
--- a/depends/settings/CMakeLists.txt
+++ b/depends/settings/CMakeLists.txt
@@ -10,20 +10,20 @@ include(UseCXX11)
include(Coverage)
set(LIBSETTINGS_SOURCES
- libsettings_config.h
+ libsettings_config.h
- inifile.h
- inifile.cpp
+ inifile.h
+ inifile.cpp
- settingsobject.h
- settingsobject.cpp
- inisettingsobject.h
- inisettingsobject.cpp
+ settingsobject.h
+ settingsobject.cpp
+ inisettingsobject.h
+ inisettingsobject.cpp
- setting.h
- setting.cpp
- overridesetting.h
- overridesetting.cpp
+ setting.h
+ setting.cpp
+ overridesetting.h
+ overridesetting.cpp
)
# Set the include dir path.
diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt
index 137d232e..7a18067c 100644
--- a/depends/util/CMakeLists.txt
+++ b/depends/util/CMakeLists.txt
@@ -10,21 +10,21 @@ find_package(Qt5Core REQUIRED)
include_directories(${Qt5Base_INCLUDE_DIRS})
set(LIBUTIL_SOURCES
- include/libutil_config.h
+ include/libutil_config.h
- include/pathutils.h
- src/pathutils.cpp
+ include/pathutils.h
+ src/pathutils.cpp
- include/osutils.h
+ include/osutils.h
- include/userutils.h
- src/userutils.cpp
+ include/userutils.h
+ src/userutils.cpp
- include/cmdutils.h
- src/cmdutils.cpp
+ include/cmdutils.h
+ src/cmdutils.cpp
- include/modutils.h
- src/modutils.cpp
+ include/modutils.h
+ src/modutils.cpp
)
# Set the include dir path.
diff --git a/depends/xz-embedded/CMakeLists.txt b/depends/xz-embedded/CMakeLists.txt
index b308efa4..bc1759dc 100644
--- a/depends/xz-embedded/CMakeLists.txt
+++ b/depends/xz-embedded/CMakeLists.txt
@@ -14,16 +14,16 @@ set(XZ_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
# tweak this list and xz.h to fit your needs
set(XZ_SOURCES
- include/xz.h
- src/xz_config.h
- src/xz_crc32.c
- src/xz_crc64.c
- src/xz_dec_lzma2.c
- src/xz_dec_stream.c
- src/xz_lzma2.h
- src/xz_private.h
- src/xz_stream.h
-# src/xz_dec_bcj.c
+ include/xz.h
+ src/xz_config.h
+ src/xz_crc32.c
+ src/xz_crc64.c
+ src/xz_dec_lzma2.c
+ src/xz_dec_stream.c
+ src/xz_lzma2.h
+ src/xz_private.h
+ src/xz_stream.h
+# src/xz_dec_bcj.c
)
# TODO: look into what would be needed for plain old lzma
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index abd3523a..3b2b8b74 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -30,19 +30,19 @@ add_unit_test(DownloadUpdateTask tst_DownloadUpdateTask.cpp)
# Tests END #
set(COVERAGE_SOURCE_DIRS
- ${MMC_SRC}/logic/*
- ${MMC_SRC}/logic/auth/*
- ${MMC_SRC}/logic/auth/flows/*
- ${MMC_SRC}/logic/lists/*
- ${MMC_SRC}/logic/net/*
- ${MMC_SRC}/logic/tasks/*
- ${MMC_SRC}/gui/*
- ${MMC_SRC}/gui/dialogs/*
- ${MMC_SRC}/gui/widgets/*
- ${MMC_SRC}/depends/settings/include/*
- ${MMC_SRC}/depends/settings/src/*
- ${MMC_SRC}/depends/util/include/*
- ${MMC_SRC}/depends/util/src/*
+ ${MMC_SRC}/logic/*
+ ${MMC_SRC}/logic/auth/*
+ ${MMC_SRC}/logic/auth/flows/*
+ ${MMC_SRC}/logic/lists/*
+ ${MMC_SRC}/logic/net/*
+ ${MMC_SRC}/logic/tasks/*
+ ${MMC_SRC}/gui/*
+ ${MMC_SRC}/gui/dialogs/*
+ ${MMC_SRC}/gui/widgets/*
+ ${MMC_SRC}/depends/settings/include/*
+ ${MMC_SRC}/depends/settings/src/*
+ ${MMC_SRC}/depends/util/include/*
+ ${MMC_SRC}/depends/util/src/*
)
if(MultiMC_CODE_COVERAGE)
@@ -51,7 +51,7 @@ if(MultiMC_CODE_COVERAGE)
foreach(test ${MultiMC_TESTS})
add_custom_target(MultiMC_RUN_TEST_${test}
- COMMAND lcov -d ${CMAKE_CURRENT_BINARY_DIR} -z -q # clean test
+ COMMAND lcov -d ${CMAKE_CURRENT_BINARY_DIR} -z -q # clean test
&& lcov -d ${MMC_BIN} -z -q # clean common
&& lcov -d ${MMC_BIN}/depends/settings/CMakeFiles/libSettings.dir -z -q # clean settings
&& lcov -d ${MMC_BIN}/depends/utils/CMakeFiles/libUtil.dir -z -q # clean utils
@@ -64,23 +64,23 @@ if(MultiMC_CODE_COVERAGE)
-a coverage_${test}.info -a coverage_common.info -a coverage_settings.info -a coverage_utils.info
-o coverage_${test}-combined.info # combine test and common
&& lcov -q --checksum -b ${MMC_SRC} --list-full-path --extract coverage_${test}-combined.info ${COVERAGE_SOURCE_DIRS} -o coverage_${test}-stripped.info # strip
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- VERBATIM
- DEPENDS ${test}
- COMMENT "Running ${test}..."
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ VERBATIM
+ DEPENDS ${test}
+ COMMENT "Running ${test}..."
)
list(APPEND MultiMC_TEST_COVERAGE_FILES coverage_${test}-stripped.info)
list(APPEND MultiMC_RUN_TESTS MultiMC_RUN_TEST_${test})
endforeach(test)
add_custom_target(MultiMC_GENERATE_COVERAGE
- DEPENDS ${MultiMC_RUN_TESTS}
- COMMENT "Generating coverage files..."
+ DEPENDS ${MultiMC_RUN_TESTS}
+ COMMENT "Generating coverage files..."
)
add_custom_target(MultiMC_GENERATE_COVERAGE_HTML
- COMMAND genhtml -t "MultiMC 5 Test Coverage" --num-spaces 4 --demangle-cpp --legend -o ${MMC_SRC}/html/coverage ${MultiMC_TEST_COVERAGE_FILES}
- DEPENDS MultiMC_GENERATE_COVERAGE
- COMMENT "Generating test coverage html..."
+ COMMAND genhtml -t "MultiMC 5 Test Coverage" --num-spaces 4 --demangle-cpp --legend -o ${MMC_SRC}/html/coverage ${MultiMC_TEST_COVERAGE_FILES}
+ DEPENDS MultiMC_GENERATE_COVERAGE
+ COMMENT "Generating test coverage html..."
)
add_custom_target(MultiMC_RUN_TESTS DEPENDS MultiMC_GENERATE_COVERAGE_HTML)
endif(MultiMC_CODE_COVERAGE)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 09:24:40 +0000