[Python-checkins] r75543 - in sandbox/trunk/setuptools: launcher.c setuptools/cli.exe setuptools/command/sdist.py setuptools/gui.exe

[phillip.eby]

Author: phillip.eby
Date: Mon Oct 19 23:02:06 2009
New Revision: 75543

Log:
Fix lost launcher changes, string.split().


Modified:
   sandbox/trunk/setuptools/launcher.c
   sandbox/trunk/setuptools/setuptools/cli.exe
   sandbox/trunk/setuptools/setuptools/command/sdist.py
   sandbox/trunk/setuptools/setuptools/gui.exe

Modified: sandbox/trunk/setuptools/launcher.c
==============================================================================
--- sandbox/trunk/setuptools/launcher.c	(original)
+++ sandbox/trunk/setuptools/launcher.c	Mon Oct 19 23:02:06 2009
@@ -81,17 +81,18 @@
 
 
 char *loadable_exe(char *exename) {
-    HINSTANCE hPython;  /* DLL handle for python executable */
+    /* HINSTANCE hPython;  DLL handle for python executable */
     char *result;
 
-    hPython = LoadLibraryEx(exename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    if (!hPython) return NULL;
+    /* hPython = LoadLibraryEx(exename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    if (!hPython) return NULL; */
 
     /* Return the absolute filename for spawnv */
     result = calloc(MAX_PATH, sizeof(char));
-    if (result) GetModuleFileName(hPython, result, MAX_PATH);
+    strncpy(result, exename, MAX_PATH);
+    /*if (result) GetModuleFileName(hPython, result, MAX_PATH);
 
-    FreeLibrary(hPython);
+    FreeLibrary(hPython); */
     return result;
 }
 

Modified: sandbox/trunk/setuptools/setuptools/cli.exe
==============================================================================
Binary files. No diff available.

Modified: sandbox/trunk/setuptools/setuptools/command/sdist.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/sdist.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/sdist.py	Mon Oct 19 23:02:06 2009
@@ -181,7 +181,7 @@
 
                 if not got_it:
                     self.warn("standard file not found: should have one of " +
-                              string.join(alts, ', '))
+                              ', '.join(alts))
             else:
                 if os.path.exists(fn):
                     self.filelist.append(fn)

Modified: sandbox/trunk/setuptools/setuptools/gui.exe
==============================================================================
Binary files. No diff available.