[machineid] Start porting to C++

src/modules/machineid/CMakeLists.txt

@@ -0,0 +1,9 @@
+calamares_add_plugin( machineid
+    TYPE job
+    EXPORT_MACRO PLUGINDLLEXPORT_PRO
+    SOURCES
+        MachineIdJob.cpp
+    LINK_PRIVATE_LIBRARIES
+        calamares
+    SHARED_LIB
+)

src/modules/machineid/MachineIdJob.cpp

@@ -0,0 +1,55 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
+ *   Copyright 2016, Philip Müller <philm@manjaro.org>
+ *   Copyright 2017, Alf Gaida <agaida@siduction.org>
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MachineIdJob.h"
+
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+
+MachineIdJob::MachineIdJob( QObject* parent )
+    : Calamares::CppJob( parent )
+{
+}
+
+
+MachineIdJob::~MachineIdJob() {}
+
+
+QString
+MachineIdJob::prettyName() const
+{
+    return tr( "Generate machine-id." );
+}
+
+
+Calamares::JobResult
+MachineIdJob::exec()
+{
+    return Calamares::JobResult::ok();
+}
+
+
+void
+MachineIdJob::setConfigurationMap( const QVariantMap& configurationMap )
+{
+}
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( MachineIdJobFactory, registerPlugin< MachineIdJob >(); )

src/modules/machineid/MachineIdJob.h

@@ -0,0 +1,48 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MACHINEIDJOB_H
+#define MACHINEIDJOB_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <CppJob.h>
+
+#include <utils/PluginFactory.h>
+
+#include <PluginDllMacro.h>
+
+class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob
+{
+    Q_OBJECT
+
+public:
+    explicit MachineIdJob( QObject* parent = nullptr );
+    virtual ~MachineIdJob() override;
+
+    QString prettyName() const override;
+
+    Calamares::JobResult exec() override;
+
+    void setConfigurationMap( const QVariantMap& configurationMap ) override;
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( MachineIdJobFactory )
+
+#endif  // DUMMYCPPJOB_H

src/modules/machineid/module.desc

@@ -1,5 +0,0 @@
----
-type:       "job"
-name:       "machineid"
-interface:  "python"
-script:     "main.py"