From b82d027b457db00b1a48ca225444d9c977cfc6f9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 30 Aug 2016 09:48:10 -0400 Subject: [PATCH] Utilities/Release: Drop Linux 32-bit binary The Linux distro we've been using for this is so old that it limits our ability to import newer third-party software. Until a new machine can be configured to provide this binary we can simply drop it. Users will still be able to build from source or use a distro-provided version. --- Help/release/dev/drop-linux-i386-binary.rst | 5 ++++ Tests/CMakeLists.txt | 2 -- Utilities/Release/create-cmake-release.cmake | 1 - Utilities/Release/linux32_release.cmake | 25 -------------------- 4 files changed, 5 insertions(+), 28 deletions(-) create mode 100644 Help/release/dev/drop-linux-i386-binary.rst delete mode 100644 Utilities/Release/linux32_release.cmake diff --git a/Help/release/dev/drop-linux-i386-binary.rst b/Help/release/dev/drop-linux-i386-binary.rst new file mode 100644 index 000000000..60aa74e28 --- /dev/null +++ b/Help/release/dev/drop-linux-i386-binary.rst @@ -0,0 +1,5 @@ +drop-linux-i386-binary +---------------------- + +* We no longer provide Linux i386 binaries for download from ``cmake.org`` + for new versions of CMake. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c119cfdcf..4e9b06268 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -676,8 +676,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release win64_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX osx_release.cmake) - ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 - linux32_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 linux64_release.cmake) set_property(TEST CMakeNightlyWin64 PROPERTY DEPENDS CMakeNightlyWin32) diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index f8844e9ef..192549ebc 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -8,7 +8,6 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs) set(RELEASE_SCRIPTS_BATCH_1 win32_release.cmake # Windows x86 osx_release.cmake # OS X x86_64 - linux32_release.cmake # Linux x86 linux64_release.cmake # Linux x86_64 ) diff --git a/Utilities/Release/linux32_release.cmake b/Utilities/Release/linux32_release.cmake deleted file mode 100644 index 4ef513ebc..000000000 --- a/Utilities/Release/linux32_release.cmake +++ /dev/null @@ -1,25 +0,0 @@ -set(PROCESSORS 1) -set(BOOTSTRAP_ARGS "--docdir=doc/cmake") -set(HOST magrathea) -set(MAKE_PROGRAM "make") -set(CC gcc332s) -set(CXX c++332s) -set(CFLAGS -DDT_RUNPATH=29) -set(CXXFLAGS -DDT_RUNPATH=29) -set(INITIAL_CACHE " -CMAKE_BUILD_TYPE:STRING=Release -CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a -CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses -FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a -CMAKE_USE_OPENSSL:BOOL=ON -OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2h/include -OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libssl.a -CPACK_SYSTEM_NAME:STRING=Linux-i386 -BUILD_QtDialog:BOOL:=TRUE -CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=2.1 -CMake_INSTALL_DEPENDENCIES:BOOL=ON -QT_QMAKE_EXECUTABLE:FILEPATH=/home/kitware/qt-4.43-install/bin/qmake -") -get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${path}/release_cmake.cmake)