applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] repair visibility also for Boost::Python modules

Browse source
This commit is contained in:
Adriaan de Groot 2024-02-24 12:45:20 +01:00
parent 7a3bff5117
commit 34888edae1
5 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libcalamares/PythonHelper.h
View file

@ -11,6 +11,7 @@
#ifndef CALAMARES_PYTHONJOBHELPER_H
#define CALAMARES_PYTHONJOBHELPER_H
#include "DllMacro.h"
#include "PythonJob.h"
#include "utils/BoostPython.h"
@ -24,20 +25,20 @@ class GlobalStorage;
namespace CalamaresPython
{
boost::python::object variantToPyObject( const QVariant& variant );
QVariant variantFromPyObject( const boost::python::object& pyObject );
DLLEXPORT boost::python::object variantToPyObject( const QVariant& variant );
DLLEXPORT QVariant variantFromPyObject( const boost::python::object& pyObject );
boost::python::list variantListToPyList( const QVariantList& variantList );
QVariantList variantListFromPyList( const boost::python::list& pyList );
DLLEXPORT boost::python::list variantListToPyList( const QVariantList& variantList );
DLLEXPORT QVariantList variantListFromPyList( const boost::python::list& pyList );
boost::python::dict variantMapToPyDict( const QVariantMap& variantMap );
QVariantMap variantMapFromPyDict( const boost::python::dict& pyDict );
DLLEXPORT boost::python::dict variantMapToPyDict( const QVariantMap& variantMap );
DLLEXPORT QVariantMap variantMapFromPyDict( const boost::python::dict& pyDict );
boost::python::dict variantHashToPyDict( const QVariantHash& variantHash );
QVariantHash variantHashFromPyDict( const boost::python::dict& pyDict );
DLLEXPORT boost::python::dict variantHashToPyDict( const QVariantHash& variantHash );
DLLEXPORT QVariantHash variantHashFromPyDict( const boost::python::dict& pyDict );
class Helper : public QObject
class DLLEXPORT Helper : public QObject
{
Q_OBJECT
public:

5
src/libcalamares/PythonJob.cpp
View file

@ -19,6 +19,11 @@
#include <QDir>
#if WITH_PYBIND11
#error Source only for Boost::Python
#else
#endif
static const char* s_preScript = nullptr;
namespace bp = boost::python;

11
src/libcalamares/PythonJob.h
View file

@ -11,7 +11,7 @@
#ifndef CALAMARES_PYTHONJOB_H
#define CALAMARES_PYTHONJOB_H
#include "DllExport.h"
#include "DllMacro.h"
#include "Job.h"
#include "modulesystem/InstanceKey.h"
@ -19,6 +19,11 @@
#include <memory>
#if WITH_PYBIND11
#error Source only for Boost::Python
#else
#endif
namespace CalamaresPython
{
class PythonJobInterface;
@ -28,11 +33,11 @@ class Helper;
namespace Calamares
{
class PythonJob : public Job
class DLLEXPORT PythonJob : public Job
{
Q_OBJECT
public:
explicit DLLEXPORT PythonJob( const QString& scriptFile,
explicit PythonJob( const QString& scriptFile,
const QString& workingPath,
const QVariantMap& moduleConfiguration = QVariantMap(),
QObject* parent = nullptr );

5
src/libcalamares/python/PythonJob.cpp
View file

@ -20,6 +20,11 @@
#include <QFileInfo>
#include <QString>
#if WITH_PYBIND11
#else
#error Source only for pybind11
#endif
namespace py = pybind11;
// Forward-declare function generated by PYBIND11_MODULE

5
src/libcalamares/python/PythonJob.h
View file

@ -19,6 +19,11 @@
#include <memory>
#if WITH_PYBIND11
#else
#error Source only for pybind11
#endif
namespace Calamares
{
namespace Python