From d7e16f1b8e90945060d1df045badff0a6d9c3ad3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 31 Dec 2021 09:40:43 +0530 Subject: [PATCH] Remove build commands for 32-bit arches --- setup/commands.py | 2 +- setup/installers.py | 21 ++++----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/setup/commands.py b/setup/commands.py index 84c8eb634b..f4cba2be87 100644 --- a/setup/commands.py +++ b/setup/commands.py @@ -19,7 +19,7 @@ __all__ = [ 'upload_installers', 'upload_user_manual', 'upload_demo', 'reupload', 'stage1', 'stage2', 'stage3', 'stage4', 'stage5', 'publish', 'publish_betas', - 'linux', 'linux32', 'linux64', 'linuxarm64', 'win', 'win32', 'win64', 'osx', 'build_dep', + 'linux', 'linux64', 'linuxarm64', 'win', 'win64', 'osx', 'build_dep', 'export_packages', 'hyphenation', 'liberation_fonts', 'csslint' ] diff --git a/setup/installers.py b/setup/installers.py index e6fdb8c4a2..81d5d4570f 100644 --- a/setup/installers.py +++ b/setup/installers.py @@ -103,7 +103,8 @@ def build_dep(args): class BuildInstaller(Command): - OS = BITNESS = '' + OS = '' + BITNESS = '64' def add_options(self, parser): parser.add_option( @@ -148,7 +149,7 @@ class BuildInstaller(Command): class BuildInstallers(BuildInstaller): OS = '' - ALL_ARCHES = '64', '32' + ALL_ARCHES = '64' def run(self, opts): for bitness in self.ALL_ARCHES: @@ -156,15 +157,8 @@ class BuildInstallers(BuildInstaller): build_single(self.OS, bitness, shutdown) -class Linux32(BuildInstaller): - OS = 'linux' - BITNESS = '32' - description = 'Build the 32-bit Linux calibre installer' - - class Linux64(BuildInstaller): OS = 'linux' - BITNESS = '64' description = 'Build the 64-bit Linux calibre installer' @@ -174,15 +168,8 @@ class LinuxArm64(BuildInstaller): description = 'Build the 64-bit ARM Linux calibre installer' -class Win32(BuildInstaller): - OS = 'windows' - BITNESS = '32' - description = 'Build the 32-bit windows calibre installers' - - class Win64(BuildInstaller): OS = 'windows' - BITNESS = '64' description = 'Build the 64-bit windows calibre installer' @@ -192,7 +179,7 @@ class OSX(BuildInstaller): class Linux(BuildInstallers): OS = 'linux' - ALL_ARCHES = '64', '32', 'arm64' + ALL_ARCHES = '64', 'arm64' class Win(BuildInstallers):