Fix PY27 dll mapping in Linux/macOS

vmuriart · vmuriart · commit 9650e8bee890 · 2017-03-01T11:15:09.000-07:00
On 5062377 this was fixed for PY3 but left unchanged for PY2. On linux/macOS the library is aliased `python2.7` while in windows its `python 27`. Since internally it wasn't mapped to the correct library in Linux/macOS, we had to remap it again using the dll.config file. Closes #120
diff --git a/.travis.yml b/.travis.yml
@@ -40,8 +40,6 @@ install:
 
 script:
   - python -m pytest
-
-  - cp Python.Runtime.dll.config src/embed_tests/bin/
   - mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
 
 after_script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,12 +49,14 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed fixture location for Python tests and `Embedded_Tests`
 -   Fixed `PythonException` crash during Shutdown (#400)
 -   Fixed `AppDomain` unload during GC (#397)(#400)
--   Fixed `Py_Main` & `PySys_SetArgvEx` no mem error on `UCS4/PY3` (#399)
+-   Fixed `Py_Main` & `PySys_SetArgvEx` `no mem error` on `UCS4/PY3` (#399)
+-   Fixed `Python.Runtime.dll.config` on macOS (#120)
 
 ### Removed
 
 -   Removed `six` dependency for `unittests` (#329)
 -   Removed `Mono.Unix` dependency for `UCS4` (#360)
+-   Removed need for `Python.Runtime.dll.config`
 
 ## [2.2.2][] - 2017-01-29
 
@@ -64,7 +66,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 
 ## [2.2.1][] - 2017-01-26
 
--   `v2.2.0` had a release issue on pypi. Bumped to `v2.2.1`
+-   `v2.2.0` had a release issue on PyPi. Bumped to `v2.2.1`
 
 ### Added
 
diff --git a/Python.Runtime.dll.config b/Python.Runtime.dll.config
diff --git a/setup.py b/setup.py
@@ -104,7 +104,7 @@ def _get_interop_filename():
 
 def _get_source_files():
     """Walk project and collect the files needed for ext_module"""
-    for ext in (".sln", ".config"):
+    for ext in (".sln", ):
         for path in glob.glob("*" + ext):
             yield path
 
@@ -381,7 +381,7 @@ def run(self):
     data_files=[
         ("{install_platlib}", [
             "{build_lib}/Python.Runtime.dll",
-            "Python.Runtime.dll.config"]),
+        ]),
     ],
     cmdclass={
         "build_ext": BuildExtPythonnet,
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -124,7 +124,7 @@ public class Runtime
 
 #if MONO_LINUX || MONO_OSX
 #if PYTHON27
-        internal const string dllBase = "python27";
+        internal const string dllBase = "python2.7";
 #elif PYTHON33
         internal const string dllBase = "python3.3";
 #elif PYTHON34
