Commit dd630075 authored by Brad King's avatar Brad King
Browse files

Utilities/Release: Rename scripts to match target platform

The machine name we happen to use for the build is less informative than
its platform.
parent bf071286
...@@ -684,12 +684,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ...@@ -684,12 +684,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
endif() endif()
endmacro() endmacro()
if(CMAKE_BUILD_NIGHTLY_RELEASES) if(CMAKE_BUILD_NIGHTLY_RELEASES)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32
dash3win7_release.cmake) win32_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
bigmac_release.cmake) osx_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
magrathea_release.cmake) linux32_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
linux64_release.cmake) linux64_release.cmake)
endif() endif()
......
...@@ -6,14 +6,14 @@ endif() ...@@ -6,14 +6,14 @@ endif()
file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs) file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
set(RELEASE_SCRIPTS_BATCH_1 set(RELEASE_SCRIPTS_BATCH_1
dash3win7_release.cmake # Windows win32_release.cmake # Windows x86
bigmac_release.cmake # OS X x86_64 osx_release.cmake # OS X x86_64
magrathea_release.cmake # Linux linux32_release.cmake # Linux x86
linux64_release.cmake # Linux x86_64 linux64_release.cmake # Linux x86_64
) )
set(RELEASE_SCRIPTS_BATCH_2 set(RELEASE_SCRIPTS_BATCH_2
dash2win64_cygwin.cmake # Cygwin cygwin_release.cmake # Cygwin x86
) )
function(write_batch_shell_script filename) function(write_batch_shell_script filename)
......
...@@ -17,7 +17,6 @@ CMake_INSTALL_DEPENDENCIES:BOOL=ON ...@@ -17,7 +17,6 @@ CMake_INSTALL_DEPENDENCIES:BOOL=ON
") ")
set(CXX g++) set(CXX g++)
set(CC gcc) set(CC gcc)
set(SCRIPT_NAME dash2win64cygwin)
set(GIT_EXTRA "git config core.autocrlf false") set(GIT_EXTRA "git config core.autocrlf false")
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment