diff options
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/macosx-codesign-app-bundle | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 4 | ||||
| -rwxr-xr-x | solenv/gbuild/config.guess | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/unittest-failed-MACOSX.sh | 2 | ||||
| -rw-r--r-- | solenv/maven/README.md | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index f5ccff1475f1..85d74514585c 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -11,7 +11,7 @@ set -o pipefail # from installer::simplepackage::create_package() in solenv/bin/modules/installer/simplepackage.pm # and the test-install target in Makefile.in. -test `uname` = Darwin || { echo This is for OS X only; exit 1; } +test `uname` = Darwin || { echo This is for macOS only; exit 1; } test $# = 1 || { echo Usage: $0 app-bundle; exit 1; } diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index f5337e59dc18..46f9f477d1b1 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -223,7 +223,7 @@ sub replace_variables_in_scriptfile # Creating the "simple" package. # "zip" for Windows # "tar.gz" for all other platforms -# additionally "dmg" on Mac OS X +# additionally "dmg" on macOS ############################################# sub create_package @@ -405,7 +405,7 @@ sub create_package { my $subdir = "$tempdir/$packagename/$volume_name_classic_app.app/Contents/Resources"; if ( ! -d $subdir ) { installer::systemactions::create_directory($subdir); } - # iterate over OS X localizations + # iterate over macOS localizations foreach $lang ("ca", "cs", "da", "de", "el", "en", "es", "fi", "fr", "hr", "hu", "id", "it", "ja", "ko", "ms", "nl", "no", "pl", "pt", "pt_PT", "ro", "ru", "sk", "sv", "th", "tr", "uk", "vi", "zh_CN", "zh_TW") { installer::systemactions::create_directory($subdir . "/" . $lang . ".lproj"); diff --git a/solenv/gbuild/config.guess b/solenv/gbuild/config.guess index a7448442748c..61b5c7b0f3f7 100755 --- a/solenv/gbuild/config.guess +++ b/solenv/gbuild/config.guess @@ -1324,9 +1324,9 @@ EOF fi fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub + # Avoid executing cc on macOS 10.9, as it ships with a stub # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or + # developer tools. Any system running macOS 10.7 or # later (Darwin 11 and later) is required to have a 64-bit # processor. This is not true of the ARM version of Darwin # that Apple uses in portable devices. diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 4c3531934d5e..4b2786df1856 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -147,7 +147,7 @@ gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/Unpack # UIConfig class -# Mac OS X sort(1) cannot read a response file +# macOS sort(1) cannot read a response file define gb_UIConfig__command $(call gb_Helper_abbreviate_dirs,\ $(SORT) -u $(UI_IMAGELISTS) /dev/null > $@ \ diff --git a/solenv/gbuild/platform/unittest-failed-MACOSX.sh b/solenv/gbuild/platform/unittest-failed-MACOSX.sh index 7994dbd56b01..049da92b4c3c 100755 --- a/solenv/gbuild/platform/unittest-failed-MACOSX.sh +++ b/solenv/gbuild/platform/unittest-failed-MACOSX.sh @@ -19,7 +19,7 @@ cat << EOF Error: a unit test failed, please do one of: -make $1Test_$2 CPPUNITTRACE="lldb --" # for interactive debugging on OS X +make $1Test_$2 CPPUNITTRACE="lldb --" # for interactive debugging on macOS make $1Test_$2 VALGRIND=memcheck # for memory checking You can limit the execution to just one particular test by: diff --git a/solenv/maven/README.md b/solenv/maven/README.md index 3ff8a137c85c..29f853fbb6e5 100644 --- a/solenv/maven/README.md +++ b/solenv/maven/README.md @@ -132,7 +132,7 @@ To install it system wide: Put $HOME/watchman/bin/watchman in path or link to $HOME/bin/watchman. -To install watchman on OS X: +To install watchman on macOS: ---- brew install --HEAD watchman @@ -230,7 +230,7 @@ credentials: </settings> ---- -It can also be included in the key chain on OS X. +It can also be included in the key chain on macOS. == Update Versions |