DISTRHO
/
PawPaw
mirror of https://github.com/DISTRHO/PawPaw
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Cross-Platform build scripts for audio plugins
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
294 Commits
3 Branches
4.3MB
Tree: 82b5cf0ee4
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '82b5cf0ee4'
${ noResults }
PawPaw/patches/Python/win32/0555-msys-mingw-prefer-unix...

378 lines
11KB
Raw Blame History 

  1. diff -Naur Python-3.8.0-orig/Include/pylifecycle.h Python-3.8.0/Include/pylifecycle.h

  2. --- Python-3.8.0-orig/Include/pylifecycle.h	2019-10-14 16:34:47.000000000 +0300

  3. +++ Python-3.8.0/Include/pylifecycle.h	2019-10-22 10:02:36.752112100 +0300

  4. @@ -21,6 +21,12 @@

  5.  PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);

  6.  PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);

  7.  

  8. +PyAPI_FUNC(wchar_t) Py_GetSepW(const wchar_t *);

  9. +PyAPI_FUNC(char) Py_GetSepA(const char *);

  10. +

  11. +PyAPI_FUNC(void) Py_NormalizeSepsW(wchar_t *);

  12. +PyAPI_FUNC(void) Py_NormalizeSepsA(char *);

  13. +

  14.  

  15.  /* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level

  16.   * exit functions.

  17. diff -Naur Python-3.8.0-orig/Lib/ntpath.py Python-3.8.0/Lib/ntpath.py

  18. --- Python-3.8.0-orig/Lib/ntpath.py	2019-10-14 16:34:47.000000000 +0300

  19. +++ Python-3.8.0/Lib/ntpath.py	2019-10-22 10:02:37.157712800 +0300

  20. @@ -11,9 +11,7 @@

  21.  curdir = '.'

  22.  pardir = '..'

  23.  extsep = '.'

  24. -sep = '\\'

  25.  pathsep = ';'

  26. -altsep = '/'

  27.  defpath = '.;C:\\bin'

  28.  devnull = 'nul'

  29.  

  30. @@ -23,6 +21,15 @@

  31.  import genericpath

  32.  from genericpath import *

  33.  

  34. +if sys.platform == "win32" and "MSYSTEM" in os.environ:

  35. +    sep = '/'

  36. +    altsep = '\\'

  37. +else:

  38. +    sep = '\\'

  39. +    altsep = '/'

  40. +bsep = str.encode(sep)

  41. +baltsep = str.encode(altsep)

  42. +

  43.  __all__ = ["normcase","isabs","join","splitdrive","split","splitext",

  44.             "basename","dirname","commonprefix","getsize","getmtime",

  45.             "getatime","getctime", "islink","exists","lexists","isdir","isfile",

  46. @@ -33,9 +40,27 @@

  47.  

  48.  def _get_bothseps(path):

  49.      if isinstance(path, bytes):

  50. -        return b'\\/'

  51. +        return bsep+baltsep

  52. +    else:

  53. +        return sep+altsep

  54. +

  55. +def _get_sep(path):

  56. +    if isinstance(path, bytes):

  57. +        return bsep

  58. +    else:

  59. +        return sep

  60. +

  61. +def _get_altsep(path):

  62. +    if isinstance(path, bytes):

  63. +        return baltsep

  64. +    else:

  65. +        return altsep

  66. +

  67. +def _get_colon(path):

  68. +    if isinstance(path, bytes):

  69. +        return b':'

  70.      else:

  71. -        return '\\/'

  72. +        return ':'

  73.  

  74.  # Normalize the case of a pathname and map slashes to backslashes.

  75.  # Other normalizations (such as optimizing '../' away) are not done

  76. @@ -47,9 +72,9 @@

  77.      Makes all characters lowercase and all slashes into backslashes."""

  78.      s = os.fspath(s)

  79.      if isinstance(s, bytes):

  80. -        return s.replace(b'/', b'\\').lower()

  81. +        return s.replace(baltsep, bsep).lower()

  82.      else:

  83. -        return s.replace('/', '\\').lower()

  84. +        return s.replace(altsep, sep).lower()

  85.  

  86.  

  87.  # Return whether a path is absolute.

  88. @@ -68,14 +93,9 @@

  89.  # Join two (or more) paths.

  90.  def join(path, *paths):

  91.      path = os.fspath(path)

  92. -    if isinstance(path, bytes):

  93. -        sep = b'\\'

  94. -        seps = b'\\/'

  95. -        colon = b':'

  96. -    else:

  97. -        sep = '\\'

  98. -        seps = '\\/'

  99. -        colon = ':'

  100. +    sep = _get_sep(path)

  101. +    seps = _get_bothseps(path)

  102. +    colon = _get_colon(path)

  103.      try:

  104.          if not paths:

  105.              path[:0] + sep  #23780: Ensure compatible data type even if p is null.

  106. @@ -134,14 +154,9 @@

  107.      """

  108.      p = os.fspath(p)

  109.      if len(p) >= 2:

  110. -        if isinstance(p, bytes):

  111. -            sep = b'\\'

  112. -            altsep = b'/'

  113. -            colon = b':'

  114. -        else:

  115. -            sep = '\\'

  116. -            altsep = '/'

  117. -            colon = ':'

  118. +        sep = _get_sep(p)

  119. +        altsep = _get_altsep(p)

  120. +        colon = _get_colon(p)

  121.          normp = p.replace(altsep, sep)

  122.          if (normp[0:2] == sep*2) and (normp[2:3] != sep):

  123.              # is a UNC path:

  124. @@ -195,9 +210,9 @@

  125.  def splitext(p):

  126.      p = os.fspath(p)

  127.      if isinstance(p, bytes):

  128. -        return genericpath._splitext(p, b'\\', b'/', b'.')

  129. +        return genericpath._splitext(p, bsep, baltsep, b'.')

  130.      else:

  131. -        return genericpath._splitext(p, '\\', '/', '.')

  132. +        return genericpath._splitext(p, sep, altsep, '.')

  133.  splitext.__doc__ = genericpath._splitext.__doc__

  134.  

  135.  

  136. @@ -442,15 +457,13 @@

  137.  def normpath(path):

  138.      """Normalize path, eliminating double slashes, etc."""

  139.      path = os.fspath(path)

  140. +    sep = _get_sep(path)

  141. +    altsep = _get_altsep(path)

  142.      if isinstance(path, bytes):

  143. -        sep = b'\\'

  144. -        altsep = b'/'

  145.          curdir = b'.'

  146.          pardir = b'..'

  147.          special_prefixes = (b'\\\\.\\', b'\\\\?\\')

  148.      else:

  149. -        sep = '\\'

  150. -        altsep = '/'

  151.          curdir = '.'

  152.          pardir = '..'

  153.          special_prefixes = ('\\\\.\\', '\\\\?\\')

  154. @@ -620,6 +620,7 @@

  155.                  # strip the prefix anyway.

  156.                  if ex.winerror == initial_winerror:

  157.                      path = spath

  158. +        path = normpath(path)

  159.          return path

  160.  

  161.  

  162. @@ -645,12 +658,11 @@

  163.  def relpath(path, start=None):

  164.      """Return a relative version of a path"""

  165.      path = os.fspath(path)

  166. +    sep = _get_sep(path)

  167.      if isinstance(path, bytes):

  168. -        sep = b'\\'

  169.          curdir = b'.'

  170.          pardir = b'..'

  171.      else:

  172. -        sep = '\\'

  173.          curdir = '.'

  174.          pardir = '..'

  175.  

  176. @@ -705,13 +717,11 @@

  177.          raise ValueError('commonpath() arg is an empty sequence')

  178.  

  179.      paths = tuple(map(os.fspath, paths))

  180. +    sep = _get_sep(paths[0])

  181. +    altsep = _get_altsep(paths[0])

  182.      if isinstance(paths[0], bytes):

  183. -        sep = b'\\'

  184. -        altsep = b'/'

  185.          curdir = b'.'

  186.      else:

  187. -        sep = '\\'

  188. -        altsep = '/'

  189.          curdir = '.'

  190.  

  191.      try:

  192. diff -Naur Python-3.8.0-orig/Modules/posixmodule.c Python-3.8.0/Modules/posixmodule.c

  193. --- Python-3.8.0-orig/Modules/posixmodule.c	2019-10-22 10:00:56.988936800 +0300

  194. +++ Python-3.8.0/Modules/posixmodule.c	2019-10-22 10:02:37.547713500 +0300

  195. @@ -3438,6 +3438,7 @@

  196.          return PyErr_SetFromWindowsErr(0);

  197.      }

  198.  

  199. +    Py_NormalizeSepsW(wbuf2);

  200.      PyObject *resobj = PyUnicode_FromWideChar(wbuf2, len);

  201.      if (wbuf2 != wbuf) {

  202.          PyMem_RawFree(wbuf2);

  203. @@ -3886,6 +3887,7 @@

  204.          result = GetFullPathNameW(path->wide, result, woutbufp, &wtemp);

  205.      }

  206.      if (result) {

  207. +        Py_NormalizeSepsW(woutbufp);

  208.          v = PyUnicode_FromWideChar(woutbufp, wcslen(woutbufp));

  209.          if (path->narrow)

  210.              Py_SETREF(v, PyUnicode_EncodeFSDefault(v));

  211. @@ -3962,6 +3964,7 @@

  212.          target_path = tmp;

  213.      }

  214.  

  215. +    Py_NormalizeSepsW(target_path);

  216.      result = PyUnicode_FromWideChar(target_path, result_length);

  217.      if (result && path->narrow) {

  218.          Py_SETREF(result, PyUnicode_EncodeFSDefault(result));

  219. diff -Naur Python-3.8.0-orig/Python/initconfig.c Python-3.8.0/Python/initconfig.c

  220. --- Python-3.8.0-orig/Python/initconfig.c	2019-10-14 16:34:47.000000000 +0300

  221. +++ Python-3.8.0/Python/initconfig.c	2019-10-22 10:02:37.968914200 +0300

  222. @@ -98,7 +98,7 @@

  223.  "PYTHONDEVMODE: enable the development mode.\n"

  224.  "PYTHONPYCACHEPREFIX: root directory for bytecode cache (pyc) files.\n";

  225.  

  226. -#if defined(MS_WINDOWS)

  227. +#if defined(_MSC_VER)

  228.  #  define PYTHONHOMEHELP "<prefix>\\python{major}{minor}"

  229.  #else

  230.  #  define PYTHONHOMEHELP "<prefix>/lib/pythonX.X"

  231. @@ -1129,7 +1129,7 @@

  232.      }

  233.  

  234.      /* Last fall back: hardcoded name */

  235. -#ifdef MS_WINDOWS

  236. +#ifdef _MSC_VER

  237.      const wchar_t *default_program_name = L"python";

  238.  #else

  239.      const wchar_t *default_program_name = L"python3";

  240. diff -Naur Python-3.8.0-orig/Python/pathconfig.c Python-3.8.0/Python/pathconfig.c

  241. --- Python-3.8.0-orig/Python/pathconfig.c	2019-10-14 16:34:47.000000000 +0300

  242. +++ Python-3.8.0/Python/pathconfig.c	2019-10-22 10:02:38.358914900 +0300

  243. @@ -13,6 +13,114 @@

  244.  extern "C" {

  245.  #endif

  246.  

  247. +#ifdef __MINGW32__

  248. +#define wcstok  wcstok_s

  249. +#include <windows.h>

  250. +#endif

  251. +

  252. +char

  253. +Py_GetSepA(const char *name)

  254. +{

  255. +    char* msystem = (char*)2; /* So that non Windows use / as sep */

  256. +    static char sep = '\0';

  257. +#ifdef _WIN32

  258. +    /* https://msdn.microsoft.com/en-gb/library/windows/desktop/aa365247%28v=vs.85%29.aspx

  259. +     * The "\\?\" prefix .. indicate that the path should be passed to the system with minimal

  260. +     * modification, which means that you cannot use forward slashes to represent path separators

  261. +     */

  262. +    if (name != NULL && memcmp(name, "\\\\?\\", sizeof("\\\\?\\") - sizeof(char)) == 0)

  263. +    {

  264. +        return '\\';

  265. +    }

  266. +#endif

  267. +    if (sep != '\0')

  268. +        return sep;

  269. +#if defined(__MINGW32__)

  270. +    msystem = Py_GETENV("MSYSTEM");

  271. +#endif

  272. +    if (msystem != NULL)

  273. +        sep = '/';

  274. +    else

  275. +        sep = '\\';

  276. +    return sep;

  277. +}

  278. +

  279. +static char

  280. +Py_GetAltSepA(const char *name)

  281. +{

  282. +    char sep = Py_GetSepA(name);

  283. +    if (sep == '/')

  284. +        return '\\';

  285. +    return '/';

  286. +}

  287. +

  288. +void

  289. +Py_NormalizeSepsA(char *name)

  290. +{

  291. +    char sep = Py_GetSepA(name);

  292. +    char altsep = Py_GetAltSepA(name);

  293. +    char* seps;

  294. +    if (strlen(name) > 1 && name[1] == ':') {

  295. +        name[0] = toupper(name[0]);

  296. +    }

  297. +    seps = strchr(name, altsep);

  298. +    while(seps) {

  299. +        *seps = sep;

  300. +        seps = strchr(seps, altsep);

  301. +    }

  302. +}

  303. +

  304. +wchar_t

  305. +Py_GetSepW(const wchar_t *name)

  306. +{

  307. +    char* msystem = (char*)2; /* So that non Windows use / as sep */

  308. +    static wchar_t sep = L'\0';

  309. +#ifdef _WIN32

  310. +    /* https://msdn.microsoft.com/en-gb/library/windows/desktop/aa365247%28v=vs.85%29.aspx

  311. +     * The "\\?\" prefix .. indicate that the path should be passed to the system with minimal

  312. +     * modification, which means that you cannot use forward slashes to represent path separators

  313. +     */

  314. +    if (name != NULL && memcmp(name, L"\\\\?\\", sizeof(L"\\\\?\\") - sizeof(wchar_t)) == 0)

  315. +    {

  316. +        return L'\\';

  317. +    }

  318. +#endif

  319. +    if (sep != L'\0')

  320. +        return sep;

  321. +#if defined(__MINGW32__)

  322. +    msystem = Py_GETENV("MSYSTEM");

  323. +#endif

  324. +    if (msystem != NULL)

  325. +        sep = L'/';

  326. +    else

  327. +        sep = L'\\';

  328. +    return sep;

  329. +}

  330. +

  331. +static wchar_t

  332. +Py_GetAltSepW(const wchar_t *name)

  333. +{

  334. +    char sep = Py_GetSepW(name);

  335. +    if (sep == L'/')

  336. +        return L'\\';

  337. +    return L'/';

  338. +}

  339. +

  340. +void

  341. +Py_NormalizeSepsW(wchar_t *name)

  342. +{

  343. +    wchar_t sep = Py_GetSepW(name);

  344. +    wchar_t altsep = Py_GetAltSepW(name);

  345. +    wchar_t* seps;

  346. +    if (wcslen(name) > 1 && name[1] == L':') {

  347. +        name[0] = towupper(name[0]);

  348. +    }

  349. +    seps = wcschr(name, altsep);

  350. +    while(seps) {

  351. +        *seps = sep;

  352. +        seps = wcschr(seps, altsep);

  353. +    }

  354. +}

  355.  

  356.  _PyPathConfig _Py_path_config = _PyPathConfig_INIT;

  357.  #ifdef MS_WINDOWS

  358. @@ -560,6 +668,7 @@

  359.      if (_Py_path_config.program_name == NULL) {

  360.          Py_FatalError("Py_SetProgramName() failed: out of memory");

  361.      }

  362. +    Py_NormalizeSepsW(_Py_path_config.program_name);

  363.  }

  364.  

  365.  void

  366. diff -Naur Python-3.8.0-orig/Python/traceback.c Python-3.8.0/Python/traceback.c

  367. --- Python-3.8.0-orig/Python/traceback.c	2019-10-14 16:34:47.000000000 +0300

  368. +++ Python-3.8.0/Python/traceback.c	2019-10-22 10:02:39.170116300 +0300

  369. @@ -315,7 +315,7 @@

  370.      filepath = PyBytes_AS_STRING(filebytes);

  371.  

  372.      /* Search tail of filename in sys.path before giving up */

  373. -    tail = strrchr(filepath, SEP);

  374. +    tail = strrchr(filepath, Py_GetSepA(filepath));

  375.      if (tail == NULL)

  376.          tail = filepath;

  377.      else