From c0c9402e63eca6ef2b53cd588cafdd75faf0554e Mon Sep 17 00:00:00 2001 From: Twangboy Date: Fri, 16 Dec 2022 08:00:13 -0700 Subject: [PATCH] Add ability to build all binaries. SALT_BUILD_ALL_BINS --- setup.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index eed248fe932..ec62c2ff8c3 100755 --- a/setup.py +++ b/setup.py @@ -832,6 +832,9 @@ class SaltDistribution(distutils.dist.Distribution): * salt-cloud * salt-run + To build all binaries on Windows set the SALT_BUILD_ALL_BINS environment + variable to `1` + Under *nix, all scripts should be installed """ @@ -1061,13 +1064,13 @@ class SaltDistribution(distutils.dist.Distribution): ] if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: data_files[0][1].append("doc/man/salt-ssh.1") - if IS_WINDOWS_PLATFORM: + if IS_WINDOWS_PLATFORM and not os.environ.get("SALT_BUILD_ALL_BINS"): return data_files data_files[0][1].append("doc/man/salt-cloud.1") return data_files - if IS_WINDOWS_PLATFORM: + if IS_WINDOWS_PLATFORM and not os.environ.get("SALT_BUILD_ALL_BINS"): data_files[0][1].extend( [ "doc/man/salt-cp.1", @@ -1141,12 +1144,12 @@ class SaltDistribution(distutils.dist.Distribution): scripts = ["scripts/salt-call"] if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: scripts.append("scripts/salt-ssh") - if IS_WINDOWS_PLATFORM: + if IS_WINDOWS_PLATFORM and not os.environ.get("SALT_BUILD_ALL_BINS"): return scripts scripts.extend(["scripts/salt-cloud", "scripts/spm"]) return scripts - if IS_WINDOWS_PLATFORM: + if IS_WINDOWS_PLATFORM and not os.environ.get("SALT_BUILD_ALL_BINS"): scripts.extend( [ "scripts/salt-cp", @@ -1187,13 +1190,13 @@ class SaltDistribution(distutils.dist.Distribution): ] if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: scripts.append("salt-ssh = salt.scripts:salt_ssh") - if IS_WINDOWS_PLATFORM: + if IS_WINDOWS_PLATFORM and not os.environ.get("SALT_BUILD_ALL_BINS"): return {"console_scripts": scripts} scripts.append("salt-cloud = salt.scripts:salt_cloud") entrypoints["console_scripts"] = scripts return entrypoints - if IS_WINDOWS_PLATFORM: + if IS_WINDOWS_PLATFORM and not os.environ.get("SALT_BUILD_ALL_BINS"): scripts.extend( [ "salt-cp = salt.scripts:salt_cp",