From: Martin Quinson Date: Tue, 6 Nov 2018 06:19:42 +0000 (+0100) Subject: Apple renamed all their OSes X-Git-Tag: v3_22~811 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a73d9376e051e0019d2bf02c0d11e4ad340dcaf6?ds=sidebyside Apple renamed all their OSes https://www.engadget.com/2016/06/13/os-x-is-now-macos/ --- diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index aa61c36413..598384c67a 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -19,7 +19,7 @@ Please apply the following checklist before releasing. to build and install are included in the archive) - Tests - All tests pass on a reasonable amount of platforms (typically, - everything on ci + travis/Mac + AppVeyor) + everything on ci + travis/macOS + AppVeyor) - You also tested to build and install the content of the source archive on a reasonable amount of platforms (typically, 2 or 3). - ChangeLog file @@ -55,7 +55,7 @@ cmake . && make dist Get the jarfiles for several OSes on the CI slaves. Use Save under to give a separate name to each of them. -- Mac OSX, FreeBSD: on Jenkins +- macOS, FreeBSD: on Jenkins - Windows: on AppVeyor - Linux: it is safer to rebuild them in a chroot (to avoid boost-context and all other optional dependencies): diff --git a/docs/source/Installing_SimGrid.rst b/docs/source/Installing_SimGrid.rst index 2c11421204..cb94bd1bd4 100644 --- a/docs/source/Installing_SimGrid.rst +++ b/docs/source/Installing_SimGrid.rst @@ -6,7 +6,7 @@ Installing SimGrid ================== -SimGrid should work out of the box on Linux, Mac OSX, FreeBSD, and +SimGrid should work out of the box on Linux, macOS, FreeBSD, and Windows (under Windows, you need to install the Windows Subsystem Linux to get more than the Java bindings). @@ -32,13 +32,13 @@ Stable Java Package The jar file can be retrieved from the `Release page `_. This file is -self-contained, including the native components for Linux, Mac OS X and +self-contained, including the native components for Linux, macOS and Windows. Copy it to your project's classpath and you're set. Nightly built Java Package ^^^^^^^^^^^^^^^^^^^^^^^^^^ -For non-Windows systems (Linux, Mac OS X, or FreeBSD), head to `Jenkins `_. +For non-Windows systems (Linux, macOS, or FreeBSD), head to `Jenkins `_. In the build history, pick the last green (or at least yellow) build that is not blinking (i.e., not currently under build). In the list, pick a system that is close to yours, and click on the ball in the Debug row. The build artefact will appear at the top of the resulting page. @@ -80,11 +80,11 @@ cmake (v2.8.8). configuration options (e.g., if your python installation is not standard). boost (at least v1.48, v1.59 recommended) - On Debian / Ubuntu: ``apt install libboost-dev libboost-context-dev`` - - On Max OS X with homebrew: ``brew install boost`` + - On macOS with homebrew: ``brew install boost`` Java (optional): - Debian / Ubuntu: ``apt install default-jdk libgcj18-dev`` (or any version of libgcj) - - Mac OS X or Windows: Grab a `full JDK `_ + - macOS or Windows: Grab a `full JDK `_ Lua (optional -- must be v5.3) - SimGrid won't work with any other version of Lua. - Debian / Ubuntu: ``apt install liblua5.3-dev lua5.3`` @@ -329,10 +329,10 @@ on `our Jenkins `_. .. _install_cmake_mac: -Mac OS X Specifics -^^^^^^^^^^^^^^^^^^ +macOS Specifics +^^^^^^^^^^^^^^^ -SimGrid compiles like a charm with clang (version 3.0 or higher) on Mac OS X: +SimGrid compiles like a charm with clang (version 3.0 or higher) on macOS: .. code-block:: shell @@ -340,7 +340,7 @@ SimGrid compiles like a charm with clang (version 3.0 or higher) on Mac OS X: make -Troubleshooting your Mac OS X build. +Troubleshooting your macOS build. CMake Error: Parse error in cache file build_dir/CMakeCache.txt. Offending entry: /SDKs/MacOSX10.8.sdk This was reported with the XCode version of clang 4.1. The work @@ -352,7 +352,7 @@ CMake Error: Parse error in cache file build_dir/CMakeCache.txt. Offending entry You can safely ignore the warning about "-pthread" not being used, if it appears. /usr/include does not seem to exist - This directory does not exist by default on modern Mac OS X versions, + This directory does not exist by default on modern macOS versions, and you may need to create it with ``xcode-select -install`` .. _install_cmake_windows: diff --git a/docs/source/app_java.rst b/docs/source/app_java.rst index ebe7a8688d..1e71be56e9 100644 --- a/docs/source/app_java.rst +++ b/docs/source/app_java.rst @@ -73,7 +73,7 @@ precompiled jarfile, please report this bug. If you built it yourself, you can try to use an installed version of the library instead of the one included in the jar. For that, add the path to the native library into the ``LD_LIBRARY_PATH`` variable (or in -the ``DYLD_LIBRARY_PATH`` on Mac OSX). +the ``DYLD_LIBRARY_PATH`` on macOS). pthread_create failed ===================== diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index 7fb11031d5..d358a021fa 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -100,7 +100,7 @@ public final class NativeLib { { name, "lib"+name+".so", /* linux */ name+".dll", "lib"+name+".dll", /* windows (pure and mingw) */ - "lib"+name+".dylib" /* mac osx */}) { + "lib"+name+".dylib" /* macOS */}) { File fileOut = new File(tempDir.toFile().getAbsolutePath() + File.separator + filename); boolean done = false; diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp index 958c9bc41f..edef84d3c3 100644 --- a/src/smpi/internals/smpi_shared.cpp +++ b/src/smpi/internals/smpi_shared.cpp @@ -153,7 +153,7 @@ static void *smpi_shared_malloc_local(size_t size, const char *file, int line) if (res.second) { // The new element was inserted. // Generate a shared memory name from the address of the shared_data: - char shmname[32]; // cannot be longer than PSHMNAMLEN = 31 on Mac OS X (shm_open raises ENAMETOOLONG otherwise) + char shmname[32]; // cannot be longer than PSHMNAMLEN = 31 on macOS (shm_open raises ENAMETOOLONG otherwise) snprintf(shmname, 31, "/shmalloc%p", &*data); int fd = shm_open(shmname, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index d4515ad27a..5b0f98f71f 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -305,7 +305,7 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) { xbt_os_sem_t res = xbt_new(s_xbt_os_sem_t, 1); - /* On some systems (MAC OS X), only the stub of sem_init is to be found. + /* On some systems (macOS), only the stub of sem_init is to be found. * Any attempt to use it leads to ENOSYS (function not implemented). * If such a prehistoric system is detected, do the job with sem_open instead */ diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index 2e5a8e0fd9..aa7aeac67f 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -1,6 +1,6 @@ ### Make Libs -# On Mac OSX, specify that rpath is useful to look for the dependencies +# On macOS, specify that rpath is useful to look for the dependencies # See https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling and Java.cmake set(CMAKE_MACOSX_RPATH TRUE) if(APPLE) diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index 054088cb3e..5cf1136c92 100755 --- a/tools/internal/travis-sonarqube.sh +++ b/tools/internal/travis-sonarqube.sh @@ -4,7 +4,7 @@ # # Use it as a wrapper to your build command, eg: ./travis-sonarqube.sh make VERBOSE=1 -# On Mac OSX or with pull requests, you don't want to run SonarQube but to exec the build command directly. +# On macOS or with pull requests, you don't want to run SonarQube but to exec the build command directly. # Be verbose and fail fast set -ex