LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

♻️ Remove PY2 legacy blocks from coockiecutter main.m (#522)

Browse source 
Co-authored-by: richard <richard@dotmodus>
This commit is contained in:
Richard Larkin 2020-06-30 07:41:44 +02:00 committed by GitHub
parent b680cf1d14
commit 319e7cc7ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kivy_ios/tools/templates/{{ cookiecutter.project_name }}-ios/main.m
View file

@ -51,10 +51,6 @@ int main(int argc, char *argv[]) {
export_orientation(); export_orientation();
NSString * resourcePath = [[NSBundle mainBundle] resourcePath]; NSString * resourcePath = [[NSBundle mainBundle] resourcePath];
#if PY_MAJOR_VERSION == 2
NSLog(@"PythonHome is: %s", (char *)[resourcePath UTF8String]);
Py_SetPythonHome((char *)[resourcePath UTF8String]);
#else
NSString *python_home = [NSString stringWithFormat:@"PYTHONHOME=%@", resourcePath, nil]; NSString *python_home = [NSString stringWithFormat:@"PYTHONHOME=%@", resourcePath, nil];
putenv((char *)[python_home UTF8String]); putenv((char *)[python_home UTF8String]);
@ -63,19 +59,14 @@ int main(int argc, char *argv[]) {
NSString *tmp_path = [NSString stringWithFormat:@"TMP=%@/tmp", resourcePath, nil]; NSString *tmp_path = [NSString stringWithFormat:@"TMP=%@/tmp", resourcePath, nil];
putenv((char *)[tmp_path UTF8String]); putenv((char *)[tmp_path UTF8String]);
#endif
NSLog(@"Initializing python"); NSLog(@"Initializing python");
Py_Initialize(); Py_Initialize();
#if PY_MAJOR_VERSION == 2
PySys_SetArgv(argc, argv);
#else
wchar_t** python_argv = PyMem_RawMalloc(sizeof(wchar_t *) *argc); wchar_t** python_argv = PyMem_RawMalloc(sizeof(wchar_t *) *argc);
for (int i = 0; i < argc; i++) for (int i = 0; i < argc; i++)
python_argv[i] = Py_DecodeLocale(argv[i], NULL); python_argv[i] = Py_DecodeLocale(argv[i], NULL);
PySys_SetArgv(argc, python_argv); PySys_SetArgv(argc, python_argv);
#endif
// If other modules are using the thread, we need to initialize them before. // If other modules are using the thread, we need to initialize them before.
PyEval_InitThreads(); PyEval_InitThreads();
@ -84,11 +75,7 @@ int main(int argc, char *argv[]) {
load_custom_builtin_importer(); load_custom_builtin_importer();
// Search and start main.py // Search and start main.py
#if PY_MAJOR_VERSION == 2
#define MAIN_EXT @"pyo"
#else
#define MAIN_EXT @"pyc" #define MAIN_EXT @"pyc"
#endif
const char * prog = [ const char * prog = [
[[NSBundle mainBundle] pathForResource:@"YourApp/main" ofType:MAIN_EXT] cStringUsingEncoding: [[NSBundle mainBundle] pathForResource:@"YourApp/main" ofType:MAIN_EXT] cStringUsingEncoding: