napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[calamares] Python pre-script only if Python is enabled

Browse Source 
If Python support isn't enabled, you can include the PythonJob header,
but the symbols aren't in libcalamares so fails at link time.

FIXES #1729
This commit is contained in:
Adriaan de Groot 2021-06-21 10:09:44 +02:00
parent 60f8a7c5fb
commit 54e66ff1c0
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/calamares/testmain.cpp
View File

@ -18,18 +18,25 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "Job.h" #include "Job.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "PythonJob.h"
#include "Settings.h" #include "Settings.h"
#include "ViewManager.h" #include "ViewManager.h"
#include "modulesystem/Module.h" #include "modulesystem/Module.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "modulesystem/ViewModule.h" #include "modulesystem/ViewModule.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Yaml.h"
#include "viewpages/ExecutionViewStep.h"
// Optional features of Calamares
// - Python support
// - QML support
#ifdef WITH_PYTHON
#include "PythonJob.h"
#endif
#ifdef WITH_QML #ifdef WITH_QML
#include "utils/Qml.h" #include "utils/Qml.h"
#endif #endif
#include "utils/Yaml.h"
#include "viewpages/ExecutionViewStep.h"
#include <QApplication> #include <QApplication>
#include <QCommandLineOption> #include <QCommandLineOption>
@ -366,10 +373,15 @@ createApplication( int& argc, char* argv[] )
return new QCoreApplication( argc, argv ); return new QCoreApplication( argc, argv );
} }
#ifdef WITH_PYTHON
static const char pythonPreScript[] = R"( static const char pythonPreScript[] = R"(
# This is Python code executed by Python modules *before* the # This is Python code executed by Python modules *before* the
# script file (e.g. main.py) is executed. Beware " before ) # script file (e.g. main.py) is executed. Beware " before )
# because it's a C++ raw-string. # because it's a C++ raw-string.
#
# Calls to suprocess methods that execute something are
# suppressed and logged -- scripts should really be using libcalamares
# methods instead.
_calamares_subprocess = __import__("subprocess", globals(), locals(), [], 0) _calamares_subprocess = __import__("subprocess", globals(), locals(), [], 0)
import sys import sys
import libcalamares import libcalamares
@ -386,6 +398,7 @@ sys.modules["subprocess"] = fake_subprocess
libcalamares.utils.debug('pre-script for testing purposes injected') libcalamares.utils.debug('pre-script for testing purposes injected')
)"; )";
#endif
int int
main( int argc, char* argv[] ) main( int argc, char* argv[] )
@ -416,10 +429,12 @@ main( int argc, char* argv[] )
gs->insert( "localeConf", vm ); gs->insert( "localeConf", vm );
} }
#ifdef WITH_PYTHON
Calamares::PythonJob::setInjectedPreScript(pythonPreScript);
#endif
#ifdef WITH_QML #ifdef WITH_QML
CalamaresUtils::initQmlModulesDir(); // don't care if failed CalamaresUtils::initQmlModulesDir(); // don't care if failed
#endif #endif
Calamares::PythonJob::setInjectedPreScript(pythonPreScript);
cDebug() << "Calamares module-loader testing" << module.moduleName(); cDebug() << "Calamares module-loader testing" << module.moduleName();
Calamares::Module* m = load_module( module ); Calamares::Module* m = load_module( module );