From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 17 Oct 2017 00:34:23 +0000 (-0400)
Subject: Remove linux 32bit binary support.
X-Git-Tag: xonotic-v0.8.5~190
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2d25ba3ea003813c844a6c4a15a6455e0d1a27dd;p=xonotic%2Fxonotic.git

Remove linux 32bit binary support.

Linux 32bit users can still compile using ./all but releases will no
longer include these builds.

Reference: http://xonpickbot.designxenon.com:27500/poll/364
---

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 4bbb0ec7..13cc2bcc 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -130,7 +130,6 @@ case "$cmd" in
 				# - .ssh/config must be configured so the following
 				#   host names are reachable and have a compile
 				#   infrastructure set up:
-				#   - xonotic-build-linux32 (with gcc on x86)
 				#   - xonotic-build-linux64 (with gcc on x86_64)
 				#   - xonotic-build-win32 (with i586-mingw32msvc-g++)
 				#   - xonotic-build-win64 (with amd64-mingw32msvc-g++
@@ -241,14 +240,6 @@ case "$cmd" in
 		verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
 		$good
 		;;
-	release-engine-linux32)
-		release_common
-		good=true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || good=false
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || good=false
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || good=false
-		$good
-		;;
 	release-engine-linux64)
 		release_common
 		good=true
@@ -261,7 +252,6 @@ case "$cmd" in
 		release_common
 		# TODO report failures here.
 		good=false
-		verbose "$SELF" release-engine-linux32 && good=true
 		verbose "$SELF" release-engine-linux64 && good=true
 		verbose "$SELF" release-engine-win32 && good=true
 		verbose "$SELF" release-engine-win64 && good=true
diff --git a/misc/tools/rsync-updater/update-to-autobuild.sh b/misc/tools/rsync-updater/update-to-autobuild.sh
index 7065f852..b0d429dd 100755
--- a/misc/tools/rsync-updater/update-to-autobuild.sh
+++ b/misc/tools/rsync-updater/update-to-autobuild.sh
@@ -72,17 +72,8 @@ if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
 			excludes="$excludes --exclude=/Xonotic*.app"
 			excludes="$excludes --exclude=/xonotic-osx-*"
 			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
-			if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
-				excludes="$excludes --exclude=/xonotic-linux32-*"
-				excludes="$excludes --exclude=/gmqcc/gmqcc.linux32"
-			fi
-			;;
-		Linux:i?86)
-			excludes="$excludes --exclude=/Xonotic*.app"
-			excludes="$excludes --exclude=/xonotic-osx-*"
-			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
-			excludes="$excludes --exclude=/xonotic-linux64-*"
-			excludes="$excludes --exclude=/gmqcc/gmqcc.linux64"
+			excludes="$excludes --exclude=/xonotic-linux32-*"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.linux32"
 			;;
 		*)
 			echo >&2 "WARNING: Could not detect architecture - downloading all architectures"
diff --git a/misc/tools/rsync-updater/update-to-release.sh b/misc/tools/rsync-updater/update-to-release.sh
index 7065f852..b0d429dd 100755
--- a/misc/tools/rsync-updater/update-to-release.sh
+++ b/misc/tools/rsync-updater/update-to-release.sh
@@ -72,17 +72,8 @@ if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
 			excludes="$excludes --exclude=/Xonotic*.app"
 			excludes="$excludes --exclude=/xonotic-osx-*"
 			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
-			if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
-				excludes="$excludes --exclude=/xonotic-linux32-*"
-				excludes="$excludes --exclude=/gmqcc/gmqcc.linux32"
-			fi
-			;;
-		Linux:i?86)
-			excludes="$excludes --exclude=/Xonotic*.app"
-			excludes="$excludes --exclude=/xonotic-osx-*"
-			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
-			excludes="$excludes --exclude=/xonotic-linux64-*"
-			excludes="$excludes --exclude=/gmqcc/gmqcc.linux64"
+			excludes="$excludes --exclude=/xonotic-linux32-*"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.linux32"
 			;;
 		*)
 			echo >&2 "WARNING: Could not detect architecture - downloading all architectures"
diff --git a/release.cmake b/release.cmake
index b8b4036e..124d7d7b 100644
--- a/release.cmake
+++ b/release.cmake
@@ -67,10 +67,6 @@ if (0)
     getbinary(Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin) # +x
     getbinary(Xonotic/xonotic-osx-dedicated) # +x
 
-    getbinary(Xonotic/xonotic-linux32-sdl) # +x
-    getbinary(Xonotic/xonotic-linux32-glx) # +x
-    getbinary(Xonotic/xonotic-linux32-dedicated) # +x
-
     getbinary(Xonotic/xonotic-linux64-sdl) # +x
     getbinary(Xonotic/xonotic-linux64-glx) # +x
     getbinary(Xonotic/xonotic-linux64-dedicated) # +x
diff --git a/server/server_linux.sh b/server/server_linux.sh
index d45ae168..5eca5834 100755
--- a/server/server_linux.sh
+++ b/server/server_linux.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 case "$(uname -m)" in
-  x86_64)	executable="xonotic-linux64-dedicated" ;;
-  *)		executable="xonotic-linux32-dedicated" ;;
+  i?86)	executable="xonotic-linux32-dedicated" ;;  # Not supported anymore but you can build your own.
+  *)	executable="xonotic-linux64-dedicated" ;;
 esac
 
 cd "`dirname "${0}"`"
diff --git a/xonotic-linux-glx.sh b/xonotic-linux-glx.sh
index 4ef3d030..137fc4ed 100755
--- a/xonotic-linux-glx.sh
+++ b/xonotic-linux-glx.sh
@@ -13,8 +13,8 @@ case "${0##*/}" in
 esac
 
 case "$(uname -m)" in
-  x86_64)	arch="linux64" ;;
-  *)		arch="linux32" ;;
+  i?86)	arch="linux32" ;;  # Not supported anymore but you can build your own.
+  *)	arch="linux64" ;;
 esac
 
 xonotic="xonotic-${arch}-${mode}"