From fc391d5332726e3912631be94a2239dc8d0aea7f Mon Sep 17 00:00:00 2001 From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:23:13 -0400 Subject: NMake Builder: change property name (#39824) NMake makefiles are still called makefiles. The corresponding builder variable was called "nmakefile", which is a bit unintuitive and lead to a few easy-to-make, hard-to-notice mistakes when creating packages. This commit renames the builder property to be "makefile" --- lib/spack/spack/build_systems/nmake.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/nmake.py b/lib/spack/spack/build_systems/nmake.py index 7b0f7f18ba..3349ff8929 100644 --- a/lib/spack/spack/build_systems/nmake.py +++ b/lib/spack/spack/build_systems/nmake.py @@ -95,7 +95,7 @@ class NMakeBuilder(BaseBuilder): return self.stage.source_path @property - def nmakefile_name(self): + def makefile_name(self): """Name of the current makefile. This is currently an empty value. If a project defines this value, it will be used with the /f argument to provide nmake an explicit makefile. This is usefule in scenarios where @@ -126,8 +126,8 @@ class NMakeBuilder(BaseBuilder): """Run "nmake" on the build targets specified by the builder.""" opts = self.std_nmake_args opts += self.nmake_args() - if self.nmakefile_name: - opts.append("/f {}".format(self.nmakefile_name)) + if self.makefile_name: + opts.append("/F{}".format(self.makefile_name)) with fs.working_dir(self.build_directory): inspect.getmodule(self.pkg).nmake( *opts, *self.build_targets, ignore_quotes=self.ignore_quotes @@ -139,8 +139,8 @@ class NMakeBuilder(BaseBuilder): opts = self.std_nmake_args opts += self.nmake_args() opts += self.nmake_install_args() - if self.nmakefile_name: - opts.append("/f {}".format(self.nmakefile_name)) + if self.makefile_name: + opts.append("/F{}".format(self.makefile_name)) opts.append(self.define("PREFIX", prefix)) with fs.working_dir(self.build_directory): inspect.getmodule(self.pkg).nmake( -- cgit v1.2.3-70-g09d2