Merge pull request #6 from ModOrganizer2/Develop

Stage for release 2.2.2

.gitignore

@@ -0,0 +1,6 @@
+CMakeLists.txt.user
+edit
+*.bak
+/msbuild.log
+/*std*.log
+/*build

CMakeLists.txt

@@ -0,0 +1,13 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+
+ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)
+
+SET(PROJ_NAME diagnose_basic)
+PROJECT(${PROJ_NAME})
+
+SET(DEPENDENCIES_DIR CACHE PATH "")
+
+# hint to find qt in dependencies path
+LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
+
+ADD_SUBDIRECTORY(src)

appveyor.yml

@@ -0,0 +1,32 @@
+version: 1.0.{build}
+skip_branch_with_pr: true
+image: Visual Studio 2019
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw=
+build_script:
+- cmd: >-
+    git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null
+
+    mkdir c:\projects\modorganizer-build -type directory
+
+    cd c:\projects\modorganizer-umbrella
+
+    C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME%
+artifacts:
+- path: build\src\diagnose_basic.dll
+  name: diagnose_basic_dll
+- path: build\src\diagnose_basic.pdb
+  name: diagnose_basic_pdb
+- path: build\src\diagnose_basic.lib
+  name: diagnose_basic_lib
+on_success:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 success $env:WEBHOOK_URL
+on_failure:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stdout.log
+  - ps: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stderr.log
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 failure $env:WEBHOOK_URL

src/CMakeLists.txt

@@ -0,0 +1,65 @@
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11)
+
+CMAKE_POLICY(SET CMP0020 NEW)
+CMAKE_POLICY(SET CMP0043 NEW)
+
+FILE(GLOB ${PROJ_NAME}_SRCS *.cpp)
+FILE(GLOB ${PROJ_NAME}_HDRS *.h)
+FILE(GLOB ${PROJ_NAME}_FORMS *.ui)
+
+
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+SET(CMAKE_AUTOMOC ON)
+SET(CMAKE_AUTOUIC ON)
+FIND_PACKAGE(Qt5Widgets REQUIRED)
+FIND_PACKAGE(Qt5LinguistTools)
+QT5_WRAP_UI(${PROJ_NAME}_UIHDRS ${${PROJ_NAME}_FORMS})
+QT5_CREATE_TRANSLATION(${PROJ_NAME}_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/diagnose_basic_en.ts)
+
+SET(Boost_USE_STATIC_LIBS        ON)
+SET(Boost_USE_MULTITHREADED      ON)
+SET(Boost_USE_STATIC_RUNTIME    OFF)
+FIND_PACKAGE(Boost)
+
+IF (Boost_FOUND)
+  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+ENDIF (Boost_FOUND)
+
+SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super")
+GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
+
+SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
+SET(lib_path "${project_path}/../../install/libs")
+
+INCLUDE_DIRECTORIES(${project_path}/uibase/src)
+LINK_DIRECTORIES(${lib_path})
+
+ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
+ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS} ${${PROJ_NAME}_UIHDRS} ${${PROJ_NAME}_translations_qm})
+TARGET_LINK_LIBRARIES(${PROJ_NAME}
+                      Qt5::Widgets
+                      ${Boost_LIBRARIES}
+                      uibase)
+
+IF (MSVC)
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS "/std:c++latest")
+ENDIF()
+IF (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+  # 32 bits
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE")
+ENDIF()
+
+IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "")
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO ${OPTIMIZE_COMPILE_FLAGS})
+ENDIF()
+IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "")
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS})
+ENDIF()
+
+###############
+## Installation
+
+INSTALL(TARGETS ${PROJ_NAME}
+        RUNTIME DESTINATION bin/plugins)
+INSTALL(FILES $<TARGET_PDB_FILE:${PROJ_NAME}>
+        DESTINATION pdb)

src/SConscript

@@ -0,0 +1,24 @@
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.AppendUnique(CPPDEFINES = [
+    'DIAGNOSEBASIC_LIBRARY',
+    'NOMINMAX',
+    # suppress a few warnings caused by boost vs vc++ paranoia
+    '_SCL_SECURE_NO_WARNINGS'
+])
+
+# Boost produces very long names with msvc truncates. Doesn't seem to cause
+# problems.
+env.AppendUnique(CPPFLAGS = [ '-wd4503' ])
+
+env.AppendUnique(CPPPATH = [
+    '${BOOSTPATH}'
+])
+
+lib = env.SharedLibrary('diagnoseBasic', env.Glob('*.cpp'))
+env.InstallModule(lib)
+
+res = env['QT_USED_MODULES']
+Return('res')

src/diagnoseBasic.pro

@@ -31,4 +31,5 @@ INCLUDEPATH += "$${BOOSTPATH}"
 #DEFINES += INIEDITOR_LIBRARY
 
 OTHER_FILES += \
-    diagnosebasic.json
+    diagnosebasic.json\
+    SConscript

src/diagnosebasic.h

@@ -29,7 +29,7 @@ along with this plugin.  If not, see <http://www.gnu.org/licenses/>.
 #include <QSet>
 
 
-class DiagnoseBasic : public QObject, MOBase::IPlugin, MOBase::IPluginDiagnose
+class DiagnoseBasic : public QObject, public MOBase::IPlugin, public MOBase::IPluginDiagnose
 {
   Q_OBJECT
   Q_INTERFACES(MOBase::IPlugin MOBase::IPluginDiagnose)
@@ -67,6 +67,8 @@ private:
   bool nitpickInstalled() const;
   bool assetOrder() const;
   bool missingMasters() const;
+  bool alternateGame() const;
+  bool fileAttributes(const QString &executable) const;
 
 private:
 
@@ -74,9 +76,9 @@ private:
   static const unsigned int PROBLEM_OVERWRITE = 2;
   static const unsigned int PROBLEM_INVALIDFONT = 3;
   static const unsigned int PROBLEM_NITPICKINSTALLED = 4;
-  static const unsigned int PROBLEM_ASSETORDER = 5;
   static const unsigned int PROBLEM_PROFILETWEAKS = 7;
   static const unsigned int PROBLEM_MISSINGMASTERS = 8;
+  static const unsigned int PROBLEM_ALTERNATE = 9;
 
   static const unsigned int NUM_CONTEXT_ROWS = 5;
 
@@ -124,14 +126,15 @@ private:
 private:
 
   void topoSort(std::vector<ListElement> &list) const;
+  bool checkEmpty(const QString &path) const;
 
 private:
 
   MOBase::IOrganizer *m_MOInfo;
   mutable QString m_ErrorMessage;
-  mutable std::vector <Move> m_SuggestedMoves;
   mutable QString m_NewestModlistBackup;
   mutable std::set<QString> m_MissingMasters;
+  mutable std::map<QString, std::set<QString>> m_PluginChildren;
 
 };