| From ea7023222160e0a0d119d72f92dc1e27dbda83b2 Mon Sep 17 00:00:00 2001 |
| From: Simon Glass <sjg@chromium.org> |
| Date: Wed, 29 Mar 2017 09:39:35 -0600 |
| Subject: [PATCH v2 16/16] pylibfdt: Allow setup.py to operation stand-alone |
| |
| At present we require that setup.py is executed from the Makefile, which |
| sets up various important things like the list of files to build and the |
| version number. |
| |
| However many installation systems expect to be able to change to the |
| directory containing setup.py and run it. This allows them to support (for |
| example) building/installing for multiple Python versions, varying |
| installation paths, particular C flags, etc. |
| |
| The problem in implementing this is that we don't want to duplicate the |
| information in the Makefile. A common solution (so I am told) is to parse |
| the Makefile to obtain the required information. |
| |
| Update the setup.py script to read a few Makefiles when it does not see |
| the required information in its environment. This allows installation |
| using: |
| |
| cd pylibfdt |
| python setup.py install |
| |
| Signed-off-by: Simon Glass <sjg@chromium.org> |
| --- |
| |
| Changes in v2: |
| - Add new patch to allow setup.py to operation stand-alone |
| - Rebase to master |
| |
| README | 10 +++++- |
| pylibfdt/setup.py | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- |
| 2 files changed, 99 insertions(+), 6 deletions(-) |
| |
| diff --git a/README b/README |
| index 5add557..561a364 100644 |
| --- a/README |
| +++ b/README |
| @@ -55,7 +55,15 @@ To install the library use: |
| make install_pylibfdt SETUP_PREFIX=/path/to/install_dir |
| |
| If SETUP_PREFIX is not provided, the default prefix is used, typically '/usr' |
| -or '/usr/local'. See Python's distutils documentation for details. |
| +or '/usr/local'. See Python's distutils documentation for details. You can |
| +also install using: |
| + |
| + cd pylibfdt |
| + python setup.py install |
| + |
| +To install both libfdt and pylibfdt you can use: |
| + |
| + make install SETUP_PREFIX=/path/to/install_dir PREFIX=/path/to/install_dir |
| |
| To disable building the python library, even if swig and Python are available, |
| use: |
| diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py |
| index 9f87fe9..42c86e4 100644 |
| --- a/pylibfdt/setup.py |
| +++ b/pylibfdt/setup.py |
| @@ -2,27 +2,112 @@ |
| |
| """ |
| setup.py file for SWIG libfdt |
| +Copyright (C) 2017 Google, Inc. |
| +Written by Simon Glass <sjg@chromium.org> |
| |
| Files to be built into the extension are provided in SOURCES |
| C flags to use are provided in CPPFLAGS |
| Object file directory is provided in OBJDIR |
| Version is provided in VERSION |
| + |
| +If these variables are not given they are parsed from the Makefiles. This |
| +allows this script to be run stand-alone, e.g.: |
| + |
| + cd pylibfdt |
| + python setup.py install [--prefix=...] |
| """ |
| |
| from distutils.core import setup, Extension |
| import os |
| +import re |
| import sys |
| |
| +# Decodes a Makefile assignment line into key and value (and plus for +=) |
| +RE_KEY_VALUE = re.compile('(?P<key>\w+) *(?P<plus>[+])?= *(?P<value>.*)$') |
| + |
| + |
| +def ParseMakefile(fname): |
| + """Parse a Makefile to obtain its variables. |
| + |
| + This collects variable assigments of the form: |
| + |
| + VAR = value |
| + VAR += more |
| + |
| + It does not pick out := assignments, as these are not needed here. It does |
| + handle line continuation. |
| + |
| + Returns a dict: |
| + key: Variable name (e.g. 'VAR') |
| + value: Variable value (e.g. 'value more') |
| + """ |
| + makevars = {} |
| + with open(fname) as fd: |
| + prev_text = '' # Continuation text from previous line(s) |
| + for line in fd.read().splitlines(): |
| + if line and line[-1] == '\\': # Deal with line continuation |
| + prev_text += line[:-1] |
| + continue |
| + elif prev_text: |
| + line = prev_text + line |
| + prev_text = '' # Continuation is now used up |
| + m = RE_KEY_VALUE.match(line) |
| + if m: |
| + value = m.group('value') or '' |
| + key = m.group('key') |
| + |
| + # Appending to a variable inserts a space beforehand |
| + if 'plus' in m.groupdict() and key in makevars: |
| + makevars[key] += ' ' + value |
| + else: |
| + makevars[key] = value |
| + return makevars |
| + |
| +def GetEnvFromMakefiles(): |
| + """Scan the Makefiles to obtain the settings we need. |
| + |
| + This assumes that this script is being run from the pylibfdt directory. |
| + |
| + Returns: |
| + Tuple with: |
| + List of swig options |
| + Version string |
| + List of files to build |
| + List of extra C preprocessor flags needed |
| + Object directory to use (always '') |
| + """ |
| + basedir = os.path.dirname(os.getcwd()) |
| + swig_opts = ['-I%s' % basedir] |
| + makevars = ParseMakefile(os.path.join(basedir, 'Makefile')) |
| + version = '%s.%s.%s' % (makevars['VERSION'], makevars['PATCHLEVEL'], |
| + makevars['SUBLEVEL']) |
| + makevars = ParseMakefile(os.path.join(basedir, 'libfdt', 'Makefile.libfdt')) |
| + files = makevars['LIBFDT_SRCS'].split() |
| + files = [os.path.join(basedir, 'libfdt', fname) for fname in files] |
| + files.append('libfdt.i') |
| + cflags = ['-I%s' % basedir, '-I%s/libfdt' % basedir] |
| + objdir = '' |
| + return swig_opts, version, files, cflags, objdir |
| + |
| + |
| progname = sys.argv[0] |
| -files = os.environ['SOURCES'].split() |
| -cflags = os.environ['CPPFLAGS'].split() |
| -objdir = os.environ['OBJDIR'] |
| -version = os.environ['VERSION'] |
| +files = os.environ.get('SOURCES', '').split() |
| +cflags = os.environ.get('CPPFLAGS', '').split() |
| +objdir = os.environ.get('OBJDIR') |
| +version = os.environ.get('VERSION') |
| +swig_opts = [] |
| + |
| +# If we were called directly rather than through our Makefile (which is often |
| +# the case with Python module installation), read the settings from the |
| +# Makefile. |
| +if not all((version, files, cflags, objdir)): |
| + swig_opts, version, files, cflags, objdir = GetEnvFromMakefiles() |
| |
| libfdt_module = Extension( |
| '_libfdt', |
| sources = files, |
| - extra_compile_args = cflags |
| + extra_compile_args = cflags, |
| + swig_opts = swig_opts, |
| ) |
| |
| setup (name = 'libfdt', |
| -- |
| 2.12.2.564.g063fe858b8-goog |
| |