apply (char *) to static strings, exclude TSharedRef<IPlugin>plugin from non editor builds to resolve issue 412

slartibaartfast · slartibaartfast · commit 8eb8bb48ca22 · 2018-05-07T13:09:00.000-04:00
diff --git a/Source/PythonAutomation/Private/PythonAutomationModule.cpp b/Source/PythonAutomation/Private/PythonAutomationModule.cpp
@@ -9,7 +9,7 @@ IMPLEMENT_MODULE(FPythonAutomationModule, PythonAutomation);
 
 void FPythonAutomationModule::StartupModule()
 {
-	PyObject *py_automation_module = ue_py_register_module("unreal_engine.automation");
+	PyObject *py_automation_module = ue_py_register_module((char *)"unreal_engine.automation");
 	ue_python_init_fautomation_editor_common_utils(py_automation_module);
 }
 
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -1552,9 +1552,9 @@ void unreal_engine_init_py_module()
 
 	ue_python_init_ivoice_capture(new_unreal_engine_module);
 
-	ue_py_register_magic_module("unreal_engine.classes", py_ue_new_uclassesimporter);
-	ue_py_register_magic_module("unreal_engine.enums", py_ue_new_enumsimporter);
-	ue_py_register_magic_module("unreal_engine.structs", py_ue_new_ustructsimporter);
+	ue_py_register_magic_module((char *)"unreal_engine.classes", py_ue_new_uclassesimporter);
+	ue_py_register_magic_module((char *)"unreal_engine.enums", py_ue_new_enumsimporter);
+	ue_py_register_magic_module((char *)"unreal_engine.structs", py_ue_new_ustructsimporter);
 
 
 	PyDict_SetItemString(unreal_engine_dict, "ENGINE_MAJOR_VERSION", PyLong_FromLong(ENGINE_MAJOR_VERSION));
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -300,6 +300,7 @@ void FUnrealEnginePythonModule::StartupModule()
 		ScriptsPaths.Add(ProjectScriptsPath);
 	}
 
+  #if WITH_EDITOR
 	for (TSharedRef<IPlugin>plugin : IPluginManager::Get().GetEnabledPlugins())
 	{
 		FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("Scripts"));
@@ -308,6 +309,7 @@ void FUnrealEnginePythonModule::StartupModule()
 			ScriptsPaths.Add(PluginScriptsPath);
 		}
 	}
+  #endif
 
 	if (ZipPath.IsEmpty())
 	{
@@ -461,7 +463,7 @@ FString FUnrealEnginePythonModule::Pep8ize(FString Code)
 	return NewCode;
 }
 
-// run a python string in a new sub interpreter 
+// run a python string in a new sub interpreter
 void FUnrealEnginePythonModule::RunStringSandboxed(char *str)
 {
 	FScopePythonGIL gil;
@@ -684,4 +686,3 @@ PyObject *ue_py_register_module(char *name)
 #undef LOCTEXT_NAMESPACE
 
 IMPLEMENT_MODULE(FUnrealEnginePythonModule, UnrealEnginePython)
-
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFSlowTask.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyFSlowTask.cpp
@@ -74,7 +74,7 @@ static PyObject *py_ue_fslowtask_make_dialog(ue_PyFSlowTask *self, PyObject * ar
 static PyObject *py_ue_fslowtask_enter_progress_frame(ue_PyFSlowTask *self, PyObject * args)
 {
 	float expected_work_this_frame = 1.0;
-	char *text = "";
+	char *text = (char *)"";
 	if(!PyArg_ParseTuple(args, "|fs:enter_progress_frame", &expected_work_this_frame, &text))
 	{
 		return nullptr;
@@ -153,7 +153,7 @@ static PyTypeObject ue_PyFSlowTaskType = {
 static int py_ue_fslowtask_init(ue_PyFSlowTask *self, PyObject * args)
 {
 	float amount_of_work;
-	char *default_message = "";
+	char *default_message = (char *)"";
 	PyObject *py_enabled = nullptr;
 	if(!PyArg_ParseTuple(args, "f|sO:__init__", &amount_of_work, &default_message, &py_enabled))
 	{
@@ -189,4 +189,4 @@ ue_PyFSlowTask *py_ue_is_fslowtask(PyObject *obj)
 	return (ue_PyFSlowTask *)obj;
 }
 
-#endif
+#endif

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ IMPLEMENT_MODULE(FPythonAutomationModule, PythonAutomation);`
`9`	`9`
`10`	`10`	`void FPythonAutomationModule::StartupModule()`
`11`	`11`	`{`
`12`		`- PyObject *py_automation_module = ue_py_register_module("unreal_engine.automation");`
	`12`	`+ PyObject py_automation_module = ue_py_register_module((char )"unreal_engine.automation");`
`13`	`13`	`ue_python_init_fautomation_editor_common_utils(py_automation_module);`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,7 @@ void FUnrealEnginePythonModule::StartupModule()`
`300`	`300`	`ScriptsPaths.Add(ProjectScriptsPath);`
`301`	`301`	`}`
`302`	`302`
	`303`	`+ #if WITH_EDITOR`
`303`	`304`	`for (TSharedRef<IPlugin>plugin : IPluginManager::Get().GetEnabledPlugins())`
`304`	`305`	`{`
`305`	`306`	`FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("Scripts"));`
`@@ -308,6 +309,7 @@ void FUnrealEnginePythonModule::StartupModule()`
`308`	`309`	`ScriptsPaths.Add(PluginScriptsPath);`
`309`	`310`	`}`
`310`	`311`	`}`
	`312`	`+ #endif`
`311`	`313`
`312`	`314`	`if (ZipPath.IsEmpty())`
`313`	`315`	`{`
`@@ -461,7 +463,7 @@ FString FUnrealEnginePythonModule::Pep8ize(FString Code)`
`461`	`463`	`return NewCode;`
`462`	`464`	`}`
`463`	`465`
`464`		`-// run a python string in a new sub interpreter`
	`466`	`+// run a python string in a new sub interpreter`
`465`	`467`	`void FUnrealEnginePythonModule::RunStringSandboxed(char *str)`
`466`	`468`	`{`
`467`	`469`	`FScopePythonGIL gil;`
`@@ -684,4 +686,3 @@ PyObject ue_py_register_module(char name)`
`684`	`686`	`#undef LOCTEXT_NAMESPACE`
`685`	`687`
`686`	`688`	`IMPLEMENT_MODULE(FUnrealEnginePythonModule, UnrealEnginePython)`
`687`		`-`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ static PyObject py_ue_fslowtask_make_dialog(ue_PyFSlowTask self, PyObject * ar`
`74`	`74`	`static PyObject py_ue_fslowtask_enter_progress_frame(ue_PyFSlowTask self, PyObject * args)`
`75`	`75`	`{`
`76`	`76`	`float expected_work_this_frame = 1.0;`
`77`		`- char *text = "";`
	`77`	`+ char text = (char )"";`
`78`	`78`	`if(!PyArg_ParseTuple(args, "\|fs:enter_progress_frame", &expected_work_this_frame, &text))`
`79`	`79`	`{`
`80`	`80`	`return nullptr;`
`@@ -153,7 +153,7 @@ static PyTypeObject ue_PyFSlowTaskType = {`
`153`	`153`	`static int py_ue_fslowtask_init(ue_PyFSlowTask self, PyObject args)`
`154`	`154`	`{`
`155`	`155`	`float amount_of_work;`
`156`		`- char *default_message = "";`
	`156`	`+ char default_message = (char )"";`
`157`	`157`	`PyObject *py_enabled = nullptr;`
`158`	`158`	`if(!PyArg_ParseTuple(args, "f\|sO:__init__", &amount_of_work, &default_message, &py_enabled))`
`159`	`159`	`{`
`@@ -189,4 +189,4 @@ ue_PyFSlowTask py_ue_is_fslowtask(PyObject obj)`
`189`	`189`	`return (ue_PyFSlowTask *)obj;`
`190`	`190`	`}`
`191`	`191`
`192`		`-#endif`
	`192`	`+#endif`