Merge pull request #28 from ModOrganizer2/Develop

Stage for release 2.2.2

CMakeLists.txt

@@ -12,12 +12,12 @@ SET(DEPENDENCIES_DIR CACHE PATH "")
 LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
 
 # need to install python
-IF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll")
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin)
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb)
+IF(EXISTS "${PYTHON_ROOT}/PCbuild/python37.dll")
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python37.dll DESTINATION bin)
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python37.pdb DESTINATION pdb)
 ELSEIF(EXISTS "${PYTHON_ROOT}/PCbuild/amd64/python27.dll")
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.dll DESTINATION bin)
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.pdb DESTINATION pdb)
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python37.dll DESTINATION bin)
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python37.pdb DESTINATION pdb)
 ENDIF()
 
 

appveyor.yml

@@ -1,6 +1,6 @@
 version: 1.0.{build}
 skip_branch_with_pr: true
-image: Visual Studio 2019 Preview
+image: Visual Studio 2019
 environment:
   WEBHOOK_URL:
     secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw=

src/proxy/proxypython.cpp

@@ -196,12 +196,12 @@ QString ProxyPython::description() const
 
 VersionInfo ProxyPython::version() const
 {
-  return VersionInfo(2, 0, 1, VersionInfo::RELEASE_FINAL);
+  return VersionInfo(2, 1, 0, VersionInfo::RELEASE_FINAL);
 }
 
 bool ProxyPython::isActive() const
 {
-  return m_LoadFailure == FAIL_NONE;
+  return m_LoadFailure == FAIL_NOTINIT;
 }
 
 QList<PluginSetting> ProxyPython::settings() const

src/runner/gamefeatureswrappers.cpp

@@ -79,6 +79,11 @@ void GamePluginsWrapper::getLoadOrder(QStringList &loadOrder)
   return basicWrapperFunctionImplementation<GamePluginsWrapper, void>(this, "getLoadOrder", loadOrder);
 }
 
+bool GamePluginsWrapper::lightPluginsAreSupported()
+{
+    return basicWrapperFunctionImplementation<GamePluginsWrapper, bool>(this, "lightPluginsAreSupported");
+}
+
 /// end GamePlugins Wrapper
 /////////////////////////////
 /// LocalSavegames Wrapper
@@ -261,6 +266,7 @@ void registerGameFeaturesPythonConverters()
       .def("writePluginLists", bpy::pure_virtual(&GamePlugins::writePluginLists))
       .def("readPluginLists", bpy::pure_virtual(&GamePlugins::readPluginLists))
       .def("getLoadOrder", bpy::pure_virtual(&GamePlugins::getLoadOrder))
+      .def("lightPluginsAreSupported", bpy::pure_virtual(&GamePlugins::lightPluginsAreSupported))
       ;
 
   bpy::class_<LocalSavegamesWrapper, boost::noncopyable>("LocalSavegames")

src/runner/gamefeatureswrappers.h

@@ -48,6 +48,7 @@ public:
   virtual void writePluginLists(const MOBase::IPluginList *pluginList) override;
   virtual void readPluginLists(MOBase::IPluginList *pluginList) override;
   virtual void getLoadOrder(QStringList &loadOrder) override;
+  virtual bool lightPluginsAreSupported() override;
 };
 
 class LocalSavegamesWrapper : public LocalSavegames, public boost::python::wrapper<LocalSavegames>

src/runner/pythonrunner.cpp

@@ -1401,6 +1401,7 @@ bool handled_exec_file(bpy::str filename, bpy::object globals = bpy::object(), b
 void PythonRunner::initPath()
 {
   static QStringList paths = {
+    QCoreApplication::applicationDirPath() + "/pythoncore.zip",
     QCoreApplication::applicationDirPath() + "/pythoncore",
     m_MOInfo->pluginDataPath()
   };