Permalink
Browse files

Use "macOS" consistently

macOS seems to be the current name for Mac OS X.
  • Loading branch information...
tbm committed Jan 9, 2019
1 parent 6142726 commit 863cb3bdb7bc3650873253e108b26eb3fe15862d
Showing with 11 additions and 11 deletions.
  1. +2 −2 .travis.yml
  2. +1 −1 CMakeLists.txt
  3. +1 −1 INSTALL.md
  4. +3 −3 README.md
  5. +4 −4 acprep
@@ -38,7 +38,7 @@ matrix:
# either crashes clang or results in a ledger binary that crashes with SIGSEGV.
- os: osx
compiler: gcc
# On Mac OS X building ledger with GNU GCC 4.8 fails due to
# On macOS building ledger with GNU GCC 4.8 fails due to
# undefined symbols, maybe because boost was not being built with g++-4.8.
# Undefined symbols for architecture x86_64:
# "boost::re_detail::perl_matcher<char const*, std::allocator<boost::sub_match<char const*> >, boost::regex_traits<char, boost::cpp_regex_traits<char> > >::construct_init(boost::basic_regex<char, boost::regex_traits<char, boost::cpp_regex_traits<char> > > const&, boost::regex_constants::_match_flags)", referenced from:
@@ -49,7 +49,7 @@ matrix:
# bool boost::regex_search<char const*, char, boost::regex_traits<char, boost::cpp_regex_traits<char> > >(char const*, char const*, boost::basic_regex<char, boost::regex_traits<char, boost::cpp_regex_traits<char> > > const&, boost::regex_constants::_match_flags) in global.cc.o
- os: osx
compiler: clang
# On Mac OS X building ledger with clang fails due to
# On macOS building ledger with clang fails due to
# dyld: Library not loaded: libboost_python.dylib
# Referenced from: /Users/travis/build/ledger/ledger/ledger
# Reason: image not found
@@ -260,7 +260,7 @@ macro(add_ledger_library_dependencies _target)
endif()
if (HAVE_BOOST_PYTHON)
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
# Don't link directly to a Python framework on OS X, to avoid segfaults
# Don't link directly to a Python framework on macOS, to avoid segfaults
# when the module is imported from a different interpreter
target_link_libraries(${_target} ${Boost_LIBRARIES})
set_target_properties(${_target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
@@ -115,7 +115,7 @@ Q: Whenever I try to use the Python support, I get a segfault

A: Make sure that the boost_python library you linked against is using the
exact same Python as the Ledger executable. In particular I see this
bug on OS X systems where boost_python is linked against the default
bug on macOS systems where boost_python is linked against the default
Python, while Ledger is linked against the version provided by MacPorts.
Or vice versa.

@@ -94,9 +94,9 @@ Dependency | Version
[expat] | 2.0.1 _optional_
[libxml2] | 2.7.2 _optional_

### Mac OS X
### macOS

You can use [Homebrew] or [MacPorts] to install Ledger easily on OS X.
You can use [Homebrew] or [MacPorts] to install Ledger easily on macOS.

#### 1. Homebrew

@@ -111,7 +111,7 @@ If you to want to startup python, use the following command:

#### 2. MacPorts

If you build stuff using MacPorts on OS X, as I do, here is what you would
If you build stuff using MacPorts on macOS, as I do, here is what you would
run:

$ sudo port install -f cmake python26 \
8 acprep
@@ -514,7 +514,7 @@ class PrepareBuild(CommandLineApp):

if system == 'Darwin':
if exists('/opt/local/bin/port'):
self.log.info('Looks like you are using MacPorts on OS X')
self.log.info('Looks like you are using MacPorts on macOS')
packages = [
'sudo', 'port', 'install', '-f',
'automake', 'autoconf', 'libtool',
@@ -531,7 +531,7 @@ class PrepareBuild(CommandLineApp):
self.log.info('Executing: ' + ' '.join(packages))
self.execute(*packages)
elif exists('/usr/local/bin/brew') or exists('/opt/local/bin/brew'):
self.log.info('Looks like you are using Homebrew on OS X')
self.log.info('Looks like you are using Homebrew on macOS')
packages = [
'brew', 'install',
'cmake', 'ninja',
@@ -540,7 +540,7 @@ class PrepareBuild(CommandLineApp):
self.log.info('Executing: ' + ' '.join(packages))
self.execute(*packages)
elif exists('/sw/bin/fink'):
self.log.info('Looks like you are using Fink on OS X')
self.log.info('Looks like you are using Fink on macOS')
self.log.error("I don't know the package names for Fink yet!")
sys.exit(1)

@@ -1086,7 +1086,7 @@ being 'debug':
debug Debugging and --verify support (default)
opt Full optimizations
gcov Coverage analysis
gprof Code profiling (for OS X, just use: 'shark -i ledger ...')
gprof Code profiling (for macOS, just use: 'shark -i ledger ...')
Next is the optional build PHASE, with 'config' being the default:

0 comments on commit 863cb3b

Please sign in to comment.