Commits

Anthony Tuininga committed 3b6824d

Remove Win32GUIKeepPath as that did not solve the problem that Almar was
looking for anyways and the usefulness of ConsoleKeepPath is also in question.

  • Participants
  • Parent commits 5ade6fc

Comments (0)

Files changed (4)

doc/releasenotes.rst

    support, please use cx_Freeze 4.2.3.
 
 1) Added support for the final release of Python 3.3.
-2) Added new base executable Win32GUIKeepPath which enables the use of a Python
-   installation in the Windows GUI subsystem in the same manner as
-   ConsoleKeepPath does for using a console. Thanks to Almar Klein for the
-   initial patch.
-3) Clarified the documentation on the --replace-paths option. Thanks to Thomas
+2) Clarified the documentation on the --replace-paths option. Thanks to Thomas
    Kluyver for the patch.
 
 Bugs fixed:
     gui = Extension("cx_Freeze.bases.Win32GUI", ["source/bases/Win32GUI.c"],
             include_dirs = includeDirs, depends = fullDepends,
             libraries = ["user32"])
-    guiKeepPath = Extension("cx_Freeze.bases.Win32GUIKeepPath",
-            ["source/bases/Win32GUIKeepPath.c"], include_dirs = includeDirs,
-            depends = depends, libraries = ["user32"])
     extensions.append(gui)
-    extensions.append(guiKeepPath)
     moduleInfo = find_cx_Logging()
     if moduleInfo is not None and sys.version_info[:2] < (3, 0):
         includeDir, libraryDir = moduleInfo

source/bases/Win32GUI.c

 
 
 #include "Common.c"
-#ifndef CX_FREEZE_KEEP_PATH
 #include "BaseModules.c"
-#endif
 
 
 //-----------------------------------------------------------------------------
     int status;
 
     // initialize Python
-#ifndef CX_FREEZE_KEEP_PATH
     Py_NoSiteFlag = 1;
     Py_FrozenFlag = 1;
     Py_IgnoreEnvironmentFlag = 1;
     PyImport_FrozenModules = gFrozenModules;
-#endif
 #if PY_MAJOR_VERSION >= 3
     setlocale(LC_CTYPE, "");
-#ifndef CX_FREEZE_KEEP_PATH
     Py_SetPythonHome(L"");
-#endif
     wargv = PyMem_Malloc(sizeof(wchar_t*) * __argc);
     if (!wargv)
         return 2;
     Py_Initialize();
     PySys_SetArgv(__argc, wargv);
 #else
-#ifndef CX_FREEZE_KEEP_PATH
     Py_SetPythonHome("");
-#endif
     Py_SetProgramName(__argv[0]);
     fileName = Py_GetProgramFullPath();
     Py_Initialize();

source/bases/Win32GUIKeepPath.c

-//-----------------------------------------------------------------------------
-// Win32GUIKeepPath.c
-//   Main routine for frozen programs written for the Win32 GUI subsystem which
-// need a Python installation to do their work.
-//-----------------------------------------------------------------------------
-
-#define CX_FREEZE_KEEP_PATH
-#include "Win32GUI.c"
-