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 4bbb0ec718f69ea6b6694b65fe625b92ae18eea3..13cc2bccddd1155a207e467c219f3af3cae0b291 100644 (file)
--- 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 7065f8520c908fe026e248a97cc5c57bfda552d8..b0d429dd2d6fd5c3bd20ba89936ea0e0076cf098 100755 (executable)
--- 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 7065f8520c908fe026e248a97cc5c57bfda552d8..b0d429dd2d6fd5c3bd20ba89936ea0e0076cf098 100755 (executable)
--- 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 b8b4036e8f25ce2004e2983c75f879c4c733058a..124d7d7beffa97e422c2545320340e5c45c99c95 100644 (file)
--- 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 d45ae168d5ca5e70b465170000ac7f1837395d54..5eca583426492853f41e80125acc13521b5521ee 100755 (executable)
--- 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 4ef3d03030318a37fe05ba54b6ae3a3a62b56bfd..137fc4ed27bacc5f4db5b82600047fa4a4f89989 100755 (executable)
--- 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}"