Re: [PATCH 5/6] setup: Move setting of srcdir down to the bottom

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 1979 bytes --]

On Sun, Aug 11, 2024 at 09:02:47AM -0600, Simon Glass wrote:
> Put this variable assignment next to the others. Pass it to
> get_top_builddir() instead of relying on the global variable.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied, thanks.

> ---
> 
>  setup.py | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/setup.py b/setup.py
> index be3cf90..52844ce 100755
> --- a/setup.py
> +++ b/setup.py
> @@ -14,8 +14,6 @@ from setuptools import setup, Extension
>  from setuptools.command.build_py import build_py as _build_py
>  
>  
> -srcdir = os.path.dirname(__file__)
> -
>  def scan_for_info(srcdir):
>      """Scan for the version and long_description fields
>  
> @@ -35,9 +33,12 @@ def scan_for_info(srcdir):
>      return version, long_description
>  
>  
> -def get_top_builddir():
> +def get_top_builddir(srcdir):
>      """Figure out the top-level directory containing the source code
>  
> +    Args:
> +        srcdir (str): Source-directory path
> +
>      Returns:
>          str: Directory to build in
>      """
> @@ -55,8 +56,8 @@ class BuildPy(_build_py):
>          return super().run()
>  
>  
> +srcdir = os.path.dirname(__file__)
>  version, long_description = scan_for_info(srcdir)
> -top_builddir = get_top_builddir()
>  
>  libfdt_module = Extension(
>      '_libfdt',
> @@ -64,7 +65,7 @@ libfdt_module = Extension(
>      define_macros=[('PY_SSIZE_T_CLEAN', None)],
>      include_dirs=[os.path.join(srcdir, 'libfdt')],
>      libraries=['fdt'],
> -    library_dirs=[os.path.join(top_builddir, 'libfdt')],
> +    library_dirs=[os.path.join(get_top_builddir(srcdir), 'libfdt')],
>      swig_opts=['-I' + os.path.join(srcdir, 'libfdt')],
>  )
>  

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]