From 6ae04e68aa7838418bdf7cafdba4a1f5700db814 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 12 Jan 2023 10:04:19 +0100 Subject: [PATCH] Kill remaining traces of win32 support. --- .github/workflows/jarfile.yml | 30 +--------------- .gitlab-ci.yml | 3 +- MANIFEST.in | 2 -- doc/doxygen/inside_release.doc | 4 +-- doc/doxygen/inside_tests.doc | 14 -------- docs/bin/extract_logs_hierarchy.pl | 2 +- docs/source/Installing_SimGrid.rst | 2 +- include/smpi/smpi.h | 4 --- include/smpi/smpi_main.h | 12 ------- include/xbt/base.h | 11 ++---- include/xbt/log.h | 9 ----- setup.py | 18 ++-------- src/dag/dax_dtd.c | 9 +---- src/surf/xml/simgrid_dtd.c | 9 +---- src/xbt/log.cpp | 6 ++-- .../smpi/mpich3-test/include/mpitestconf.h | 6 ++-- tools/cmake/CTestConfig.cmake | 3 -- tools/cmake/DefinePackages.cmake | 2 -- tools/cmake/Documentation.cmake | 4 +-- tools/cmake/MaintainerMode.cmake | 3 -- tools/cmake/Modules/FindLibdw.cmake | 4 +-- tools/cmake/Modules/FindLibelf.cmake | 4 +-- tools/cmake/Modules/FindLibunwind.cmake | 4 +-- tools/cmake/cross-mingw.cmake | 14 -------- tools/jenkins/project_description.sh | 36 ------------------- tools/tesh/tesh.py | 15 +++----- 26 files changed, 27 insertions(+), 203 deletions(-) delete mode 100644 include/smpi/smpi_main.h delete mode 100644 tools/cmake/cross-mingw.cmake diff --git a/.github/workflows/jarfile.yml b/.github/workflows/jarfile.yml index d8408e5654..1bd5f8713d 100644 --- a/.github/workflows/jarfile.yml +++ b/.github/workflows/jarfile.yml @@ -11,7 +11,6 @@ jobs: strategy: matrix: config: - - { name: "Windows MingW", os: windows, cc: "gcc", cxx: "g++", generator: "MinGW Makefiles", cmake_extra_options: '-Denable_lto=OFF -DCMAKE_PREFIX_PATH="C:/Program Files/Eigen3/"' } - { name: "Ubuntu gcc", os: ubuntu, cc: "gcc", cxx: "g++", generator: "Unix Makefiles", cmake_extra_options: "-DLTO_EXTRA_FLAG=auto" } - { name: "MacOS clang", os: macos, cc: "clang", cxx: "clang++", generator: "Unix Makefiles", cmake_extra_options: "-DLTO_EXTRA_FLAG=auto" } steps: @@ -27,32 +26,6 @@ jobs: - name: Install boost and eigen on macos if: matrix.config.os == 'macos' run: brew install boost eigen - - name: Install boost, eigen, and gcc on windows - if: matrix.config.os == 'windows' - run: | - iwr -useb get.scoop.sh -outfile 'install.ps1' - .\install.ps1 -RunAsAdmin - scoop install gcc --global - If ((Test-Path "C:\hostedtoolcache\windows\Boost") -eq $False){ - # Use the boost-1.72.0-win32-msvc14.1-x86_64.tar.gz for Windows 2016 - $url = "https://github.com/actions/boost-versions/releases/download/1.72.0-20200608.4/boost-1.72.0-win32-msvc14.2-x86_64.tar.gz" - (New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\boost.tar.gz") - 7z.exe x "$env:TEMP\boost.tar.gz" -o"$env:TEMP\boostArchive" -y | Out-Null - 7z.exe x "$env:TEMP\boostArchive" -o"$env:TEMP\boost" -y | Out-Null - Push-Location -Path "$env:TEMP\boost" - Invoke-Expression .\setup.ps1 - } - echo "BOOST_ROOT=C:\hostedtoolcache\windows\Boost\1.72.0\x86_64" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - echo "BOOST_INCLUDEDIR=C:\hostedtoolcache\windows\Boost\1.72.0\x86_64\boost\include" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - echo "BOOST_LIBRARYDIR=C:\hostedtoolcache\windows\Boost\1.72.0\x86_64\lib" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - $url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz" - (New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\eigen.tar.gz") - Push-Location -Path "$env:TEMP" - cmake -E tar zxf "$env:TEMP\eigen.tar.gz" - mkdir "$env:TEMP\eigen-3.4.0\build" - cd "$env:TEMP\eigen-3.4.0\build" - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX="C:\Program Files\Eigen3" .. - cmake --build . --target install - name: Build and test jar with Cmake run: | mkdir build @@ -93,7 +66,7 @@ jobs: fi mkdir content cd content - for j in ubuntu macos windows ; do unzip -n ../jar-$j/simgrid.jar ; done + for j in ubuntu macos ; do unzip -n ../jar-$j/simgrid.jar ; done strip NATIVE/*/*/*.so x86_64-linux-gnu-strip NATIVE/*/*/lib*dll zip -r ../simgrid-${version}.jar * @@ -107,7 +80,6 @@ jobs: with: name: | jar-ubuntu - jar-windows jar-macos - name: Create the failure Message if: ${{ failure() }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95258ab7ab..583e9d5038 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,12 +39,11 @@ release: # Please use the github action instead # - make VERBOSE=1 -j$(nproc) dist simgrid simgrid-java_jar # # Get the foreign architectures -# - wget https://ci.appveyor.com/api/projects/mquinson/simgrid/artifacts/simgrid.jar -O simgrid-windows.jar # - export SGVER=`grep SimGrid ChangeLog|head -n1|sed -e 's/SimGrid (//' -e 's/).*//'` # - wget https://ci.inria.fr/simgrid/job/SimGrid/build_mode=Debug,node=macos/lastSuccessfulBuild/artifact/build/simgrid-${SGVER}/build/simgrid.jar -O simgrid-mac.jar # # Open all jar files, and strip them # - mkdir content ; cd content -# - for j in ../simgrid.jar ../simgrid-windows.jar ../simgrid-mac.jar ; do unzip -n $j ; done +# - for j in ../simgrid.jar ../simgrid-mac.jar ; do unzip -n $j ; done # - strip NATIVE/*/*/*.so # - x86_64-linux-gnu-strip NATIVE/*/*/lib*dll # - zip -r ../simgrid-${SGVER}.jar * diff --git a/MANIFEST.in b/MANIFEST.in index 3968c2336b..54f3015d09 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2068,7 +2068,6 @@ include include/smpi/smpi_extended_traces.h include include/smpi/smpi_extended_traces_fortran.h include include/smpi/smpi_helpers.h include include/smpi/smpi_helpers_internal.h -include include/smpi/smpi_main.h include include/xbt.h include include/xbt/Extendable.hpp include include/xbt/PropertyHolder.hpp @@ -2760,7 +2759,6 @@ include tools/cmake/Modules/FindValgrind.cmake include tools/cmake/Modules/pybind11Config.cmake include tools/cmake/Option.cmake include tools/cmake/Tests.cmake -include tools/cmake/cross-mingw.cmake include tools/cmake/scripts/fixup_simgrid_dtd_l.pl include tools/cmake/scripts/my_valgrind.pl include tools/cmake/scripts/update_tesh.pl diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index 4e64209f2a..068089c05b 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -26,7 +26,7 @@ Please apply the following checklist before releasing. - The date of the release is marked in the title - Tests - The "make distcheck" target works (tested by jenkins) - - All tests pass on everything on ci + AppVeyor + - All tests pass on everything on ci - Tutorials and derivative projects build correctly https://framagit.org/simgrid/simgrid-template-s4u/pipelines https://framagit.org/simgrid/external-projects-ci/pipelines @@ -41,7 +41,7 @@ Please apply the following checklist before releasing. - docs/source/conf.py - setup.py - Commit and push to both framagit and github -- Wait for both appveyor and jenkins/osX to complete the build +- Wait for jenkins/osX to complete the build - If it's not successful, fix it and push again - Once it's successful everywhere: merge 'master' into 'stable' and push it to framagit - You can interrupt the build on jenkins, as it was tested just before diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc index abda87d5b5..c70b0b6d3e 100644 --- a/doc/doxygen/inside_tests.doc +++ b/doc/doxygen/inside_tests.doc @@ -138,8 +138,6 @@ We use Jenkins on Inria servers as a workhorse: it runs all of our tests for many configurations. It takes a long time to answer, and it often reports issues but when it's green, then you know that SimGrid is very fit! -We use AppVeyor -to build and somehow test SimGrid on windows. @subsection inside_tests_jenkins Jenkins on the Inria CI servers @@ -203,18 +201,6 @@ pkg install boost-libs cmake openjdk8 automake libxslt libxml2 libunwind git hto brew install cmake boost libunwind-headers libxslt git python3 @endverbatim -@subsection inside_tests_appveyor AppVeyor - -Our configuration is in the file appveyor.yml as it should -be, and the result is here: https://ci.appveyor.com/project/mquinson/simgrid - -We use @c Choco as a package manager on AppVeyor, and it is sufficient -for us. In the future, we will probably move to the ubuntu subsystem -of Windows 10: SimGrid performs very well under these settings, as -tested on Inria's CI servers. For the time being having a native -library is still useful for the Java users that don't want to install -anything beyond Java on their windows. - @subsection inside_tests_debian Debian builders Since SimGrid is packaged in Debian, we benefit from their huge diff --git a/docs/bin/extract_logs_hierarchy.pl b/docs/bin/extract_logs_hierarchy.pl index 708e2295bc..40c74f8760 100755 --- a/docs/bin/extract_logs_hierarchy.pl +++ b/docs/bin/extract_logs_hierarchy.pl @@ -22,7 +22,7 @@ print "This is the list of all categories existing in the SimGrid implementation my %ancestor; my %desc; # $ancestor{"toto"} is the ancestor of the toto channel as declared by XBT_LOG_NEW_SUBCATEGORY and -# XBT_LOG_NEW_DEFAULT_SUBCATEGORY ie, when the channel toto is initialized (does not work under windows) +# XBT_LOG_NEW_DEFAULT_SUBCATEGORY ie, when the channel toto is initialized # $desc{"toto"} is its description diff --git a/docs/source/Installing_SimGrid.rst b/docs/source/Installing_SimGrid.rst index 0ee66be77c..7c949e0359 100644 --- a/docs/source/Installing_SimGrid.rst +++ b/docs/source/Installing_SimGrid.rst @@ -131,7 +131,7 @@ Eigen3 (optional) Java (optional): - Debian / Ubuntu: ``apt install default-jdk libgcj18-dev`` (or any version of libgcj) - - macOS or Windows: Grab a `full JDK `_ + - macOS: Grab a `full JDK `_ For platform-specific details, please see below. diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index c59d0da051..a2a83f0efb 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -234,15 +234,11 @@ typedef SMPI_Info* MPI_Info; #define MPI_STATUSES_IGNORE ((MPI_Status*)NULL) #define MPI_STATUS_SIZE 5 -#if !defined(DLL_EXPORT) #if defined(c_plusplus) || defined(__cplusplus) #define SMPI_PREDEFINED_POINTER(type, internal) (static_cast (static_cast (&(internal)))) #else #define SMPI_PREDEFINED_POINTER(type, internal) ((type) ((void *) &(internal))) #endif -#else -#define SMPI_PREDEFINED_POINTER(type, internal) ((type) &(internal)) -#endif extern SMPI_Datatype smpi_MPI_DATATYPE_NULL; extern SMPI_Datatype smpi_MPI_CHAR; diff --git a/include/smpi/smpi_main.h b/include/smpi/smpi_main.h deleted file mode 100644 index ae6fdd9ee0..0000000000 --- a/include/smpi/smpi_main.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2012-2023. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#define main smpi_windows_main__(int argc, char **argv);\ -int main(int argc, char **argv){\ -smpi_main(&smpi_windows_main__,argc,argv);\ -return 0;\ -}\ -int smpi_windows_main__ diff --git a/include/xbt/base.h b/include/xbt/base.h index 155dfbff30..6f4c6b67bb 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -139,18 +139,11 @@ #define _XBT_STRINGIFY_A_24_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_25_, __VA_ARGS__)(__VA_ARGS__) #define _XBT_STRINGIFY_A_25_(...) error_maximum_size_of_XBT_STRINGIFY_ARGS_reached -/* Handle import/export stuff - * - * Rationale of XBT_PUBLIC: +/* Rationale of XBT_PUBLIC: * * This is for library symbols visible from the application-land. * Basically, any symbols defined in the include/directory must be like this (plus some other globals). * - * UNIX coders should just think of it as a special way to say "extern". - * - * * If you build the DLL, define the DLL_EXPORT symbol so that all symbols actually get exported by this file. - * - * * If you link your application against the DLL or if you do a UNIX build, don't do anything special. This file - * will do the right thing for you by default. + * Just think of it as a special way to say "extern". */ #if defined(__ELF__) diff --git a/include/xbt/log.h b/include/xbt/log.h index 30554204e0..c2dbd358c7 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -307,16 +307,7 @@ XBT_PUBLIC void xbt_log_init(int* argc, char** argv); XBT_PUBLIC void _xbt_log_event_log(xbt_log_event_t ev, const char* fmt, ...) XBT_ATTRIB_PRINTF(2, 3); XBT_PUBLIC int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority); -#ifdef DLL_EXPORT -XBT_PUBLIC_DATA s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT); -#else -// If we `dllexport` the root log category, MinGW does not want us to take its address with the error: -// > initializer element is not constant -// When using auto-import, MinGW is happy. -// We should handle this for non-root log categories as well. extern s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT); -#endif - extern xbt_log_appender_t xbt_log_default_appender; extern xbt_log_layout_t xbt_log_default_layout; diff --git a/setup.py b/setup.py index d214d06d25..d9f7f22791 100755 --- a/setup.py +++ b/setup.py @@ -40,12 +40,6 @@ class CMakeBuild(build_ext): raise RuntimeError( "Please generate a MANIFEST.in file (configure simgrid, and copy it here if you build out of tree)") - if platform.system() == "Windows": - cmake_version = LooseVersion( - re.search(r'version\s*([\d.]+)', out.decode()).group(1)) - if cmake_version < '3.1.0': - raise RuntimeError("CMake >= 3.1.0 is required on Windows") - for ext in self.extensions: self.build_extension(ext) @@ -65,15 +59,8 @@ class CMakeBuild(build_ext): cfg = 'Debug' if self.debug else 'Release' build_args = ['--config', cfg] - if platform.system() == "Windows": - cmake_args += [ - '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)] - if sys.maxsize > 2**32: - cmake_args += ['-A', 'x64'] - build_args += ['--', '/m'] - else: - cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg] - build_args += ['--', '-j4'] + cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg] + build_args += ['--', '-j4'] env = os.environ.copy() env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''), @@ -114,7 +101,6 @@ setup( "License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)", "Operating System :: POSIX", "Operating System :: MacOS", - "Operating System :: Microsoft :: Windows", "Programming Language :: Python :: 3", "Programming Language :: C++", "Programming Language :: C", diff --git a/src/dag/dax_dtd.c b/src/dag/dax_dtd.c index 6be8241db0..3ba8d5c45a 100644 --- a/src/dag/dax_dtd.c +++ b/src/dag/dax_dtd.c @@ -1821,14 +1821,7 @@ const char* *dax__statenames=NULL; * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. */ -#if defined(_WIN32) -# ifndef __STRICT_ANSI__ -# include -# include -# endif -#else -# include -#endif +#include #endif #ifndef YY_EXTRA_TYPE diff --git a/src/surf/xml/simgrid_dtd.c b/src/surf/xml/simgrid_dtd.c index c686091e0a..f915553986 100644 --- a/src/surf/xml/simgrid_dtd.c +++ b/src/surf/xml/simgrid_dtd.c @@ -6163,14 +6163,7 @@ const char* *surfxml_statenames=NULL; * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. */ -#if defined(_WIN32) -# ifndef __STRICT_ANSI__ -# include -# include -# endif -#else -# include -#endif +#include #endif #ifndef YY_EXTRA_TYPE diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp index b2b9e1bef3..642fe2acc9 100644 --- a/src/xbt/log.cpp +++ b/src/xbt/log.cpp @@ -545,10 +545,8 @@ static void xbt_log_help() " -> %%L: line number where the log event was raised (LOG4J compatible)\n" " -> %%M: function name (LOG4J compatible -- called method name here of course).\n" "\n" - " -> %%b: full backtrace (Called %%throwable in LOG4J). Defined only under windows or when using the " - "GNU libc because\n" - " backtrace() is not defined elsewhere, and we only have a fallback for windows boxes, not " - "mac ones for example.\n" + " -> %%b: full backtrace (Called %%throwable in LOG4J). Defined only when using the GNU libc because\n" + " backtrace() is not defined elsewhere.\n" " -> %%B: short backtrace (only the first line of the %%b). Called %%throwable{short} in LOG4J; " "defined where %%b is.\n" "\n" diff --git a/teshsuite/smpi/mpich3-test/include/mpitestconf.h b/teshsuite/smpi/mpich3-test/include/mpitestconf.h index 6ccd8014d0..c9f81f1387 100644 --- a/teshsuite/smpi/mpich3-test/include/mpitestconf.h +++ b/teshsuite/smpi/mpich3-test/include/mpitestconf.h @@ -57,9 +57,8 @@ //#define HAVE_FORTRAN_BINDING 0 /* Define to 1 if you have the `getrusage' function. */ -#ifndef WIN32 #define HAVE_GETRUSAGE 1 -#endif + /* Define if struct hostent contains h_addr_list */ #define HAVE_H_ADDR_LIST 1 @@ -142,9 +141,8 @@ #define HAVE_STRING_H 1 /* Define to 1 if you have the header file. */ -#ifndef WIN32 #define HAVE_SYS_RESOURCE_H 1 -#endif + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 diff --git a/tools/cmake/CTestConfig.cmake b/tools/cmake/CTestConfig.cmake index 0debf7c1ed..53e2835b78 100644 --- a/tools/cmake/CTestConfig.cmake +++ b/tools/cmake/CTestConfig.cmake @@ -5,9 +5,6 @@ if(APPLE) SET(BUILDNAME "APPLE" CACHE INTERNAL "Buildname" FORCE) else() SET(BUILDNAME "UNIX" CACHE INTERNAL "Buildname" FORCE) - if(WIN32) - SET(BUILDNAME "WINDOWS" CACHE INTERNAL "Buildname" FORCE) - endif() endif() if(NOT enable_memcheck) diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index d1af6a322b..4988146355 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -728,7 +728,6 @@ set(headers_to_install include/smpi/mpi.h include/smpi/sampi.h include/smpi/smpi.h - include/smpi/smpi_main.h include/smpi/smpi_helpers.h include/smpi/smpi_helpers_internal.h include/smpi/smpi_extended_traces.h @@ -1115,7 +1114,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/pybind11Config.cmake tools/cmake/Option.cmake tools/cmake/Tests.cmake - tools/cmake/cross-mingw.cmake tools/cmake/scripts/fixup_simgrid_dtd_l.pl tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl diff --git a/tools/cmake/Documentation.cmake b/tools/cmake/Documentation.cmake index 913785bdb9..4dcdc4211e 100644 --- a/tools/cmake/Documentation.cmake +++ b/tools/cmake/Documentation.cmake @@ -1,10 +1,8 @@ ### -### Generate all parts of the documentation on non-Windows systems +### Generate all parts of the documentation ### ### - Javadoc (reference) ### - manpages (reference of tools) -### -### This file is not loaded on windows #### Generate the html documentation find_path(FIG2DEV_PATH NAMES fig2dev PATHS NO_DEFAULT_PATHS) diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake index 6875eab197..971d318f8d 100644 --- a/tools/cmake/MaintainerMode.cmake +++ b/tools/cmake/MaintainerMode.cmake @@ -132,7 +132,6 @@ if(enable_maintainer_mode) set(string3 "'s/XBT_PUBLIC void STag_surfxml_include/XBT_ATTRIB_NORETURN &/'") # remove with v5 of the dtd set(string4 "'s/XBT_PUBLIC void STag_surfxml_\\(mount\\|storage\\)/XBT_ATTRIB_NORETURN &/'") # remove with v5 of the dtd set(string5 "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'") - set(string9 "'s/#include /#if defined(_WIN32)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g'") set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'") ADD_CUSTOM_COMMAND( @@ -178,14 +177,12 @@ if(enable_maintainer_mode) #surf/xml/simgrid_dtd.c: surf/xml/simgrid_dtd.l COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.c COMMAND ${FLEX_EXE} -o src/surf/xml/simgrid_dtd.c -Psurf_parse_ --noline src/surf/xml/simgrid_dtd.l - COMMAND ${SED_EXE} -i ${string9} src/surf/xml/simgrid_dtd.c COMMAND ${CMAKE_COMMAND} -E echo " Generated surf/xml/simgrid_dtd.c" #dag/dax_dtd.c: dag/dax_dtd.l COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.c COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/dag COMMAND ${FLEX_EXE} -o src/dag/dax_dtd.c -Pdax_ --noline src/dag/dax_dtd.l - COMMAND ${SED_EXE} -i ${string9} src/dag/dax_dtd.c COMMAND ${CMAKE_COMMAND} -E echo " Generated src/dag/dax_dtd.c" WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} diff --git a/tools/cmake/Modules/FindLibdw.cmake b/tools/cmake/Modules/FindLibdw.cmake index 9574bda8c0..62c52e944a 100644 --- a/tools/cmake/Modules/FindLibdw.cmake +++ b/tools/cmake/Modules/FindLibdw.cmake @@ -3,7 +3,7 @@ find_path(LIBDW_INCLUDE_DIR "elfutils/libdw.h" $ENV{SIMGRID_LIBDW_LIBRARY_PATH} $ENV{LD_LIBRARY_PATH} $ENV{LIBDW_LIBRARY_PATH} - PATH_SUFFIXES include/ GnuWin32/include + PATH_SUFFIXES include/ PATHS /opt /opt/local @@ -16,7 +16,7 @@ find_library(LIBDW_LIBRARY $ENV{SIMGRID_LIBDW_LIBRARY_PATH} $ENV{LD_LIBRARY_PATH} $ENV{LIBDW_LIBRARY_PATH} - PATH_SUFFIXES lib/ GnuWin32/lib + PATH_SUFFIXES lib/ PATHS /opt /opt/local diff --git a/tools/cmake/Modules/FindLibelf.cmake b/tools/cmake/Modules/FindLibelf.cmake index 1e1af815ad..240be293ee 100644 --- a/tools/cmake/Modules/FindLibelf.cmake +++ b/tools/cmake/Modules/FindLibelf.cmake @@ -3,7 +3,7 @@ find_path(LIBELF_INCLUDE_DIR "libelf.h" $ENV{SIMGRID_LIBELF_LIBRARY_PATH} $ENV{LD_LIBRARY_PATH} $ENV{LIBELF_LIBRARY_PATH} - PATH_SUFFIXES include/ GnuWin32/include + PATH_SUFFIXES include/ PATHS /opt /opt/local @@ -16,7 +16,7 @@ find_library(LIBELF_LIBRARY $ENV{SIMGRID_LIBELF_LIBRARY_PATH} $ENV{LD_LIBRARY_PATH} $ENV{LIBELF_LIBRARY_PATH} - PATH_SUFFIXES lib/ GnuWin32/lib + PATH_SUFFIXES lib/ PATHS /opt /opt/local diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake index 0e890a4f3c..2066d48f8b 100644 --- a/tools/cmake/Modules/FindLibunwind.cmake +++ b/tools/cmake/Modules/FindLibunwind.cmake @@ -41,7 +41,7 @@ find_path(PATH_LIBUNWIND_H "libunwind.h" HINTS $ENV{LIBUNWIND_HINT} $ENV{LD_LIBRARY_PATH} - PATH_SUFFIXES include/ GnuWin32/include + PATH_SUFFIXES include/ PATHS /opt /opt/local /opt/csw /sw /usr) if(PATH_LIBUNWIND_H) string(REGEX REPLACE "/libunwind.h" "" PATH_LIBUNWIND_H "${PATH_LIBUNWIND_H}") @@ -63,7 +63,7 @@ foreach(component ${LIBUNWIND_COMPONENTS}) HINTS $ENV{LIBUNWIND_HINT} $ENV{LD_LIBRARY_PATH} - PATH_SUFFIXES lib/ GnuWin32/lib lib/system + PATH_SUFFIXES lib/ lib/system PATHS /opt /opt/local /opt/csw /sw /usr /usr/lib/) if(PATH_LIBUNWIND_LIB_${component}) # message(" ${component} ${PATH_LIBUNWIND_LIB_${component}}") diff --git a/tools/cmake/cross-mingw.cmake b/tools/cmake/cross-mingw.cmake deleted file mode 100644 index b82b5c52aa..0000000000 --- a/tools/cmake/cross-mingw.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# cmake -DCMAKE_TOOLCHAIN_FILE=tools/cmake/cross-mingw.cmake .. - -set (CMAKE_SYSTEM_NAME Windows) -set (CMAKE_SYSTEM_PROCESSOR x86_64) - -set (CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc-win32) -set (CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++-win32) -set (CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32-gfortran-win32) - -set (CMAKE_FIND_ROOT_PATH /usr/lib/gcc/x86_64-w64-mingw32/ /usr/i686-w64-mingw32/) - -set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh index b002915e57..08f2476a24 100755 --- a/tools/jenkins/project_description.sh +++ b/tools/jenkins/project_description.sh @@ -210,40 +210,4 @@ EOF rm consoleText done - -#Appveyor - get ID of the last job with the API -BUILD_ID=$(curl -s "https://ci.appveyor.com/api/projects/mquinson/simgrid" | grep -o '\[{"jobId":"[a-zA-Z0-9]*",' | sed "s/\[{\"jobId\":\"//" | sed "s/\",//") -wget --quiet https://ci.appveyor.com/api/buildjobs/"$BUILD_ID"/log -O ./consoleText >/dev/null 2>&1 -sed -i -e "s/\r//g" ./consoleText -node="appveyor" -os="Windows Server 2012 - VS2015 + mingw64 5.3.0" -boost=$(get_boost) -compiler=$(get_compiler) -java=$(get_java) -cmake=$(get_cmake) -eigen3=$(get_eigen3) -ns3=$(get_ns3) -py=$(get_python) -success=$(grep -m 1 "Build success" ./consoleText) -ball="${icons[failure]}" -if [ -n "$success" ]; then - ball="${icons[success]}" -fi -cat < - $node - $os - <${ball}> - <${icons[disabled]}> - $compiler - $boost - $java - $cmake - $eigen3 - $ns3 - $py - -EOF -rm consoleText - echo "" diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index 6c7f8dbb63..69835fb0bc 100755 --- a/tools/tesh/tesh.py +++ b/tools/tesh/tesh.py @@ -46,10 +46,6 @@ else: # # -def is_windows(): - """ Check if running on Windows """ - return sys.platform.startswith('win') - # Singleton metaclass that works in Python 2 & 3 # http://stackoverflow.com/questions/6760685/creating-a-singleton-in-python @@ -120,7 +116,7 @@ def process_is_dead(pid): def kill_process_group(pid): """ This function send TERM signal + KILL signal after 0.2s to the group of the specified process """ if pid is None: - # Nobody to kill. We don't know who to kill on windows, or we don't have anyone to kill on signal handler + # Nobody to kill. We don't have anyone to kill on signal handler return try: @@ -356,9 +352,7 @@ class Cmd: local_pid = None try: - preexec_function = None - if not is_windows(): - preexec_function = lambda: os.setpgid(0, 0) + preexec_function = lambda: os.setpgid(0, 0) proc = subprocess.Popen( # pylint: disable=subprocess-popen-preexec-fn args, bufsize=1, @@ -367,9 +361,8 @@ class Cmd: stderr=subprocess.STDOUT, universal_newlines=True, preexec_fn=preexec_function) - if not is_windows(): - local_pid = proc.pid - TeshState().running_pids.append(local_pid) + local_pid = proc.pid + TeshState().running_pids.append(local_pid) except PermissionError: logs.append("[{file}:{number}] Cannot start '{cmd}': The binary is not executable.".format( file=FileReader().filename, number=self.linenumber, cmd=args[0])) -- 2.20.1