From e7ffab2eb0a2795bc037658fb1040cd7775c99e9 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 26 Sep 2015 21:43:44 +0200 Subject: [PATCH] Remove everything related to the pipol compilation platform This platform is long gone now --- CMakeLists.txt | 3 - tools/cmake/CTestConfig.cmake | 5 - tools/cmake/DefinePackages.cmake | 1 - tools/cmake/Option.cmake | 3 - tools/cmake/Pipol.cmake | 171 ---------------------- tools/cmake/PrintArgs.cmake | 2 - tools/internal/check_dist_archive.exclude | 2 +- 7 files changed, 1 insertion(+), 186 deletions(-) delete mode 100644 tools/cmake/Pipol.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index cff719b117..ae908c1899 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,9 +279,6 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake) ### Setup the distrib include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake) -### Pipol compilation -include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Pipol.cmake) - ### Build the doc if(NOT WIN32) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDoc.cmake) diff --git a/tools/cmake/CTestConfig.cmake b/tools/cmake/CTestConfig.cmake index c816648109..7771c983ef 100644 --- a/tools/cmake/CTestConfig.cmake +++ b/tools/cmake/CTestConfig.cmake @@ -34,11 +34,6 @@ SET(CTEST_PROJECT_NAME "${PROJECT_NAME}") SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000") SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000") -set(PIPOL_IMAGE $ENV{PIPOL_IMAGE}) -if(NOT ${PIPOL_IMAGE} MATCHES "\n") - set(SITE ${PIPOL_IMAGE}) -endif() - set(PATTERN_CTEST_IGNORED "") if(enable_coverage) set(PATTERN_CTEST_IGNORED diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 6e3f670be9..d72901735e 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1204,7 +1204,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake - tools/cmake/Pipol.cmake tools/cmake/PrintArgs.cmake tools/cmake/scripts/Diff.pm tools/cmake/scripts/Makefile.default diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake index 4c3bb539e7..e6fb3e9e6d 100644 --- a/tools/cmake/Option.cmake +++ b/tools/cmake/Option.cmake @@ -9,9 +9,6 @@ else() set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where this project should be installed") endif() -set(pipol_user ${pipol_user} CACHE INTERNAL "pipol_user" FORCE) -mark_as_advanced(pipol_user) - option(release "Whether Release Mode is activated (disable tests on experimental parts)" on) option(enable_compile_optimizations "Whether to produce efficient code for the SimGrid library" on) option(enable_documentation "Whether to produce documentation" on) diff --git a/tools/cmake/Pipol.cmake b/tools/cmake/Pipol.cmake deleted file mode 100644 index f1108fb497..0000000000 --- a/tools/cmake/Pipol.cmake +++ /dev/null @@ -1,171 +0,0 @@ -# On a Pipol system, set: -# PIPOL_USER - -#SET(PIPOL_USER $ENV{PIPOL_USER}) - -# ssh/rsync mandatory -IF(pipol_user) - - set(CMAKE_OPTIONS " -Wno-dev") - - if(with_context) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Dwith_context=${with_context}") - endif() - - if(enable_smpi) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_smpi=on") - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_smpi_MPICH3_testsuite=on") - endif() - - if(enable_lua) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_lua=on") - endif() - - if(enable_compile_optimizations) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_compile_optimizations=on") - endif() - - if(enable_compile_warnings) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_compile_warnings=on") - endif() - - if(enable_tracing) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_tracing=on") - endif() - - if(enable_coverage) - set(CMAKE_OPTIONS "${CMAKE_OPTION} -Denable_coverage=on") - endif() - - if(enable_print_message) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_print_message=on") - endif() - - if(enable_model-checking) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_model-checking=on") - endif() - - if(enable_latency_bound_tracking) - set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_latency_bound_tracking=on") - endif() - - FIND_PROGRAM(HAVE_SSH ssh) - FIND_PROGRAM(HAVE_RSYNC rsync) - - MESSAGE(STATUS "Pipol user is '${pipol_user}'") - IF(HAVE_SSH) - message(STATUS "Found ssh: ${HAVE_SSH}") - # get pipol systems - EXECUTE_PROCESS(COMMAND - ssh ${pipol_user}@pipol.inria.fr pipol-sub --query=systems - OUTPUT_VARIABLE PIPOL_SYSTEMS OUTPUT_STRIP_TRAILING_WHITESPACE) - - ENDIF() - - ADD_CUSTOM_TARGET(pipol_test_list_images - COMMENT "Available images for pipol tests (cmake + make + make test) : " - ) - - ADD_CUSTOM_TARGET(pipol_experimental_list_images - COMMENT "Available images for ctest (ctest -D Experimental) : " - ) - - ADD_CUSTOM_TARGET(pipol_kvm_deploy - COMMENT "Deploy all kvm images on pipol (ctest -D Experimental) : " - ) - ADD_CUSTOM_COMMAND(TARGET pipol_kvm_deploy - POST_BUILD - COMMENT "See results on http://cdash.inria.fr/CDash/index.php?project=Simgrid" - ) - - IF(HAVE_RSYNC) - message(STATUS "Found rsync: ${HAVE_RSYNC}") - MACRO(PIPOL_TARGET - SYSTEM_PATTERN) - STRING(REPLACE ".dd.gz" "" SYSTEM_TARGET ${SYSTEM_PATTERN}) - - ADD_CUSTOM_TARGET( - ${SYSTEM_TARGET} - COMMENT "PIPOL Build : ${SYSTEM_PATTERN}" - COMMAND rsync ${pipol_user}@pipol.inria.fr:/usr/local/bin/pipol-sub . - COMMAND ./pipol-sub --pipol-user=${pipol_user} ${SYSTEM_PATTERN} 02:00 --reconnect --group --keep --verbose=1 --export=${CMAKE_HOME_DIRECTORY} --rsynco=-aC - \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \; - cd ${CMAKE_HOME_DIRECTORY} \; - sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \; - cmake -E remove CMakeCache.txt \; - cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \; - make clean \; - make \; - make check \" - ) - ADD_CUSTOM_TARGET( - ${SYSTEM_TARGET}_experimental - COMMENT "PIPOL Build : ${SYSTEM_PATTERN}_experimental" - COMMAND rsync ${pipol_user}@pipol.inria.fr:/usr/local/bin/pipol-sub . - COMMAND ./pipol-sub --pipol-user=${pipol_user} ${SYSTEM_PATTERN} 02:00 --reconnect --group --keep --verbose=1 --export=${CMAKE_HOME_DIRECTORY} --rsynco=-aC - \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \; - cd ${CMAKE_HOME_DIRECTORY} \; - sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \; - cmake -E remove CMakeCache.txt \; - cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \; - ctest -D Experimental \" - ) - - STRING(REGEX MATCH "kvm" make_test "${SYSTEM_TARGET}") - if(make_test) - STRING(REGEX MATCH "windows" make_test "${SYSTEM_TARGET}") - if(NOT make_test) - ADD_CUSTOM_COMMAND(TARGET pipol_kvm_deploy - COMMENT "PIPOL Build : ${SYSTEM_PATTERN}" - COMMAND rsync ${pipol_user}@pipol.inria.fr:/usr/local/bin/pipol-sub . - COMMAND ./pipol-sub --pipol-user=${pipol_user} ${SYSTEM_PATTERN} 02:00 --reconnect --group --keep --verbose=1 --export=${CMAKE_HOME_DIRECTORY} --rsynco=-aC - \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \; - cd ${CMAKE_HOME_DIRECTORY} \; - sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \; - cmake -E remove CMakeCache.txt \; - cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \; - ctest -D Experimental \" - ) - endif() - endif() - - ADD_CUSTOM_COMMAND(TARGET ${SYSTEM_TARGET}_experimental - POST_BUILD - COMMENT "See results on http://cdash.inria.fr/CDash/index.php?project=Simgrid" - ) - - ADD_CUSTOM_COMMAND(TARGET pipol_test_list_images - COMMAND echo ${SYSTEM_TARGET} - ) - ADD_CUSTOM_COMMAND(TARGET pipol_experimental_list_images - COMMAND echo "${SYSTEM_TARGET}_experimental" - ) - ENDMACRO(PIPOL_TARGET) - - ENDIF() - - # add a target for each pipol system - IF(PIPOL_SYSTEMS) - #MESSAGE(STATUS "Adding Pipol targets") - FOREACH(SYSTEM ${PIPOL_SYSTEMS}) - PIPOL_TARGET(${SYSTEM}) - ENDFOREACH(SYSTEM ${PIPOL_SYSTEMS}) - ENDIF() - - ADD_CUSTOM_TARGET(pipol_kill_all_jobs - COMMENT "PIPOL delete all jobs" - COMMAND ./pipol-sub --pipol-user=${pipol_user} deleteallmyjobs - ) - - #message(STATUS "Pipol options: ${CMAKE_OPTIONS}") - - add_custom_target(sync-pipol - COMMENT "Update pipol script for user: ${pipol_user}" - COMMAND scp ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/rc.* ${pipol_user}@pipol.inria.fr:~/.pipol/ - COMMAND scp ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/Nightly_simgrid.sh ${pipol_user}@pipol.inria.fr:~/.pipol/nightly/ - COMMAND scp ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/Nightly_memCheck.sh ${pipol_user}@pipol.inria.fr:~/.pipol/nightly/ - COMMAND scp ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/Experimental_bindings.sh ${pipol_user}@pipol.inria.fr:~/ - COMMAND scp ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/pre-simgrid.sh ${pipol_user}@pipol.inria.fr:~/ - COMMAND ssh ${pipol_user}@pipol.inria.fr "chmod a=rwx ~/* ~/.pipol/rc.* ~/.pipol/nightly/*" - ) -ENDIF() diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake index 57e2725c32..34057bbb10 100644 --- a/tools/cmake/PrintArgs.cmake +++ b/tools/cmake/PrintArgs.cmake @@ -143,5 +143,3 @@ message(" INSTALL_PREFIX ..............: ${CMAKE_INSTALL_PREFIX}") exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI) file(WRITE ${PROJECT_BINARY_DIR}/Testing/Notes/Build "GIT version : ${GIT_VERSION}\n") file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Release : simgrid-${release_version}\n") -file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol user : $ENV{PIPOL_USER}\n") -file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n") diff --git a/tools/internal/check_dist_archive.exclude b/tools/internal/check_dist_archive.exclude index 847e698ae3..7bcf5037e3 100644 --- a/tools/internal/check_dist_archive.exclude +++ b/tools/internal/check_dist_archive.exclude @@ -18,7 +18,7 @@ + README\.(coding|git) + mk_win-dist.sh -+ buildtools/(jenkins|pipol)/.* ++ buildtools/jenkins/.* + contrib/.* -- 2.20.1