TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update Py_FrozenMain to work with Python 3.2

Browse Source
This commit is contained in:
rdb 2016-12-06 02:14:39 +01:00
parent f001bd20d7
commit 4335e3759a
2 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
direct/src/showutil/FreezeTool.py
View File

@ -251,6 +251,10 @@ frozenMainCode = """
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
#include <locale.h> #include <locale.h>
#if PY_MINOR_VERSION < 5
#define Py_DecodeLocale _Py_char2wchar
#endif
#endif #endif
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
@ -272,18 +276,14 @@ Py_FrozenMain(int argc, char **argv)
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
int i; int i;
char *oldloc = NULL; char *oldloc;
wchar_t **argv_copy = NULL; wchar_t **argv_copy = NULL;
/* We need a second copies, as Python might modify the first one. */ /* We need a second copies, as Python might modify the first one. */
wchar_t **argv_copy2 = NULL; wchar_t **argv_copy2 = NULL;
if (argc > 0) { if (argc > 0) {
argv_copy = PyMem_RawMalloc(sizeof(wchar_t*) * argc); argv_copy = (wchar_t **)alloca(sizeof(wchar_t *) * argc);
argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*) * argc); argv_copy2 = (wchar_t **)alloca(sizeof(wchar_t *) * argc);
if (!argv_copy || !argv_copy2) {
fprintf(stderr, \"out of memory\\n\");
goto error;
}
} }
#endif #endif
@ -303,12 +303,7 @@ Py_FrozenMain(int argc, char **argv)
} }
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL)); oldloc = setlocale(LC_ALL, NULL);
if (!oldloc) {
fprintf(stderr, \"out of memory\\n\");
goto error;
}
setlocale(LC_ALL, \"\"); setlocale(LC_ALL, \"\");
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
argv_copy[i] = Py_DecodeLocale(argv[i], NULL); argv_copy[i] = Py_DecodeLocale(argv[i], NULL);
@ -321,8 +316,6 @@ Py_FrozenMain(int argc, char **argv)
} }
} }
setlocale(LC_ALL, oldloc); setlocale(LC_ALL, oldloc);
PyMem_RawFree(oldloc);
oldloc = NULL;
#endif #endif
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
@ -372,13 +365,15 @@ Py_FrozenMain(int argc, char **argv)
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
error: error:
PyMem_RawFree(argv_copy);
if (argv_copy2) { if (argv_copy2) {
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++) {
#if PY_MINOR_VERSION >= 4
PyMem_RawFree(argv_copy2[i]); PyMem_RawFree(argv_copy2[i]);
PyMem_RawFree(argv_copy2); #else
PyMem_Free(argv_copy2[i]);
#endif
}
} }
PyMem_RawFree(oldloc);
#endif #endif
return sts; return sts;
} }

37
pandatool/src/deploy-stub/deploy-stub.c
View File

@ -32,18 +32,14 @@ Py_FrozenMain(int argc, char **argv)
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
int i; int i;
char *oldloc = NULL; char *oldloc;
wchar_t **argv_copy = NULL; wchar_t **argv_copy = NULL;
/* We need a second copies, as Python might modify the first one. */ /* We need a second copies, as Python might modify the first one. */
wchar_t **argv_copy2 = NULL; wchar_t **argv_copy2 = NULL;
if (argc > 0) { if (argc > 0) {
argv_copy = PyMem_RawMalloc(sizeof(wchar_t*) * argc); argv_copy = (wchar_t **)alloca(sizeof(wchar_t *) * argc);
argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*) * argc); argv_copy2 = (wchar_t **)alloca(sizeof(wchar_t *) * argc);
if (!argv_copy || !argv_copy2) {
fprintf(stderr, "out of memory\n");
goto error;
}
} }
#endif #endif
@ -63,12 +59,7 @@ Py_FrozenMain(int argc, char **argv)
} }
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL)); oldloc = setlocale(LC_ALL, NULL);
if (!oldloc) {
fprintf(stderr, "out of memory\n");
goto error;
}
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
argv_copy[i] = Py_DecodeLocale(argv[i], NULL); argv_copy[i] = Py_DecodeLocale(argv[i], NULL);
@ -81,8 +72,6 @@ Py_FrozenMain(int argc, char **argv)
} }
} }
setlocale(LC_ALL, oldloc); setlocale(LC_ALL, oldloc);
PyMem_RawFree(oldloc);
oldloc = NULL;
#endif #endif
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
@ -122,14 +111,6 @@ Py_FrozenMain(int argc, char **argv)
else else
sts = 0; sts = 0;
#if PY_MAJOR_VERSION >= 3
n = PyImport_ImportFrozenModule("_frozen_importlib");
if (n == 0)
Py_FatalError("_frozen_importlib not frozen");
if (n < 0)
PyErr_Print();
#endif
if (inspect && isatty((int)fileno(stdin))) if (inspect && isatty((int)fileno(stdin)))
sts = PyRun_AnyFile(stdin, "<stdin>") != 0; sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
@ -140,13 +121,15 @@ Py_FrozenMain(int argc, char **argv)
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
error: error:
PyMem_RawFree(argv_copy);
if (argv_copy2) { if (argv_copy2) {
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++) {
#if PY_MINOR_VERSION >= 4
PyMem_RawFree(argv_copy2[i]); PyMem_RawFree(argv_copy2[i]);
PyMem_RawFree(argv_copy2); #else
PyMem_Free(argv_copy2[i]);
#endif
}
} }
PyMem_RawFree(oldloc);
#endif #endif
return sts; return sts;
} }