Only use tabs for intendention
This commit is contained in:
Jan Dalheimer
parent
3cd2b898e5
commit
a00fb1e8da
647
CMakeLists.txt
647
CMakeLists.txt
@ -49,11 +49,11 @@ find_package(Qt5Concurrent REQUIRED)
|
|||||||
find_package(Qt5LinguistTools REQUIRED)
|
find_package(Qt5LinguistTools REQUIRED)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
${Qt5Core_INCLUDE_DIRS}
|
${Qt5Core_INCLUDE_DIRS}
|
||||||
${Qt5Widgets_INCLUDE_DIRS}
|
${Qt5Widgets_INCLUDE_DIRS}
|
||||||
${Qt5Concurrent_INCLUDE_DIRS}
|
${Qt5Concurrent_INCLUDE_DIRS}
|
||||||
${Qt5Network_INCLUDE_DIRS}
|
${Qt5Network_INCLUDE_DIRS}
|
||||||
${Qt5Test_INCLUDE_DIRS}
|
${Qt5Test_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
# The Qt5 cmake files don't provide its install paths, so ask qmake.
|
# The Qt5 cmake files don't provide its install paths, so ask qmake.
|
||||||
@ -243,323 +243,323 @@ add_subdirectory(mmc_updater)
|
|||||||
|
|
||||||
######## Sources and headers ########
|
######## Sources and headers ########
|
||||||
set(MULTIMC_SOURCES
|
set(MULTIMC_SOURCES
|
||||||
# Application base
|
# Application base
|
||||||
MultiMC.h
|
MultiMC.h
|
||||||
MultiMC.cpp
|
MultiMC.cpp
|
||||||
MMCError.h
|
MMCError.h
|
||||||
BuildConfig.h
|
BuildConfig.h
|
||||||
${PROJECT_BINARY_DIR}/BuildConfig.cpp
|
${PROJECT_BINARY_DIR}/BuildConfig.cpp
|
||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
logger/QsDebugOutput.cpp
|
logger/QsDebugOutput.cpp
|
||||||
logger/QsDebugOutput.h
|
logger/QsDebugOutput.h
|
||||||
logger/QsLog.cpp
|
logger/QsLog.cpp
|
||||||
logger/QsLog.h
|
logger/QsLog.h
|
||||||
logger/QsLogDest.cpp
|
logger/QsLogDest.cpp
|
||||||
logger/QsLogDest.h
|
logger/QsLogDest.h
|
||||||
|
|
||||||
# GUI - windows
|
# GUI - windows
|
||||||
gui/MainWindow.h
|
gui/MainWindow.h
|
||||||
gui/MainWindow.cpp
|
gui/MainWindow.cpp
|
||||||
gui/ConsoleWindow.h
|
gui/ConsoleWindow.h
|
||||||
gui/ConsoleWindow.cpp
|
gui/ConsoleWindow.cpp
|
||||||
|
|
||||||
# GUI - dialogs
|
# GUI - dialogs
|
||||||
gui/dialogs/SettingsDialog.h
|
gui/dialogs/SettingsDialog.h
|
||||||
gui/dialogs/SettingsDialog.cpp
|
gui/dialogs/SettingsDialog.cpp
|
||||||
gui/dialogs/CopyInstanceDialog.h
|
gui/dialogs/CopyInstanceDialog.h
|
||||||
gui/dialogs/CopyInstanceDialog.cpp
|
gui/dialogs/CopyInstanceDialog.cpp
|
||||||
gui/dialogs/NewInstanceDialog.cpp
|
gui/dialogs/NewInstanceDialog.cpp
|
||||||
gui/dialogs/ProgressDialog.h
|
gui/dialogs/ProgressDialog.h
|
||||||
gui/dialogs/ProgressDialog.cpp
|
gui/dialogs/ProgressDialog.cpp
|
||||||
gui/dialogs/AboutDialog.h
|
gui/dialogs/AboutDialog.h
|
||||||
gui/dialogs/AboutDialog.cpp
|
gui/dialogs/AboutDialog.cpp
|
||||||
gui/dialogs/VersionSelectDialog.h
|
gui/dialogs/VersionSelectDialog.h
|
||||||
gui/dialogs/VersionSelectDialog.cpp
|
gui/dialogs/VersionSelectDialog.cpp
|
||||||
gui/dialogs/LwjglSelectDialog.h
|
gui/dialogs/LwjglSelectDialog.h
|
||||||
gui/dialogs/LwjglSelectDialog.cpp
|
gui/dialogs/LwjglSelectDialog.cpp
|
||||||
gui/dialogs/InstanceSettings.h
|
gui/dialogs/InstanceSettings.h
|
||||||
gui/dialogs/InstanceSettings.cpp
|
gui/dialogs/InstanceSettings.cpp
|
||||||
gui/dialogs/IconPickerDialog.h
|
gui/dialogs/IconPickerDialog.h
|
||||||
gui/dialogs/IconPickerDialog.cpp
|
gui/dialogs/IconPickerDialog.cpp
|
||||||
gui/dialogs/LegacyModEditDialog.h
|
gui/dialogs/LegacyModEditDialog.h
|
||||||
gui/dialogs/LegacyModEditDialog.cpp
|
gui/dialogs/LegacyModEditDialog.cpp
|
||||||
gui/dialogs/OneSixModEditDialog.h
|
gui/dialogs/OneSixModEditDialog.h
|
||||||
gui/dialogs/OneSixModEditDialog.cpp
|
gui/dialogs/OneSixModEditDialog.cpp
|
||||||
gui/dialogs/ModEditDialogCommon.h
|
gui/dialogs/ModEditDialogCommon.h
|
||||||
gui/dialogs/ModEditDialogCommon.cpp
|
gui/dialogs/ModEditDialogCommon.cpp
|
||||||
gui/dialogs/EditNotesDialog.h
|
gui/dialogs/EditNotesDialog.h
|
||||||
gui/dialogs/EditNotesDialog.cpp
|
gui/dialogs/EditNotesDialog.cpp
|
||||||
gui/dialogs/CustomMessageBox.h
|
gui/dialogs/CustomMessageBox.h
|
||||||
gui/dialogs/CustomMessageBox.cpp
|
gui/dialogs/CustomMessageBox.cpp
|
||||||
gui/dialogs/EditAccountDialog.h
|
gui/dialogs/EditAccountDialog.h
|
||||||
gui/dialogs/EditAccountDialog.cpp
|
gui/dialogs/EditAccountDialog.cpp
|
||||||
gui/dialogs/AccountListDialog.h
|
gui/dialogs/AccountListDialog.h
|
||||||
gui/dialogs/AccountListDialog.cpp
|
gui/dialogs/AccountListDialog.cpp
|
||||||
gui/dialogs/AccountSelectDialog.h
|
gui/dialogs/AccountSelectDialog.h
|
||||||
gui/dialogs/AccountSelectDialog.cpp
|
gui/dialogs/AccountSelectDialog.cpp
|
||||||
gui/dialogs/UpdateDialog.h
|
gui/dialogs/UpdateDialog.h
|
||||||
gui/dialogs/UpdateDialog.cpp
|
gui/dialogs/UpdateDialog.cpp
|
||||||
gui/dialogs/ScreenshotDialog.h
|
gui/dialogs/ScreenshotDialog.h
|
||||||
gui/dialogs/ScreenshotDialog.cpp
|
gui/dialogs/ScreenshotDialog.cpp
|
||||||
gui/dialogs/NotificationDialog.h
|
gui/dialogs/NotificationDialog.h
|
||||||
gui/dialogs/NotificationDialog.cpp
|
gui/dialogs/NotificationDialog.cpp
|
||||||
|
|
||||||
# GUI - widgets
|
# GUI - widgets
|
||||||
gui/widgets/Common.h
|
gui/widgets/Common.h
|
||||||
gui/widgets/Common.cpp
|
gui/widgets/Common.cpp
|
||||||
gui/widgets/ModListView.h
|
gui/widgets/ModListView.h
|
||||||
gui/widgets/ModListView.cpp
|
gui/widgets/ModListView.cpp
|
||||||
gui/widgets/VersionListView.h
|
gui/widgets/VersionListView.h
|
||||||
gui/widgets/VersionListView.cpp
|
gui/widgets/VersionListView.cpp
|
||||||
gui/widgets/LabeledToolButton.h
|
gui/widgets/LabeledToolButton.h
|
||||||
gui/widgets/LabeledToolButton.cpp
|
gui/widgets/LabeledToolButton.cpp
|
||||||
gui/widgets/MCModInfoFrame.h
|
gui/widgets/MCModInfoFrame.h
|
||||||
gui/widgets/MCModInfoFrame.cpp
|
gui/widgets/MCModInfoFrame.cpp
|
||||||
|
|
||||||
# GUI - instance group view
|
# GUI - instance group view
|
||||||
gui/groupview/Group.cpp
|
gui/groupview/Group.cpp
|
||||||
gui/groupview/Group.h
|
gui/groupview/Group.h
|
||||||
gui/groupview/GroupedProxyModel.cpp
|
gui/groupview/GroupedProxyModel.cpp
|
||||||
gui/groupview/GroupedProxyModel.h
|
gui/groupview/GroupedProxyModel.h
|
||||||
gui/groupview/GroupView.cpp
|
gui/groupview/GroupView.cpp
|
||||||
gui/groupview/GroupView.h
|
gui/groupview/GroupView.h
|
||||||
gui/groupview/InstanceDelegate.cpp
|
gui/groupview/InstanceDelegate.cpp
|
||||||
gui/groupview/InstanceDelegate.h
|
gui/groupview/InstanceDelegate.h
|
||||||
|
|
||||||
# Base classes and infrastructure
|
# Base classes and infrastructure
|
||||||
logic/BaseVersion.h
|
logic/BaseVersion.h
|
||||||
logic/MinecraftVersion.h
|
logic/MinecraftVersion.h
|
||||||
logic/InstanceFactory.h
|
logic/InstanceFactory.h
|
||||||
logic/InstanceFactory.cpp
|
logic/InstanceFactory.cpp
|
||||||
logic/BaseInstance.h
|
logic/BaseInstance.h
|
||||||
logic/BaseInstance.cpp
|
logic/BaseInstance.cpp
|
||||||
logic/BaseInstance_p.h
|
logic/BaseInstance_p.h
|
||||||
|
|
||||||
logic/MinecraftProcess.h
|
logic/MinecraftProcess.h
|
||||||
logic/MinecraftProcess.cpp
|
logic/MinecraftProcess.cpp
|
||||||
logic/Mod.h
|
logic/Mod.h
|
||||||
logic/Mod.cpp
|
logic/Mod.cpp
|
||||||
logic/ModList.h
|
logic/ModList.h
|
||||||
logic/ModList.cpp
|
logic/ModList.cpp
|
||||||
|
|
||||||
# Basic instance launcher for starting from terminal
|
# Basic instance launcher for starting from terminal
|
||||||
logic/InstanceLauncher.h
|
logic/InstanceLauncher.h
|
||||||
logic/InstanceLauncher.cpp
|
logic/InstanceLauncher.cpp
|
||||||
|
|
||||||
# JSON parsing helpers
|
# JSON parsing helpers
|
||||||
logic/MMCJson.h
|
logic/MMCJson.h
|
||||||
logic/MMCJson.cpp
|
logic/MMCJson.cpp
|
||||||
|
|
||||||
# network stuffs
|
# network stuffs
|
||||||
logic/net/NetAction.h
|
logic/net/NetAction.h
|
||||||
logic/net/MD5EtagDownload.h
|
logic/net/MD5EtagDownload.h
|
||||||
logic/net/MD5EtagDownload.cpp
|
logic/net/MD5EtagDownload.cpp
|
||||||
logic/net/ByteArrayDownload.h
|
logic/net/ByteArrayDownload.h
|
||||||
logic/net/ByteArrayDownload.cpp
|
logic/net/ByteArrayDownload.cpp
|
||||||
logic/net/CacheDownload.h
|
logic/net/CacheDownload.h
|
||||||
logic/net/CacheDownload.cpp
|
logic/net/CacheDownload.cpp
|
||||||
logic/net/ForgeMirrors.h
|
logic/net/ForgeMirrors.h
|
||||||
logic/net/ForgeMirrors.cpp
|
logic/net/ForgeMirrors.cpp
|
||||||
logic/net/ForgeXzDownload.h
|
logic/net/ForgeXzDownload.h
|
||||||
logic/net/ForgeXzDownload.cpp
|
logic/net/ForgeXzDownload.cpp
|
||||||
logic/net/NetJob.h
|
logic/net/NetJob.h
|
||||||
logic/net/NetJob.cpp
|
logic/net/NetJob.cpp
|
||||||
logic/net/HttpMetaCache.h
|
logic/net/HttpMetaCache.h
|
||||||
logic/net/HttpMetaCache.cpp
|
logic/net/HttpMetaCache.cpp
|
||||||
logic/net/PasteUpload.h
|
logic/net/PasteUpload.h
|
||||||
logic/net/PasteUpload.cpp
|
logic/net/PasteUpload.cpp
|
||||||
logic/net/URLConstants.h
|
logic/net/URLConstants.h
|
||||||
logic/net/URLConstants.cpp
|
logic/net/URLConstants.cpp
|
||||||
|
|
||||||
# Yggdrasil login stuff
|
# Yggdrasil login stuff
|
||||||
logic/auth/AuthSession.h
|
logic/auth/AuthSession.h
|
||||||
logic/auth/AuthSession.cpp
|
logic/auth/AuthSession.cpp
|
||||||
logic/auth/MojangAccountList.h
|
logic/auth/MojangAccountList.h
|
||||||
logic/auth/MojangAccountList.cpp
|
logic/auth/MojangAccountList.cpp
|
||||||
logic/auth/MojangAccount.h
|
logic/auth/MojangAccount.h
|
||||||
logic/auth/MojangAccount.cpp
|
logic/auth/MojangAccount.cpp
|
||||||
logic/auth/YggdrasilTask.h
|
logic/auth/YggdrasilTask.h
|
||||||
logic/auth/YggdrasilTask.cpp
|
logic/auth/YggdrasilTask.cpp
|
||||||
logic/auth/flows/AuthenticateTask.h
|
logic/auth/flows/AuthenticateTask.h
|
||||||
logic/auth/flows/AuthenticateTask.cpp
|
logic/auth/flows/AuthenticateTask.cpp
|
||||||
logic/auth/flows/RefreshTask.cpp
|
logic/auth/flows/RefreshTask.cpp
|
||||||
logic/auth/flows/RefreshTask.cpp
|
logic/auth/flows/RefreshTask.cpp
|
||||||
logic/auth/flows/ValidateTask.h
|
logic/auth/flows/ValidateTask.h
|
||||||
logic/auth/flows/ValidateTask.cpp
|
logic/auth/flows/ValidateTask.cpp
|
||||||
|
|
||||||
# Update system
|
# Update system
|
||||||
logic/updater/UpdateChecker.h
|
logic/updater/UpdateChecker.h
|
||||||
logic/updater/UpdateChecker.cpp
|
logic/updater/UpdateChecker.cpp
|
||||||
logic/updater/DownloadUpdateTask.h
|
logic/updater/DownloadUpdateTask.h
|
||||||
logic/updater/DownloadUpdateTask.cpp
|
logic/updater/DownloadUpdateTask.cpp
|
||||||
logic/updater/NotificationChecker.h
|
logic/updater/NotificationChecker.h
|
||||||
logic/updater/NotificationChecker.cpp
|
logic/updater/NotificationChecker.cpp
|
||||||
|
|
||||||
# News System
|
# News System
|
||||||
logic/news/NewsChecker.h
|
logic/news/NewsChecker.h
|
||||||
logic/news/NewsChecker.cpp
|
logic/news/NewsChecker.cpp
|
||||||
logic/news/NewsEntry.h
|
logic/news/NewsEntry.h
|
||||||
logic/news/NewsEntry.cpp
|
logic/news/NewsEntry.cpp
|
||||||
|
|
||||||
# Status system
|
# Status system
|
||||||
logic/status/StatusChecker.h
|
logic/status/StatusChecker.h
|
||||||
logic/status/StatusChecker.cpp
|
logic/status/StatusChecker.cpp
|
||||||
|
|
||||||
# legacy instances
|
# legacy instances
|
||||||
logic/LegacyInstance.h
|
logic/LegacyInstance.h
|
||||||
logic/LegacyInstance.cpp
|
logic/LegacyInstance.cpp
|
||||||
logic/LegacyInstance_p.h
|
logic/LegacyInstance_p.h
|
||||||
logic/LegacyUpdate.h
|
logic/LegacyUpdate.h
|
||||||
logic/LegacyUpdate.cpp
|
logic/LegacyUpdate.cpp
|
||||||
|
|
||||||
logic/LegacyForge.h
|
logic/LegacyForge.h
|
||||||
logic/LegacyForge.cpp
|
logic/LegacyForge.cpp
|
||||||
|
|
||||||
# OneSix instances
|
# OneSix instances
|
||||||
logic/OneSixUpdate.h
|
logic/OneSixUpdate.h
|
||||||
logic/OneSixUpdate.cpp
|
logic/OneSixUpdate.cpp
|
||||||
logic/OneSixInstance.h
|
logic/OneSixInstance.h
|
||||||
logic/OneSixInstance.cpp
|
logic/OneSixInstance.cpp
|
||||||
logic/OneSixInstance_p.h
|
logic/OneSixInstance_p.h
|
||||||
|
|
||||||
# OneSix version json infrastructure
|
# OneSix version json infrastructure
|
||||||
logic/OneSixVersionBuilder.h
|
logic/OneSixVersionBuilder.h
|
||||||
logic/OneSixVersionBuilder.cpp
|
logic/OneSixVersionBuilder.cpp
|
||||||
logic/VersionFile.h
|
logic/VersionFile.h
|
||||||
logic/VersionFile.cpp
|
logic/VersionFile.cpp
|
||||||
logic/VersionFinal.h
|
logic/VersionFinal.h
|
||||||
logic/VersionFinal.cpp
|
logic/VersionFinal.cpp
|
||||||
logic/OneSixLibrary.h
|
logic/OneSixLibrary.h
|
||||||
logic/OneSixLibrary.cpp
|
logic/OneSixLibrary.cpp
|
||||||
logic/OneSixRule.h
|
logic/OneSixRule.h
|
||||||
logic/OneSixRule.cpp
|
logic/OneSixRule.cpp
|
||||||
logic/OpSys.h
|
logic/OpSys.h
|
||||||
logic/OpSys.cpp
|
logic/OpSys.cpp
|
||||||
|
|
||||||
# Mod installers
|
# Mod installers
|
||||||
logic/BaseInstaller.h
|
logic/BaseInstaller.h
|
||||||
logic/BaseInstaller.cpp
|
logic/BaseInstaller.cpp
|
||||||
logic/ForgeInstaller.h
|
logic/ForgeInstaller.h
|
||||||
logic/ForgeInstaller.cpp
|
logic/ForgeInstaller.cpp
|
||||||
logic/LiteLoaderInstaller.h
|
logic/LiteLoaderInstaller.h
|
||||||
logic/LiteLoaderInstaller.cpp
|
logic/LiteLoaderInstaller.cpp
|
||||||
|
|
||||||
# Nostalgia
|
# Nostalgia
|
||||||
logic/NostalgiaInstance.h
|
logic/NostalgiaInstance.h
|
||||||
logic/NostalgiaInstance.cpp
|
logic/NostalgiaInstance.cpp
|
||||||
|
|
||||||
# FTB
|
# FTB
|
||||||
logic/OneSixFTBInstance.h
|
logic/OneSixFTBInstance.h
|
||||||
logic/OneSixFTBInstance.cpp
|
logic/OneSixFTBInstance.cpp
|
||||||
logic/LegacyFTBInstance.h
|
logic/LegacyFTBInstance.h
|
||||||
logic/LegacyFTBInstance.cpp
|
logic/LegacyFTBInstance.cpp
|
||||||
|
|
||||||
# Lists
|
# Lists
|
||||||
logic/lists/InstanceList.h
|
logic/lists/InstanceList.h
|
||||||
logic/lists/InstanceList.cpp
|
logic/lists/InstanceList.cpp
|
||||||
logic/lists/BaseVersionList.h
|
logic/lists/BaseVersionList.h
|
||||||
logic/lists/BaseVersionList.cpp
|
logic/lists/BaseVersionList.cpp
|
||||||
logic/lists/MinecraftVersionList.h
|
logic/lists/MinecraftVersionList.h
|
||||||
logic/lists/MinecraftVersionList.cpp
|
logic/lists/MinecraftVersionList.cpp
|
||||||
logic/lists/LwjglVersionList.h
|
logic/lists/LwjglVersionList.h
|
||||||
logic/lists/LwjglVersionList.cpp
|
logic/lists/LwjglVersionList.cpp
|
||||||
logic/lists/ForgeVersionList.h
|
logic/lists/ForgeVersionList.h
|
||||||
logic/lists/ForgeVersionList.cpp
|
logic/lists/ForgeVersionList.cpp
|
||||||
logic/lists/JavaVersionList.h
|
logic/lists/JavaVersionList.h
|
||||||
logic/lists/JavaVersionList.cpp
|
logic/lists/JavaVersionList.cpp
|
||||||
logic/lists/LiteLoaderVersionList.h
|
logic/lists/LiteLoaderVersionList.h
|
||||||
logic/lists/LiteLoaderVersionList.cpp
|
logic/lists/LiteLoaderVersionList.cpp
|
||||||
|
|
||||||
# the screenshots feature
|
# the screenshots feature
|
||||||
logic/screenshots/Screenshot.h
|
logic/screenshots/Screenshot.h
|
||||||
logic/screenshots/Screenshot.cpp
|
logic/screenshots/Screenshot.cpp
|
||||||
logic/screenshots/ScreenshotList.h
|
logic/screenshots/ScreenshotList.h
|
||||||
logic/screenshots/ScreenshotList.cpp
|
logic/screenshots/ScreenshotList.cpp
|
||||||
logic/screenshots/ImgurUpload.h
|
logic/screenshots/ImgurUpload.h
|
||||||
logic/screenshots/ImgurUpload.cpp
|
logic/screenshots/ImgurUpload.cpp
|
||||||
logic/screenshots/ImgurAlbumCreation.h
|
logic/screenshots/ImgurAlbumCreation.h
|
||||||
logic/screenshots/ImgurAlbumCreation.cpp
|
logic/screenshots/ImgurAlbumCreation.cpp
|
||||||
|
|
||||||
# Icons
|
# Icons
|
||||||
logic/icons/MMCIcon.h
|
logic/icons/MMCIcon.h
|
||||||
logic/icons/MMCIcon.cpp
|
logic/icons/MMCIcon.cpp
|
||||||
logic/icons/IconList.h
|
logic/icons/IconList.h
|
||||||
logic/icons/IconList.cpp
|
logic/icons/IconList.cpp
|
||||||
|
|
||||||
# misc model/view
|
# misc model/view
|
||||||
logic/EnabledItemFilter.h
|
logic/EnabledItemFilter.h
|
||||||
logic/EnabledItemFilter.cpp
|
logic/EnabledItemFilter.cpp
|
||||||
|
|
||||||
# Tasks
|
# Tasks
|
||||||
logic/tasks/ProgressProvider.h
|
logic/tasks/ProgressProvider.h
|
||||||
logic/tasks/Task.h
|
logic/tasks/Task.h
|
||||||
logic/tasks/Task.cpp
|
logic/tasks/Task.cpp
|
||||||
logic/tasks/ThreadTask.h
|
logic/tasks/ThreadTask.h
|
||||||
logic/tasks/ThreadTask.cpp
|
logic/tasks/ThreadTask.cpp
|
||||||
logic/tasks/SequentialTask.h
|
logic/tasks/SequentialTask.h
|
||||||
logic/tasks/SequentialTask.cpp
|
logic/tasks/SequentialTask.cpp
|
||||||
|
|
||||||
# Utilities
|
# Utilities
|
||||||
logic/JavaChecker.h
|
logic/JavaChecker.h
|
||||||
logic/JavaChecker.cpp
|
logic/JavaChecker.cpp
|
||||||
logic/JavaUtils.h
|
logic/JavaUtils.h
|
||||||
logic/JavaUtils.cpp
|
logic/JavaUtils.cpp
|
||||||
logic/NagUtils.h
|
logic/NagUtils.h
|
||||||
logic/NagUtils.cpp
|
logic/NagUtils.cpp
|
||||||
logic/SkinUtils.h
|
logic/SkinUtils.h
|
||||||
logic/SkinUtils.cpp
|
logic/SkinUtils.cpp
|
||||||
logic/JavaCheckerJob.h
|
logic/JavaCheckerJob.h
|
||||||
logic/JavaCheckerJob.cpp
|
logic/JavaCheckerJob.cpp
|
||||||
|
|
||||||
# Assets
|
# Assets
|
||||||
logic/assets/AssetsMigrateTask.h
|
logic/assets/AssetsMigrateTask.h
|
||||||
logic/assets/AssetsMigrateTask.cpp
|
logic/assets/AssetsMigrateTask.cpp
|
||||||
logic/assets/AssetsUtils.h
|
logic/assets/AssetsUtils.h
|
||||||
logic/assets/AssetsUtils.cpp
|
logic/assets/AssetsUtils.cpp
|
||||||
|
|
||||||
# Tools
|
# Tools
|
||||||
logic/tools/BaseExternalTool.h
|
logic/tools/BaseExternalTool.h
|
||||||
logic/tools/BaseExternalTool.cpp
|
logic/tools/BaseExternalTool.cpp
|
||||||
logic/tools/MCEditTool.h
|
logic/tools/MCEditTool.h
|
||||||
logic/tools/MCEditTool.cpp
|
logic/tools/MCEditTool.cpp
|
||||||
logic/tools/BaseProfiler.h
|
logic/tools/BaseProfiler.h
|
||||||
logic/tools/BaseProfiler.cpp
|
logic/tools/BaseProfiler.cpp
|
||||||
logic/tools/JProfiler.h
|
logic/tools/JProfiler.h
|
||||||
logic/tools/JProfiler.cpp
|
logic/tools/JProfiler.cpp
|
||||||
logic/tools/JVisualVM.h
|
logic/tools/JVisualVM.h
|
||||||
logic/tools/JVisualVM.cpp
|
logic/tools/JVisualVM.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
######## UIs ########
|
######## UIs ########
|
||||||
set(MULTIMC_UIS
|
set(MULTIMC_UIS
|
||||||
# Windows
|
# Windows
|
||||||
gui/MainWindow.ui
|
gui/MainWindow.ui
|
||||||
gui/ConsoleWindow.ui
|
gui/ConsoleWindow.ui
|
||||||
|
|
||||||
# Dialogs
|
# Dialogs
|
||||||
gui/dialogs/SettingsDialog.ui
|
gui/dialogs/SettingsDialog.ui
|
||||||
gui/dialogs/CopyInstanceDialog.ui
|
gui/dialogs/CopyInstanceDialog.ui
|
||||||
gui/dialogs/NewInstanceDialog.ui
|
gui/dialogs/NewInstanceDialog.ui
|
||||||
gui/dialogs/AboutDialog.ui
|
gui/dialogs/AboutDialog.ui
|
||||||
gui/dialogs/VersionSelectDialog.ui
|
gui/dialogs/VersionSelectDialog.ui
|
||||||
gui/dialogs/LwjglSelectDialog.ui
|
gui/dialogs/LwjglSelectDialog.ui
|
||||||
gui/dialogs/InstanceSettings.ui
|
gui/dialogs/InstanceSettings.ui
|
||||||
gui/dialogs/ProgressDialog.ui
|
gui/dialogs/ProgressDialog.ui
|
||||||
gui/dialogs/IconPickerDialog.ui
|
gui/dialogs/IconPickerDialog.ui
|
||||||
gui/dialogs/LegacyModEditDialog.ui
|
gui/dialogs/LegacyModEditDialog.ui
|
||||||
gui/dialogs/OneSixModEditDialog.ui
|
gui/dialogs/OneSixModEditDialog.ui
|
||||||
gui/dialogs/EditNotesDialog.ui
|
gui/dialogs/EditNotesDialog.ui
|
||||||
gui/dialogs/AccountListDialog.ui
|
gui/dialogs/AccountListDialog.ui
|
||||||
gui/dialogs/AccountSelectDialog.ui
|
gui/dialogs/AccountSelectDialog.ui
|
||||||
gui/dialogs/EditAccountDialog.ui
|
gui/dialogs/EditAccountDialog.ui
|
||||||
gui/dialogs/UpdateDialog.ui
|
gui/dialogs/UpdateDialog.ui
|
||||||
gui/dialogs/ScreenshotDialog.ui
|
gui/dialogs/ScreenshotDialog.ui
|
||||||
gui/dialogs/NotificationDialog.ui
|
gui/dialogs/NotificationDialog.ui
|
||||||
|
|
||||||
# Widgets/other
|
# Widgets/other
|
||||||
gui/widgets/MCModInfoFrame.ui
|
gui/widgets/MCModInfoFrame.ui
|
||||||
)
|
)
|
||||||
|
|
||||||
set(FILES_TO_TRANSLATE)
|
set(FILES_TO_TRANSLATE)
|
||||||
@ -574,9 +574,9 @@ foreach(file ${MULTIMC_UIS})
|
|||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
set(MULTIMC_QRCS
|
set(MULTIMC_QRCS
|
||||||
resources/backgrounds/backgrounds.qrc
|
resources/backgrounds/backgrounds.qrc
|
||||||
resources/multimc/multimc.qrc
|
resources/multimc/multimc.qrc
|
||||||
resources/instances/instances.qrc
|
resources/instances/instances.qrc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -629,22 +629,22 @@ qt5_use_modules(MultiMC_common Core Widgets Network Xml Concurrent ${MultiMC_QT_
|
|||||||
#### Executable ####
|
#### Executable ####
|
||||||
if(APPLE AND UNIX) ## OSX
|
if(APPLE AND UNIX) ## OSX
|
||||||
install(TARGETS MultiMC
|
install(TARGETS MultiMC
|
||||||
BUNDLE DESTINATION . COMPONENT Runtime
|
BUNDLE DESTINATION . COMPONENT Runtime
|
||||||
RUNTIME DESTINATION MultiMC.app/Contents/MacOS COMPONENT Runtime
|
RUNTIME DESTINATION MultiMC.app/Contents/MacOS COMPONENT Runtime
|
||||||
)
|
)
|
||||||
|
|
||||||
elseif(UNIX) ## LINUX and similar
|
elseif(UNIX) ## LINUX and similar
|
||||||
install(TARGETS MultiMC
|
install(TARGETS MultiMC
|
||||||
BUNDLE DESTINATION . COMPONENT Runtime
|
BUNDLE DESTINATION . COMPONENT Runtime
|
||||||
RUNTIME DESTINATION bin COMPONENT Runtime
|
RUNTIME DESTINATION bin COMPONENT Runtime
|
||||||
)
|
)
|
||||||
install(PROGRAMS package/linux/MultiMC DESTINATION .)
|
install(PROGRAMS package/linux/MultiMC DESTINATION .)
|
||||||
|
|
||||||
elseif(WIN32) ## WINDOWS
|
elseif(WIN32) ## WINDOWS
|
||||||
install(TARGETS MultiMC
|
install(TARGETS MultiMC
|
||||||
BUNDLE DESTINATION . COMPONENT Runtime
|
BUNDLE DESTINATION . COMPONENT Runtime
|
||||||
LIBRARY DESTINATION . COMPONENT Runtime
|
LIBRARY DESTINATION . COMPONENT Runtime
|
||||||
RUNTIME DESTINATION . COMPONENT Runtime
|
RUNTIME DESTINATION . COMPONENT Runtime
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -653,48 +653,48 @@ endif()
|
|||||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
|
||||||
# Image formats
|
# Image formats
|
||||||
install(
|
install(
|
||||||
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
|
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
|
||||||
DESTINATION ${PLUGIN_DEST_DIR}
|
DESTINATION ${PLUGIN_DEST_DIR}
|
||||||
COMPONENT Runtime
|
COMPONENT Runtime
|
||||||
REGEX "tga|svg|tiff|mng" EXCLUDE
|
REGEX "tga|svg|tiff|mng" EXCLUDE
|
||||||
)
|
)
|
||||||
|
|
||||||
# Platform plugins
|
# Platform plugins
|
||||||
install(
|
install(
|
||||||
DIRECTORY "${QT_PLUGINS_DIR}/platforms"
|
DIRECTORY "${QT_PLUGINS_DIR}/platforms"
|
||||||
DESTINATION ${PLUGIN_DEST_DIR}
|
DESTINATION ${PLUGIN_DEST_DIR}
|
||||||
COMPONENT Runtime
|
COMPONENT Runtime
|
||||||
REGEX "minimal|linuxfb|offscreen" EXCLUDE
|
REGEX "minimal|linuxfb|offscreen" EXCLUDE
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
# Image formats
|
# Image formats
|
||||||
install(
|
install(
|
||||||
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
|
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
|
||||||
DESTINATION ${PLUGIN_DEST_DIR}
|
DESTINATION ${PLUGIN_DEST_DIR}
|
||||||
COMPONENT Runtime
|
COMPONENT Runtime
|
||||||
REGEX "tga|svg|tiff|mng" EXCLUDE
|
REGEX "tga|svg|tiff|mng" EXCLUDE
|
||||||
REGEX "d\\." EXCLUDE
|
REGEX "d\\." EXCLUDE
|
||||||
REGEX "_debug\\." EXCLUDE
|
REGEX "_debug\\." EXCLUDE
|
||||||
)
|
)
|
||||||
|
|
||||||
# Platform plugins
|
# Platform plugins
|
||||||
install(
|
install(
|
||||||
DIRECTORY "${QT_PLUGINS_DIR}/platforms"
|
DIRECTORY "${QT_PLUGINS_DIR}/platforms"
|
||||||
DESTINATION ${PLUGIN_DEST_DIR}
|
DESTINATION ${PLUGIN_DEST_DIR}
|
||||||
COMPONENT Runtime
|
COMPONENT Runtime
|
||||||
REGEX "minimal|linuxfb|offscreen" EXCLUDE
|
REGEX "minimal|linuxfb|offscreen" EXCLUDE
|
||||||
REGEX "d\\." EXCLUDE
|
REGEX "d\\." EXCLUDE
|
||||||
REGEX "_debug\\." EXCLUDE
|
REGEX "_debug\\." EXCLUDE
|
||||||
)
|
)
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
# Accessible plugin to make buttons look decent on osx
|
# Accessible plugin to make buttons look decent on osx
|
||||||
install(
|
install(
|
||||||
DIRECTORY "${QT_PLUGINS_DIR}/accessible"
|
DIRECTORY "${QT_PLUGINS_DIR}/accessible"
|
||||||
DESTINATION ${PLUGIN_DEST_DIR}
|
DESTINATION ${PLUGIN_DEST_DIR}
|
||||||
COMPONENT Runtime
|
COMPONENT Runtime
|
||||||
REGEX "quick" EXCLUDE
|
REGEX "quick" EXCLUDE
|
||||||
REGEX "d\\." EXCLUDE
|
REGEX "d\\." EXCLUDE
|
||||||
REGEX "_debug\\." EXCLUDE
|
REGEX "_debug\\." EXCLUDE
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
@ -715,7 +715,8 @@ endif()
|
|||||||
configure_file(
|
configure_file(
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
|
"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
|
||||||
@ONLY)
|
@ONLY
|
||||||
|
)
|
||||||
install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
|
install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -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 "")
|
if(NOT CURL_EXECUTABLE STREQUAL "" AND NOT MultiMC_COVERITY_TOKEN STREQUAL "" AND NOT MultiMC_COVERITY_EMAIL STREQUAL "")
|
||||||
add_custom_target(coverity_configure
|
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
|
add_custom_target(coverity_create_tarball
|
||||||
COMMAND ${CMAKE_COMMAND} -E echo "Cleaning..." && ${CMAKE_MAKE_PROGRAM} clean
|
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 "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/
|
COMMAND ${CMAKE_COMMAND} -E echo "Creating tarball..." && ${CMAKE_COMMAND} -E tar cfz multimc_coverity.tgz cov-int/
|
||||||
COMMENT "Creating coverity build..."
|
COMMENT "Creating coverity build..."
|
||||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||||
)
|
)
|
||||||
add_custom_target(coverity_upload
|
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
|
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
|
DEPENDS coverity_create_tarball
|
||||||
COMMENT "Uploading to coverity..."
|
COMMENT "Uploading to coverity..."
|
||||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@ -14,10 +14,10 @@ if(GIT_FOUND)
|
|||||||
cmake_parse_arguments(GIT_RUN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
cmake_parse_arguments(GIT_RUN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||||
|
|
||||||
execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_RUN_COMMAND}
|
execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_RUN_COMMAND}
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
RESULT_VARIABLE GIT_RESULTVAR
|
RESULT_VARIABLE GIT_RESULTVAR
|
||||||
OUTPUT_VARIABLE GIT_OUTVAR
|
OUTPUT_VARIABLE GIT_OUTVAR
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
)
|
)
|
||||||
|
|
||||||
if(GIT_RESULTVAR EQUAL 0)
|
if(GIT_RESULTVAR EQUAL 0)
|
||||||
|
|||||||
@ -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(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
JavaCheck.java
|
JavaCheck.java
|
||||||
)
|
)
|
||||||
|
|
||||||
add_jar(JavaCheck ${SRC})
|
add_jar(JavaCheck ${SRC})
|
||||||
|
|||||||
@ -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(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
# OSX things
|
# OSX things
|
||||||
org/simplericity/macify/eawt/Application.java
|
org/simplericity/macify/eawt/Application.java
|
||||||
org/simplericity/macify/eawt/ApplicationAdapter.java
|
org/simplericity/macify/eawt/ApplicationAdapter.java
|
||||||
org/simplericity/macify/eawt/ApplicationEvent.java
|
org/simplericity/macify/eawt/ApplicationEvent.java
|
||||||
org/simplericity/macify/eawt/ApplicationListener.java
|
org/simplericity/macify/eawt/ApplicationListener.java
|
||||||
org/simplericity/macify/eawt/DefaultApplication.java
|
org/simplericity/macify/eawt/DefaultApplication.java
|
||||||
|
|
||||||
# legacy applet wrapper thing.
|
# legacy applet wrapper thing.
|
||||||
# The launcher has to be there for silly FML/Forge relauncher.
|
# The launcher has to be there for silly FML/Forge relauncher.
|
||||||
net/minecraft/Launcher.java
|
net/minecraft/Launcher.java
|
||||||
org/multimc/legacy/LegacyLauncher.java
|
org/multimc/legacy/LegacyLauncher.java
|
||||||
org/multimc/legacy/LegacyFrame.java
|
org/multimc/legacy/LegacyFrame.java
|
||||||
|
|
||||||
# onesix launcher
|
# onesix launcher
|
||||||
org/multimc/onesix/OneSixLauncher.java
|
org/multimc/onesix/OneSixLauncher.java
|
||||||
|
|
||||||
# generic launcher
|
# generic launcher
|
||||||
org/multimc/EntryPoint.java
|
org/multimc/EntryPoint.java
|
||||||
org/multimc/Launcher.java
|
org/multimc/Launcher.java
|
||||||
org/multimc/ParseException.java
|
org/multimc/ParseException.java
|
||||||
org/multimc/Utils.java
|
org/multimc/Utils.java
|
||||||
org/multimc/IconLoader.java
|
org/multimc/IconLoader.java
|
||||||
)
|
)
|
||||||
add_jar(NewLaunch ${SRC})
|
add_jar(NewLaunch ${SRC})
|
||||||
|
|
||||||
|
|||||||
@ -21,22 +21,22 @@ else(UNIX)
|
|||||||
endif(UNIX)
|
endif(UNIX)
|
||||||
|
|
||||||
set(PACK200_SRC
|
set(PACK200_SRC
|
||||||
include/unpack200.h
|
include/unpack200.h
|
||||||
src/bands.cpp
|
src/bands.cpp
|
||||||
src/bands.h
|
src/bands.h
|
||||||
src/bytes.cpp
|
src/bytes.cpp
|
||||||
src/bytes.h
|
src/bytes.h
|
||||||
src/coding.cpp
|
src/coding.cpp
|
||||||
src/coding.h
|
src/coding.h
|
||||||
src/constants.h
|
src/constants.h
|
||||||
src/defines.h
|
src/defines.h
|
||||||
src/unpack200.cpp
|
src/unpack200.cpp
|
||||||
src/unpack.cpp
|
src/unpack.cpp
|
||||||
src/unpack.h
|
src/unpack.h
|
||||||
src/utils.cpp
|
src/utils.cpp
|
||||||
src/utils.h
|
src/utils.h
|
||||||
src/zip.cpp
|
src/zip.cpp
|
||||||
src/zip.h
|
src/zip.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|||||||
@ -10,20 +10,20 @@ include(UseCXX11)
|
|||||||
include(Coverage)
|
include(Coverage)
|
||||||
|
|
||||||
set(LIBSETTINGS_SOURCES
|
set(LIBSETTINGS_SOURCES
|
||||||
libsettings_config.h
|
libsettings_config.h
|
||||||
|
|
||||||
inifile.h
|
inifile.h
|
||||||
inifile.cpp
|
inifile.cpp
|
||||||
|
|
||||||
settingsobject.h
|
settingsobject.h
|
||||||
settingsobject.cpp
|
settingsobject.cpp
|
||||||
inisettingsobject.h
|
inisettingsobject.h
|
||||||
inisettingsobject.cpp
|
inisettingsobject.cpp
|
||||||
|
|
||||||
setting.h
|
setting.h
|
||||||
setting.cpp
|
setting.cpp
|
||||||
overridesetting.h
|
overridesetting.h
|
||||||
overridesetting.cpp
|
overridesetting.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
# Set the include dir path.
|
# Set the include dir path.
|
||||||
|
|||||||
@ -10,21 +10,21 @@ find_package(Qt5Core REQUIRED)
|
|||||||
include_directories(${Qt5Base_INCLUDE_DIRS})
|
include_directories(${Qt5Base_INCLUDE_DIRS})
|
||||||
|
|
||||||
set(LIBUTIL_SOURCES
|
set(LIBUTIL_SOURCES
|
||||||
include/libutil_config.h
|
include/libutil_config.h
|
||||||
|
|
||||||
include/pathutils.h
|
include/pathutils.h
|
||||||
src/pathutils.cpp
|
src/pathutils.cpp
|
||||||
|
|
||||||
include/osutils.h
|
include/osutils.h
|
||||||
|
|
||||||
include/userutils.h
|
include/userutils.h
|
||||||
src/userutils.cpp
|
src/userutils.cpp
|
||||||
|
|
||||||
include/cmdutils.h
|
include/cmdutils.h
|
||||||
src/cmdutils.cpp
|
src/cmdutils.cpp
|
||||||
|
|
||||||
include/modutils.h
|
include/modutils.h
|
||||||
src/modutils.cpp
|
src/modutils.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
# Set the include dir path.
|
# Set the include dir path.
|
||||||
|
|||||||
@ -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
|
# tweak this list and xz.h to fit your needs
|
||||||
|
|
||||||
set(XZ_SOURCES
|
set(XZ_SOURCES
|
||||||
include/xz.h
|
include/xz.h
|
||||||
src/xz_config.h
|
src/xz_config.h
|
||||||
src/xz_crc32.c
|
src/xz_crc32.c
|
||||||
src/xz_crc64.c
|
src/xz_crc64.c
|
||||||
src/xz_dec_lzma2.c
|
src/xz_dec_lzma2.c
|
||||||
src/xz_dec_stream.c
|
src/xz_dec_stream.c
|
||||||
src/xz_lzma2.h
|
src/xz_lzma2.h
|
||||||
src/xz_private.h
|
src/xz_private.h
|
||||||
src/xz_stream.h
|
src/xz_stream.h
|
||||||
# src/xz_dec_bcj.c
|
# src/xz_dec_bcj.c
|
||||||
)
|
)
|
||||||
# TODO: look into what would be needed for plain old lzma
|
# TODO: look into what would be needed for plain old lzma
|
||||||
|
|
||||||
|
|||||||
@ -30,19 +30,19 @@ add_unit_test(DownloadUpdateTask tst_DownloadUpdateTask.cpp)
|
|||||||
# Tests END #
|
# Tests END #
|
||||||
|
|
||||||
set(COVERAGE_SOURCE_DIRS
|
set(COVERAGE_SOURCE_DIRS
|
||||||
${MMC_SRC}/logic/*
|
${MMC_SRC}/logic/*
|
||||||
${MMC_SRC}/logic/auth/*
|
${MMC_SRC}/logic/auth/*
|
||||||
${MMC_SRC}/logic/auth/flows/*
|
${MMC_SRC}/logic/auth/flows/*
|
||||||
${MMC_SRC}/logic/lists/*
|
${MMC_SRC}/logic/lists/*
|
||||||
${MMC_SRC}/logic/net/*
|
${MMC_SRC}/logic/net/*
|
||||||
${MMC_SRC}/logic/tasks/*
|
${MMC_SRC}/logic/tasks/*
|
||||||
${MMC_SRC}/gui/*
|
${MMC_SRC}/gui/*
|
||||||
${MMC_SRC}/gui/dialogs/*
|
${MMC_SRC}/gui/dialogs/*
|
||||||
${MMC_SRC}/gui/widgets/*
|
${MMC_SRC}/gui/widgets/*
|
||||||
${MMC_SRC}/depends/settings/include/*
|
${MMC_SRC}/depends/settings/include/*
|
||||||
${MMC_SRC}/depends/settings/src/*
|
${MMC_SRC}/depends/settings/src/*
|
||||||
${MMC_SRC}/depends/util/include/*
|
${MMC_SRC}/depends/util/include/*
|
||||||
${MMC_SRC}/depends/util/src/*
|
${MMC_SRC}/depends/util/src/*
|
||||||
)
|
)
|
||||||
|
|
||||||
if(MultiMC_CODE_COVERAGE)
|
if(MultiMC_CODE_COVERAGE)
|
||||||
@ -51,7 +51,7 @@ if(MultiMC_CODE_COVERAGE)
|
|||||||
|
|
||||||
foreach(test ${MultiMC_TESTS})
|
foreach(test ${MultiMC_TESTS})
|
||||||
add_custom_target(MultiMC_RUN_TEST_${test}
|
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} -z -q # clean common
|
||||||
&& lcov -d ${MMC_BIN}/depends/settings/CMakeFiles/libSettings.dir -z -q # clean settings
|
&& 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
|
&& 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
|
-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
|
-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
|
&& 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}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
VERBATIM
|
VERBATIM
|
||||||
DEPENDS ${test}
|
DEPENDS ${test}
|
||||||
COMMENT "Running ${test}..."
|
COMMENT "Running ${test}..."
|
||||||
)
|
)
|
||||||
list(APPEND MultiMC_TEST_COVERAGE_FILES coverage_${test}-stripped.info)
|
list(APPEND MultiMC_TEST_COVERAGE_FILES coverage_${test}-stripped.info)
|
||||||
list(APPEND MultiMC_RUN_TESTS MultiMC_RUN_TEST_${test})
|
list(APPEND MultiMC_RUN_TESTS MultiMC_RUN_TEST_${test})
|
||||||
endforeach(test)
|
endforeach(test)
|
||||||
|
|
||||||
add_custom_target(MultiMC_GENERATE_COVERAGE
|
add_custom_target(MultiMC_GENERATE_COVERAGE
|
||||||
DEPENDS ${MultiMC_RUN_TESTS}
|
DEPENDS ${MultiMC_RUN_TESTS}
|
||||||
COMMENT "Generating coverage files..."
|
COMMENT "Generating coverage files..."
|
||||||
)
|
)
|
||||||
add_custom_target(MultiMC_GENERATE_COVERAGE_HTML
|
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}
|
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
|
DEPENDS MultiMC_GENERATE_COVERAGE
|
||||||
COMMENT "Generating test coverage html..."
|
COMMENT "Generating test coverage html..."
|
||||||
)
|
)
|
||||||
add_custom_target(MultiMC_RUN_TESTS DEPENDS MultiMC_GENERATE_COVERAGE_HTML)
|
add_custom_target(MultiMC_RUN_TESTS DEPENDS MultiMC_GENERATE_COVERAGE_HTML)
|
||||||
endif(MultiMC_CODE_COVERAGE)
|
endif(MultiMC_CODE_COVERAGE)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user