From dd630075448f6aa45c0e51444365feb73701ebbd Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 16 Mar 2016 16:40:24 -0400 Subject: Utilities/Release: Rename scripts to match target platform The machine name we happen to use for the build is less informative than its platform. --- Tests/CMakeLists.txt | 8 +++---- Utilities/Release/bigmac_release.cmake | 32 --------------------------- Utilities/Release/create-cmake-release.cmake | 8 +++---- Utilities/Release/cygwin_release.cmake | 32 +++++++++++++++++++++++++++ Utilities/Release/dash2win64_cygwin.cmake | 33 ---------------------------- Utilities/Release/dash3win7_release.cmake | 28 ----------------------- Utilities/Release/linux32_release.cmake | 25 +++++++++++++++++++++ Utilities/Release/magrathea_release.cmake | 25 --------------------- Utilities/Release/osx_release.cmake | 32 +++++++++++++++++++++++++++ Utilities/Release/win32_release.cmake | 28 +++++++++++++++++++++++ 10 files changed, 125 insertions(+), 126 deletions(-) delete mode 100644 Utilities/Release/bigmac_release.cmake create mode 100644 Utilities/Release/cygwin_release.cmake delete mode 100644 Utilities/Release/dash2win64_cygwin.cmake delete mode 100644 Utilities/Release/dash3win7_release.cmake create mode 100644 Utilities/Release/linux32_release.cmake delete mode 100644 Utilities/Release/magrathea_release.cmake create mode 100644 Utilities/Release/osx_release.cmake create mode 100644 Utilities/Release/win32_release.cmake diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 76ea5b4..c14008f 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -684,12 +684,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release endif() endmacro() if(CMAKE_BUILD_NIGHTLY_RELEASES) - ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows - dash3win7_release.cmake) + ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32 + win32_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX - bigmac_release.cmake) + osx_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 - magrathea_release.cmake) + linux32_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 linux64_release.cmake) endif() diff --git a/Utilities/Release/bigmac_release.cmake b/Utilities/Release/bigmac_release.cmake deleted file mode 100644 index 568a98c..0000000 --- a/Utilities/Release/bigmac_release.cmake +++ /dev/null @@ -1,32 +0,0 @@ -set(PROCESSORS 4) -set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) -set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") -set(HOST bigmac) -set(MAKE_PROGRAM "make") -set(MAKE "${MAKE_PROGRAM} -j5") -set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") -set(CPACK_SOURCE_GENERATORS "TGZ TZ") -set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size -set(CC clang) -set(CXX clang++) -set(CFLAGS "") -set(CXXFLAGS "-stdlib=libc++") -set(INITIAL_CACHE " -CMAKE_BUILD_TYPE:STRING=Release -CMAKE_OSX_ARCHITECTURES:STRING=x86_64 -CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 -CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE -CPACK_SYSTEM_NAME:STRING=Darwin-x86_64 -BUILD_QtDialog:BOOL=TRUE -CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE -CMake_INSTALL_DEPENDENCIES:BOOL=ON -CMAKE_SKIP_RPATH:BOOL=TRUE -CMake_NO_C_STANDARD:BOOL=TRUE -CMake_NO_CXX_STANDARD:BOOL=TRUE -CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE -") -set(ENV [[ -export CMAKE_PREFIX_PATH='/Users/kitware/dashboards/support/Qt-5.5.1' -]]) -get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index 403367b..f440519 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -6,14 +6,14 @@ endif() file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs) set(RELEASE_SCRIPTS_BATCH_1 - dash3win7_release.cmake # Windows - bigmac_release.cmake # OS X x86_64 - magrathea_release.cmake # Linux + win32_release.cmake # Windows x86 + osx_release.cmake # OS X x86_64 + linux32_release.cmake # Linux x86 linux64_release.cmake # Linux x86_64 ) set(RELEASE_SCRIPTS_BATCH_2 - dash2win64_cygwin.cmake # Cygwin + cygwin_release.cmake # Cygwin x86 ) function(write_batch_shell_script filename) diff --git a/Utilities/Release/cygwin_release.cmake b/Utilities/Release/cygwin_release.cmake new file mode 100644 index 0000000..ca3e794 --- /dev/null +++ b/Utilities/Release/cygwin_release.cmake @@ -0,0 +1,32 @@ +set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseCygwin") +set(PROCESSORS 9) +set(BOOTSTRAP_ARGS "") +set(MAKE_PROGRAM "make") +set(MAKE "${MAKE_PROGRAM} -j8") +set(HOST dash2win64) +set(CPACK_BINARY_GENERATORS "CygwinBinary") +set(CPACK_SOURCE_GENERATORS "CygwinSource") +set(MAKE_PROGRAM "make") +set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release +CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE +CTEST_TEST_TIMEOUT:STRING=7200 +DART_TESTING_TIMEOUT:STRING=7200 +SPHINX_HTML:BOOL=ON +SPHINX_MAN:BOOL=ON +CMake_INSTALL_DEPENDENCIES:BOOL=ON +") +set(CXX g++) +set(CC gcc) +set(GIT_EXTRA "git config core.autocrlf false") +get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) + +# WARNING: Temporary fix!! This exclusion of the ExternalProject test +# is temporary until we can set up a new cygwin build machine. +# It only fails because of cygwin/non-cygwin "svn" mismatches in this +# particular environment. This is less than ideal, but at least it +# allows us to produce cygwin builds in the short term. +set(EXTRA_CTEST_ARGS "-E ExternalProject") + +set(LOCAL_DIR cygwin) + +include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake deleted file mode 100644 index ca590ed..0000000 --- a/Utilities/Release/dash2win64_cygwin.cmake +++ /dev/null @@ -1,33 +0,0 @@ -set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseCygwin") -set(PROCESSORS 9) -set(BOOTSTRAP_ARGS "") -set(MAKE_PROGRAM "make") -set(MAKE "${MAKE_PROGRAM} -j8") -set(HOST dash2win64) -set(CPACK_BINARY_GENERATORS "CygwinBinary") -set(CPACK_SOURCE_GENERATORS "CygwinSource") -set(MAKE_PROGRAM "make") -set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release -CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE -CTEST_TEST_TIMEOUT:STRING=7200 -DART_TESTING_TIMEOUT:STRING=7200 -SPHINX_HTML:BOOL=ON -SPHINX_MAN:BOOL=ON -CMake_INSTALL_DEPENDENCIES:BOOL=ON -") -set(CXX g++) -set(CC gcc) -set(SCRIPT_NAME dash2win64cygwin) -set(GIT_EXTRA "git config core.autocrlf false") -get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) - -# WARNING: Temporary fix!! This exclusion of the ExternalProject test -# is temporary until we can set up a new cygwin build machine. -# It only fails because of cygwin/non-cygwin "svn" mismatches in this -# particular environment. This is less than ideal, but at least it -# allows us to produce cygwin builds in the short term. -set(EXTRA_CTEST_ARGS "-E ExternalProject") - -set(LOCAL_DIR cygwin) - -include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/dash3win7_release.cmake b/Utilities/Release/dash3win7_release.cmake deleted file mode 100644 index f25d638..0000000 --- a/Utilities/Release/dash3win7_release.cmake +++ /dev/null @@ -1,28 +0,0 @@ -set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory") -set(CONFIGURE_WITH_CMAKE TRUE) -set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake/bin/cmake.exe") -set(PROCESSORS 8) -set(HOST dash3win7) -set(RUN_LAUNCHER ~/rel/run) -set(CPACK_BINARY_GENERATORS "WIX ZIP") -set(CPACK_SOURCE_GENERATORS "ZIP") -set(MAKE_PROGRAM "ninja") -set(MAKE "${MAKE_PROGRAM} -j8") -set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release -CMAKE_DOC_DIR:STRING=doc/cmake -CMAKE_USE_OPENSSL:BOOL=OFF -CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE -CMAKE_Fortran_COMPILER:FILEPATH=FALSE -CMAKE_GENERATOR:INTERNAL=Ninja -BUILD_QtDialog:BOOL:=TRUE -CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE -CMake_INSTALL_DEPENDENCIES:BOOL=ON -CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x86 -subsystem:console,5.01 -") -set(ppflags "-D_WIN32_WINNT=0x501 -D_USING_V110_SDK71_") -set(CFLAGS "${ppflags}") -set(CXXFLAGS "${ppflags}") -set(ENV ". ~/rel/env") -get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) -set(GIT_EXTRA "git config core.autocrlf true") -include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/linux32_release.cmake b/Utilities/Release/linux32_release.cmake new file mode 100644 index 0000000..00abcc1 --- /dev/null +++ b/Utilities/Release/linux32_release.cmake @@ -0,0 +1,25 @@ +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.2f/lib/libcrypto.a +OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2f/include +OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libssl.a +CPACK_SYSTEM_NAME:STRING=Linux-i386 +BUILD_QtDialog:BOOL:=TRUE +CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE +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) diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake deleted file mode 100644 index 00abcc1..0000000 --- a/Utilities/Release/magrathea_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.2f/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2f/include -OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libssl.a -CPACK_SYSTEM_NAME:STRING=Linux-i386 -BUILD_QtDialog:BOOL:=TRUE -CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE -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) diff --git a/Utilities/Release/osx_release.cmake b/Utilities/Release/osx_release.cmake new file mode 100644 index 0000000..568a98c --- /dev/null +++ b/Utilities/Release/osx_release.cmake @@ -0,0 +1,32 @@ +set(PROCESSORS 4) +set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) +set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") +set(HOST bigmac) +set(MAKE_PROGRAM "make") +set(MAKE "${MAKE_PROGRAM} -j5") +set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") +set(CPACK_SOURCE_GENERATORS "TGZ TZ") +set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size +set(CC clang) +set(CXX clang++) +set(CFLAGS "") +set(CXXFLAGS "-stdlib=libc++") +set(INITIAL_CACHE " +CMAKE_BUILD_TYPE:STRING=Release +CMAKE_OSX_ARCHITECTURES:STRING=x86_64 +CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 +CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE +CPACK_SYSTEM_NAME:STRING=Darwin-x86_64 +BUILD_QtDialog:BOOL=TRUE +CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE +CMake_INSTALL_DEPENDENCIES:BOOL=ON +CMAKE_SKIP_RPATH:BOOL=TRUE +CMake_NO_C_STANDARD:BOOL=TRUE +CMake_NO_CXX_STANDARD:BOOL=TRUE +CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE +") +set(ENV [[ +export CMAKE_PREFIX_PATH='/Users/kitware/dashboards/support/Qt-5.5.1' +]]) +get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) +include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake new file mode 100644 index 0000000..f25d638 --- /dev/null +++ b/Utilities/Release/win32_release.cmake @@ -0,0 +1,28 @@ +set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory") +set(CONFIGURE_WITH_CMAKE TRUE) +set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake/bin/cmake.exe") +set(PROCESSORS 8) +set(HOST dash3win7) +set(RUN_LAUNCHER ~/rel/run) +set(CPACK_BINARY_GENERATORS "WIX ZIP") +set(CPACK_SOURCE_GENERATORS "ZIP") +set(MAKE_PROGRAM "ninja") +set(MAKE "${MAKE_PROGRAM} -j8") +set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release +CMAKE_DOC_DIR:STRING=doc/cmake +CMAKE_USE_OPENSSL:BOOL=OFF +CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE +CMAKE_Fortran_COMPILER:FILEPATH=FALSE +CMAKE_GENERATOR:INTERNAL=Ninja +BUILD_QtDialog:BOOL:=TRUE +CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE +CMake_INSTALL_DEPENDENCIES:BOOL=ON +CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x86 -subsystem:console,5.01 +") +set(ppflags "-D_WIN32_WINNT=0x501 -D_USING_V110_SDK71_") +set(CFLAGS "${ppflags}") +set(CXXFLAGS "${ppflags}") +set(ENV ". ~/rel/env") +get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) +set(GIT_EXTRA "git config core.autocrlf true") +include(${path}/release_cmake.cmake) -- cgit v0.12