[libcalamaresui] Move Module to libcalamares

- The Module class has no UI-specific code in it; it's all about
  loading and data-management. Move it out of the UI library.

src/libcalamares/CMakeLists.txt

@@ -39,6 +39,7 @@ set( libSources
 
     # Modules
     modulesystem/InstanceKey.cpp
+    modulesystem/Module.cpp
     modulesystem/Requirement.cpp
 
     # Network service

src/libcalamares/modulesystem/Module.cpp

@@ -20,30 +20,18 @@
 #include "Module.h"
 
 #include "CalamaresConfig.h"
-#include "CppJobModule.h"
-#include "ProcessJobModule.h"
 #include "Settings.h"
-#include "ViewModule.h"
 
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Yaml.h"
 
-#ifdef WITH_PYTHON
-#include "PythonJobModule.h"
-#endif
-
-#ifdef WITH_PYTHONQT
-#include "PythonQtViewModule.h"
-#endif
-
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QString>
 
-
 static const char EMERGENCY[] = "emergency";
 
 namespace Calamares

src/libcalamares/modulesystem/Module.h

@@ -46,7 +46,7 @@ Module* moduleFromDescriptor( const ModuleSystem::Descriptor& moduleDescriptor,
  * takes care of creating an object of the correct type starting from a module
  * descriptor structure.
  */
-class UIDLLEXPORT Module
+class DLLEXPORT Module
 {
 public:
     /**

src/libcalamaresui/CMakeLists.txt

@@ -6,7 +6,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/sr
 
 set( calamaresui_SOURCES
     modulesystem/CppJobModule.cpp
-    modulesystem/Module.cpp
     modulesystem/ModuleFactory.cpp
     modulesystem/ModuleManager.cpp
     modulesystem/ProcessJobModule.cpp

src/libcalamaresui/modulesystem/CppJobModule.h

@@ -22,7 +22,7 @@
 #define CALAMARES_CPPJOBMODULE_H
 
 #include "DllMacro.h"
-#include "Module.h"
+#include "modulesystem/Module.h"
 
 class QPluginLoader;
 

src/libcalamaresui/modulesystem/ModuleManager.cpp

@@ -19,11 +19,11 @@
 
 #include "ModuleManager.h"
 
-#include "Module.h"
 #include "RequirementsChecker.h"
 #include "Settings.h"
 #include "ViewManager.h"
 
+#include "modulesystem/Module.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 #include "viewpages/ExecutionViewStep.h"

src/libcalamaresui/modulesystem/ProcessJobModule.h

@@ -20,9 +20,8 @@
 #ifndef CALAMARES_PROCESSJOBMODULE_H
 #define CALAMARES_PROCESSJOBMODULE_H
 
-#include "Module.h"
-
 #include "DllMacro.h"
+#include "modulesystem/Module.h"
 
 #include <chrono>
 

src/libcalamaresui/modulesystem/PythonJobModule.h

@@ -19,9 +19,8 @@
 #ifndef CALAMARES_PYTHONJOBMODULE_H
 #define CALAMARES_PYTHONJOBMODULE_H
 
-#include "Module.h"
-
 #include "DllMacro.h"
+#include "modulesystem/Module.h"
 
 namespace Calamares
 {

src/libcalamaresui/modulesystem/RequirementsChecker.cpp

@@ -18,8 +18,7 @@
 
 #include "RequirementsChecker.h"
 
-#include "Module.h"
+#include "modulesystem/Module.h"
-
 #include "modulesystem/Requirement.h"
 #include "utils/Logger.h"
 

src/libcalamaresui/modulesystem/ViewModule.h

@@ -21,7 +21,7 @@
 #define CALAMARES_VIEWMODULE_H
 
 #include "DllMacro.h"
-#include "Module.h"
+#include "modulesystem/Module.h"
 
 class QPluginLoader;