From a4011ed8753750a71528578867a403badc3d501a Mon Sep 17 00:00:00 2001 From: Sami Vaarala Date: Mon, 27 Apr 2020 00:34:44 +0300 Subject: [PATCH] Rename OSX to macOS in config and documentation --- RELEASES.rst | 6 +++--- config/config-options/DUK_USE_SETJMP.yaml | 2 +- config/feature-options/DUK_OPT_SETJMP.yaml | 2 +- config/helper-snippets/DUK_F_APPLE.h.in | 2 +- config/platforms.yaml | 2 +- doc/code-issues.rst | 2 +- doc/datetime.rst | 4 ++-- doc/duk-config.rst | 2 +- doc/performance-sensitive.rst | 2 +- releases/releases.yaml | 6 +++--- testrunner/run_commit_test.py | 6 +++--- website/README.rst | 2 +- website/guide/datetime.html | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/RELEASES.rst b/RELEASES.rst index f3803282..7794418a 100644 --- a/RELEASES.rst +++ b/RELEASES.rst @@ -683,7 +683,7 @@ Released sigsetjmp() (with savesigs set to 0) can be a lot faster than setjmp() if the platform's setjmp() implementation saves the signal mask (GH-55) -* Default to _setjmp() for long control transfers on OSX/iPhone (when +* Default to _setjmp() for long control transfers on macOS/iOS (when __APPLE__ is defined) (GH-55) * Add SuperH detection support @@ -862,7 +862,7 @@ Released * Improve MIPS32/MIPS64 detection, architecture strings in Duktape.env also updated ("mips32" or "mips64") (GH-102) -* Add iPhone/iOS strings to Duktape.env +* Add iOS strings to Duktape.env * Add support for TI-Nspire (using Ndless, see GH-113) @@ -1092,7 +1092,7 @@ Released * Remove DUK_OPT_DEEP_C_STACK (and DUK_USE_DEEP_C_STACK) in favor of explicit DUK_USE_xxx config options for native recursion limits; C stacks are assumed - to be deep by default for all targets including OSX/iPhone (GH-165, GH-226) + to be deep by default for all targets including macOS/iOS (GH-165, GH-226) * Make Proxy internal _Target and _Handler properties immutable (non-writable and non-configurable) (GH-237) diff --git a/config/config-options/DUK_USE_SETJMP.yaml b/config/config-options/DUK_USE_SETJMP.yaml index 5dcca01a..9b18afe3 100644 --- a/config/config-options/DUK_USE_SETJMP.yaml +++ b/config/config-options/DUK_USE_SETJMP.yaml @@ -11,7 +11,7 @@ description: > The downside of setjmp/longjmp is that signal mask saving behavior is not specified and varies between platforms. Signal mask saving may have a significant performance impact so you may want to force a specific provider - if performance matters for your application. (This is the case for OSX, + if performance matters for your application. (This is the case for macOS, for instance.) Removed in Duktape 1.5.0: edit duk_config.h directly. diff --git a/config/feature-options/DUK_OPT_SETJMP.yaml b/config/feature-options/DUK_OPT_SETJMP.yaml index 50464b97..ff00d5ba 100644 --- a/config/feature-options/DUK_OPT_SETJMP.yaml +++ b/config/feature-options/DUK_OPT_SETJMP.yaml @@ -9,7 +9,7 @@ description: > The default long control transfer provider is setjmp/longjmp because it is the most portable option. When a better provider is known for a platform, Duktape may default to that (e.g. _setjmp/_longjmp is the default for - OSX/iPhone, see GH-55). With this feature option you can force Duktape to + macOS/iOS, see GH-55). With this feature option you can force Duktape to explicitly use setjmp/longjmp even in these cases. The downside of setjmp/longjmp is that signal mask saving behavior is not diff --git a/config/helper-snippets/DUK_F_APPLE.h.in b/config/helper-snippets/DUK_F_APPLE.h.in index 3a3e63ad..4a934ee2 100644 --- a/config/helper-snippets/DUK_F_APPLE.h.in +++ b/config/helper-snippets/DUK_F_APPLE.h.in @@ -1,4 +1,4 @@ -/* Apple OSX, iOS */ +/* Apple macOS, iOS, watchOS, tvOS, Darwin, etc */ #if defined(__APPLE__) #define DUK_F_APPLE #endif diff --git a/config/platforms.yaml b/config/platforms.yaml index 10283748..d8a39b42 100644 --- a/config/platforms.yaml +++ b/config/platforms.yaml @@ -4,7 +4,7 @@ autodetect: # Platforms for autodetect header. Order matters because some defines # overlap, so rules select for more specific define first. - - name: Mac OSX, iPhone, Darwin + name: macOS, iOS, watchOS, tvOS, Darwin, etc check: DUK_F_APPLE include: platform_apple.h.in - diff --git a/doc/code-issues.rst b/doc/code-issues.rst index 2d0e5ab0..9ee2b404 100644 --- a/doc/code-issues.rst +++ b/doc/code-issues.rst @@ -1451,7 +1451,7 @@ When a pointer itself may be reassigned, the latter is correct, e.g.:: In practice it seems that some compilers have trouble guaranteeing these semantics for variables that are assigned to before ``setjmp()`` and not -changed before ``longjmp()``. For instance, there are crashes on OSX when +changed before ``longjmp()``. For instance, there are crashes on macOS when using ``_setjmp()`` in such cases. These crashes can be eliminated by declaring the variables volatile. (It might be that adding the "volatile" changes the compiler output enough to mask a different bug though.) diff --git a/doc/datetime.rst b/doc/datetime.rst index 8781c6f6..c2ee6861 100644 --- a/doc/datetime.rst +++ b/doc/datetime.rst @@ -235,8 +235,8 @@ See also: * http://www.gnu.org/software/libc/manual/html_node/Date-and-Time.html#Date-and-Time -OSX / Darwin ------------- +macOS / Darwin +-------------- Current implementation uses the same functions as on Linux. diff --git a/doc/duk-config.rst b/doc/duk-config.rst index 5bb194f6..adf43b64 100644 --- a/doc/duk-config.rst +++ b/doc/duk-config.rst @@ -48,7 +48,7 @@ The basic options are: Duktape distributable includes a default duk_config.h which autodetects the the platform, compiler, and architecture, and uses default values for all Duktape configuration options. This header should work "out of the box" for - Linux, OS X, Windows, and also for several more exotic platforms. If you're + Linux, macOS, Windows, and also for several more exotic platforms. If you're using one of the supported platform and default options are acceptable, this should be your default choice. Note that ``DUK_OPT_xxx`` compiler command line options are no longer supported in Duktape 2.x; to use non-default diff --git a/doc/performance-sensitive.rst b/doc/performance-sensitive.rst index 7b1c6326..f91e0c94 100644 --- a/doc/performance-sensitive.rst +++ b/doc/performance-sensitive.rst @@ -70,7 +70,7 @@ Suggested feature options - Edit ``DUK_SETJMP``, ``DUK_LONGJMP``, and ``DUK_JMPBUF_TYPE`` to change the setjmp provider. - - On some platforms (e.g. OSX/iPhone) Duktape will automatically use + - On some platforms (e.g. macOS/iOS) Duktape will automatically use ``_setjmp()``. * Consider enabling "fastints": diff --git a/releases/releases.yaml b/releases/releases.yaml index 036326d2..a3079517 100644 --- a/releases/releases.yaml +++ b/releases/releases.yaml @@ -307,7 +307,7 @@ duktape_releases: - "Add DUK_GIT_DESCRIBE macro to the C API (with no ECMAScript equivalent) to allow application code to e.g. log more detailed version information relevant for non-official snapshot builds" - "Add feature option DUK_OPT_NO_STRICT_DECL to disable support for 'use strict' declarations which may be useful with legacy code bases" - "Add DUK_OPT_SETJMP, DUK_OPT_UNDERSCORE_SETJMP, and DUK_OPT_SIGSETJMP to force an alternative provider for long control transfers; _setjmp() or sigsetjmp() (with savesigs set to 0) can be a lot faster than setjmp() if the platform's setjmp() implementation saves the signal mask (GH-55)" - - "Default to _setjmp() for long control transfers on OSX/iPhone (when __APPLE__ is defined) (GH-55)" + - "Default to _setjmp() for long control transfers on macOS/iOS (when __APPLE__ is defined) (GH-55)" - "Add SuperH detection support" - "Change JSON.stringify() to escape U+2028 and U+2029 by default to make the output a valid Javascript string, so that it can be embedded in a web page or parsed with eval (GH-68)" - "Change JSON.parse() to include a byte offset with a syntax error to help pinpoint JSON errors" @@ -384,7 +384,7 @@ duktape_releases: - "Make RegExp compiler/executor C stack limit higher on mainstream platforms (GH-157)" - "Add source code fileName/lineNumber to errors thrown during compilation (GH-140)" - "Improve MIPS32/MIPS64 detection, architecture strings in Duktape.env also updated ('mips32' or 'mips64') (GH-102)" - - "Add iPhone/iOS strings to Duktape.env" + - "Add iOS strings to Duktape.env" - "Add support for TI-Nspire (using Ndless, see GH-113)" - "Fix Unicode handling of CJK ideographs and Hangul which were incorrectly not accepted in identifier names (GH-103)" - "Fix function parsing bug where the left curly brace opening the function body was not checked and Duktape would accept e.g. 'function () [}' (GH-106)" @@ -492,7 +492,7 @@ duktape_releases: - "Internal performance improvements from removing dynamic buffer spare: small improvements to lexer, compiler bytecode emission, JSON parse() and stringify(), duk_map_string(), global object escape(), unescape() and variants, regexp compilation, string case conversion, and a few other places (GH-209)" - "Sizeof(duk_hbuffer_dynamic) reduced from 16 to 12 bytes for low memory builds which employ heap compression (GH-209)" - "Increase try-catch register limit (from 511 to 262143) to fix try-catch out-of-register issues for most code (GH-145)" - - "Remove DUK_OPT_DEEP_C_STACK (and DUK_USE_DEEP_C_STACK) in favor of explicit DUK_USE_xxx config options for native recursion limits; C stacks are assumed to be deep by default for all targets including OSX/iPhone (GH-165, GH-226)" + - "Remove DUK_OPT_DEEP_C_STACK (and DUK_USE_DEEP_C_STACK) in favor of explicit DUK_USE_xxx config options for native recursion limits; C stacks are assumed to be deep by default for all targets including macOS/iOS (GH-165, GH-226)" - "Make Proxy internal _Target and _Handler properties immutable (non-writable and non-configurable) (GH-237)" - "Remove internal support for dynamic buffer spare; improves performance a bit, reduces duk_hbuffer_dynamic footprint for both normal and low memory header (GH-209)" - "Incompatible change to debugger DumpHeap command format: dynamic buffer alloc size is no long sent because it was removed from the internal data structure (GH-209)" diff --git a/testrunner/run_commit_test.py b/testrunner/run_commit_test.py index 1cc23ae8..a5d61f2c 100644 --- a/testrunner/run_commit_test.py +++ b/testrunner/run_commit_test.py @@ -2,7 +2,7 @@ # # Python commit test run script. # -# Intended to work on Linux, OS X, and Windows (both Cygwin and command +# Intended to work on Linux, macOS, and Windows (both Cygwin and command # prompt). Some notes for portability: # # * Use os.path.join() to join paths. @@ -129,7 +129,7 @@ def unpack_zip(fn): z.close() def get_binary_size(fn): - # Pattern works for Linux and OS X. + # Pattern works for Linux and macOS. res = execute([ 'size', fn ]) m = re.compile(r'.*?^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+).*?', re.MULTILINE | re.DOTALL).match(res['stdout']) if m is None: @@ -1107,7 +1107,7 @@ context_handlers = { 'codemetrics': context_codemetrics, - # OS X: can currently share Linux handlers + # macOS: can currently share Linux handlers 'osx-x64-ecmatest': context_linux_x64_ecmatest, 'osx-x64-qecmatest': context_linux_x64_ecmatest, diff --git a/website/README.rst b/website/README.rst index f1968418..cb2644ad 100644 --- a/website/README.rst +++ b/website/README.rst @@ -176,7 +176,7 @@ Without any document meta headers Nokia N9, for instance, attempts to get:: GET /apple-touch-icon-precomposed.png GET /apple-touch-icon.png -iPhone/iPad versions will have different automatic icon searches, like:: +iOS versions will have different automatic icon searches, like:: GET /apple-touch-icon-57x57-precomposed.png GET /apple-touch-icon-57x57.png diff --git a/website/guide/datetime.html b/website/guide/datetime.html index 119e48a8..4ed18e94 100644 --- a/website/guide/datetime.html +++ b/website/guide/datetime.html @@ -4,7 +4,7 @@ to more exotic environments. The duk_config.h configuration header selects platform specific providers needed to implement the Date built-in. Duktape has built-in providers for mainstream -platforms (Linux, Windows, OS X) which should usually work without changes. +platforms (Linux, Windows, macOS) which should usually work without changes. You can also write an external Date provider for more exotic environments. An external Date provider can also be used e.g.