Use abspath when installing data files.

tonyroberts · tonyroberts · commit 04579d6609f1 · 2015-06-24T19:16:22.000+01:00
No need to copy Python.Runtime.dll for unittests, it should be
installed as part of installing the wheel.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,10 +1,6 @@
 os: Windows Server 2012
 
-environment:
-  global:
-    PYTHONPATH: c:\testdir
-
-  matrix:
+matrix:
   - pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
   - pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
   - pythonurl: http://www.python.org/ftp/python/2.6.6/python-2.6.6.msi
@@ -25,7 +21,5 @@ build_script:
 
 test_script:
   - ps: C:\python\scripts\pip.exe install ("dist\" + (gci dist)[0].Name)
-  - mkdir c:\testdir
-  - ps: copy-item (gci -path build -re -include Python.Test.dll)[0].FullName c:\testdir
   - c:\python\python.exe src\tests\runtests.py
   - c:\python\scripts\npython.exe src\tests\runtests.py
diff --git a/setup.py b/setup.py
@@ -242,16 +242,17 @@ class PythonNET_InstallData(install_data):
     def run(self):
         build_cmd = self.get_finalized_command("build_ext")
         install_lib_cmd = self.get_finalized_command("install_lib")
+        build_dir = os.path.abspath(build_cmd.build_lib)
+        install_dir = os.path.abspath(install_lib_cmd.install_dir)
 
         for i, data_files in enumerate(self.data_files):
             if isinstance(data_files, str):
-                self.data_files[i] = data_files[i].replace("BUILD_DIR", build_cmd.build_lib)
+                self.data_files[i] = data_files[i].replace("BUILD_DIR", build_dir)
             else:
                 for j, filename in enumerate(data_files[1]):
-                    data_files[1][j] = filename.replace("BUILD_DIR", build_cmd.build_lib)
-                dest = data_files[0].replace("INSTALL_DIR", install_lib_cmd.install_dir)
+                    data_files[1][j] = filename.replace("BUILD_DIR", build_dir)
+                dest = data_files[0].replace("INSTALL_DIR", install_dir)
                 self.data_files[i] = dest, data_files[1]
-        print(self.data_files)
 
         return install_data.run(self)
  
