2e4e94b9ca
{cli,gui}{,-32,-64}.exe now handles /usr/bin/env ok and
looks in same dir as script for python executable.
Post installs are no longer needed.
This partially undoes Alexey's update to 7.0 which isn't
ready yet, AFAIK.
22 lines
917 B
Diff
22 lines
917 B
Diff
--- setuptools-5.4.1/launcher.c.orig 2014-06-29 02:40:09.000000000 +0100
|
|
+++ setuptools-5.4.1/launcher.c 2014-10-19 13:37:21.272787900 +0100
|
|
@@ -154,14 +154,16 @@
|
|
}
|
|
}
|
|
|
|
- /* Use the script's parent directory, which should be the Python home
|
|
- (This should only be used for bdist_wininst-installed scripts, because
|
|
+ /* Use the script's directory (parent directory if not mingw-w64), which should be the
|
|
+ Python home (This should only be used for bdist_wininst-installed scripts, because
|
|
easy_install-ed scripts use the absolute path to python[w].exe
|
|
*/
|
|
_splitpath(script, drive, dir, fname, ext);
|
|
result = dir + strlen(dir) -1;
|
|
+#if !defined(__MINGW64_VERSION_MAJOR)
|
|
if (*result == '\\') result--;
|
|
while (*result != '\\' && result>=dir) *result-- = 0;
|
|
+#endif
|
|
_makepath(path, drive, dir, exename, NULL);
|
|
return loadable_exe(path);
|
|
}
|