From fe4ca58dd6f79bcf01e3c42150904f80ab7c0f63 Mon Sep 17 00:00:00 2001 From: Alexander Baranov Date: Mon, 15 Feb 2016 14:09:05 +0300 Subject: [PATCH 1/2] Strip \n from version --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index d8bb200..aca6639 100644 --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ p = subprocess.Popen(["./genversion.sh"], stdout=subprocess.PIPE) version, err = p.communicate() +version = version.strip() print version setup( name = 'pyxrootd', From 21a058d0a53e2516cd8368705e212811f2220784 Mon Sep 17 00:00:00 2001 From: Alexander Baranov Date: Tue, 16 Feb 2016 13:50:09 +0300 Subject: [PATCH 2/2] Make setup.py work from any location --- setup.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index aca6639..6977c4b 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,8 @@ +import os +from os import getenv, walk, path + from distutils.core import setup, Extension from distutils import sysconfig -from os import getenv, walk, path import subprocess # Remove the "-Wstrict-prototypes" compiler option, which isn't valid for C++. @@ -17,14 +19,17 @@ sources = list() depends = list() -for dirname, dirnames, filenames in walk('src'): +here = os.path.abspath(os.path.dirname(__file__)) + + +for dirname, dirnames, filenames in walk(os.path.join(here, 'src')): for filename in filenames: if filename.endswith('.cc'): sources.append(path.join(dirname, filename)) elif filename.endswith('.hh'): depends.append(path.join(dirname, filename)) -p = subprocess.Popen(["./genversion.sh"], stdout=subprocess.PIPE) +p = subprocess.Popen([os.path.join(here, 'genversion.sh'), here], stdout=subprocess.PIPE) version, err = p.communicate() version = version.strip() print version @@ -38,9 +43,9 @@ description = "XRootD Python bindings", long_description = "XRootD Python bindings", packages = ['pyxrootd', 'XRootD', 'XRootD.client'], - package_dir = {'pyxrootd' : 'src', - 'XRootD' : 'libs', - 'XRootD.client': 'libs/client'}, + package_dir = {'pyxrootd' : os.path.join(here, 'src'), + 'XRootD' : os.path.join(here, 'libs'), + 'XRootD.client': os.path.join(here, 'libs/client')}, ext_modules = [ Extension( 'pyxrootd.client',