From: Christoph Egger Subject: [PATCH] Fix search pathes in python code Date: Tue, 21 Apr 2009 17:18:59 +0200 Message-ID: <200904211718.59770.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_jPe7JERB3itkYeW" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Keir Fraser List-Id: xen-devel@lists.xenproject.org --Boundary-00=_jPe7JERB3itkYeW Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, Attached patch gets rid of hardcoded search pathes in python code. Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_jPe7JERB3itkYeW Content-Type: text/x-diff; charset="us-ascii"; name="xen_auxbin.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_auxbin.diff" diff -r 69ba67bdbf93 tools/python/Makefile --- a/tools/python/Makefile Mon Apr 20 15:38:29 2009 +0100 +++ b/tools/python/Makefile Tue Apr 21 17:12:21 2009 +0200 @@ -13,9 +13,18 @@ POTFILE := $(PODIR)/xen-xm.pot I18NSRCFILES = $(shell find xen/xm/ -name '*.py') CATALOGS = $(patsubst %,xen/xm/messages/%.mo,$(LINGUAS)) NLSDIR = $(SHAREDIR)/locale +xenpath = "xen/util/path.py" -.PHONY: build buildpy -buildpy: +.PHONY: build buildpy genpath +genpath: + rm -f ${xenpath} + echo "SBINDIR=\"$(SBINDIR)\"" >> ${xenpath} + echo "BINDIR=\"$(BINDIR)\"" >> ${xenpath} + echo "LIBEXEC=\"$(LIBEXEC)\"" >> ${xenpath} + echo "LIBDIR=\"$(LIBDIR)\"" >> ${xenpath} + echo "PRIVATE_BINDIR=\"$(PRIVATE_BINDIR)\"" >> ${xenpath} + +buildpy: genpath CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build build: buildpy refresh-pot refresh-po $(CATALOGS) diff -r 69ba67bdbf93 tools/python/xen/util/auxbin.py --- a/tools/python/xen/util/auxbin.py Mon Apr 20 15:38:29 2009 +0100 +++ b/tools/python/xen/util/auxbin.py Tue Apr 21 17:12:21 2009 +0200 @@ -16,19 +16,10 @@ #============================================================================ -LIB_32 = "/usr/lib" -LIB_64 = "/usr/lib64" -LIB_BIN_SUFFIX = "xen/bin" - -## The architectures on which the LIB_64 directory is used. This -# deliberately excludes ia64 and ppc64, and Solaris. -LIB_64_ARCHS = [ 'x86_64', 's390x', 'sparc64'] - - import os import os.path import sys - +from xen.util.path import SBINDIR,BINDIR,LIBEXEC,LIBDIR,PRIVATE_BINDIR def execute(exe, args = None): exepath = pathTo(exe) @@ -41,26 +32,16 @@ def execute(exe, args = None): print exepath, ": ", exn sys.exit(1) - -def pathTo(exe): - return os.path.join(path(), exe) - +SEARCHDIRS = [ BINDIR, SBINDIR, LIBEXEC, PRIVATE_BINDIR ] +def pathTo(exebin): + for dir in SEARCHDIRS: + exe = os.path.join(dir, exebin) + if os.path.exists(exe): + return exe + return None def path(): - return os.path.join(libpath(), LIB_BIN_SUFFIX) - + return LIBEXEC def libpath(): - machine = os.uname()[4] - if sys.argv[0] != '-c': - prefix = os.path.dirname(os.path.dirname(sys.argv[0])) - path = os.path.join(prefix, os.path.basename(LIB_64)) - if machine in LIB_64_ARCHS and os.path.exists(path): - return path - path = os.path.join(prefix, os.path.basename(LIB_32)) - if os.path.exists(path): - return path - if machine in LIB_64_ARCHS and os.path.exists(LIB_64): - return LIB_64 - else: - return LIB_32 + return LIBDIR --Boundary-00=_jPe7JERB3itkYeW Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_jPe7JERB3itkYeW--