From cb092291a57db00ba8ee1faa995f15eb027cae28 Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Sun, 1 Nov 2015 19:43:50 +0800 Subject: [PATCH 1/3] Change Mac OS X to OS X Apple has renamed Mac OS X to OS X. --- README.md | 2 +- doc/build-osx.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d6f4ed8e..89aab831 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Please follow the instructions for your platform: - [UNIX](https://github.com/miguelfreitas/twister-core/blob/master/doc/build-unix.md) - [Debian/Ubuntu](https://github.com/miguelfreitas/twister-core/blob/master/doc/building-on-ubuntu-debian.md) -- [Mac OS X](https://github.com/miguelfreitas/twister-core/blob/master/doc/build-osx.md) +- [OS X](https://github.com/miguelfreitas/twister-core/blob/master/doc/build-osx.md) - [Windows (untested)](https://github.com/miguelfreitas/twister-core/wiki/Compiling-for-Windows) > According to our tests, at least 1GB of RAM is needed to compile Twister. diff --git a/doc/build-osx.md b/doc/build-osx.md index aa87c310..425c660f 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -1,6 +1,6 @@ -Mac OS X Build Instructions and Notes +OS X Build Instructions and Notes ==================================== -This guide will show you how to build twisterd for OSX. +This guide will show you how to build twisterd for OS X. Notes ----- From e10cedebea9fed808c2e64e5e37868b203eeec58 Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Sun, 1 Nov 2015 19:55:19 +0800 Subject: [PATCH 2/3] Change GitHub for Mac to GitHub Desktop GitHub Desktop replaces GitHub for Mac and Windows with a unified experience across both platforms. --- doc/build-osx.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/build-osx.md b/doc/build-osx.md index 425c660f..1c40706b 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -21,9 +21,9 @@ Xcode 4.3 or later, you'll need to install its command line tools. This can be done in `Xcode > Preferences > Downloads > Components` and generally must be re-done or updated every time Xcode is updated. -There's an assumption that you already have `git` installed, as well. If -not, it's the path of least resistance to install [Github for Mac](https://mac.github.com/) -(OS X 10.7+) or +There's an assumption that you already have `git` installed, as well. If not, +it's the path of least resistance to install +[GitHub Desktop](https://desktop.github.com/) or [Git for OS X](https://code.google.com/p/git-osx-installer/). It is also available via Homebrew or MacPorts. From 1ec4ebda0c641df00eb7ec447311841a4c2c3bfb Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Sun, 1 Nov 2015 20:14:19 +0800 Subject: [PATCH 3/3] Update the homepage of Homebrew and Docker --- README.md | 2 +- doc/build-osx.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 89aab831..bf28c460 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Please follow the instructions for your platform: > According to our tests, at least 1GB of RAM is needed to compile Twister. -Alternatively, you can run Twister on an isolated Linux container, using [Docker](http://docker.io/). First, [install Docker on your system](https://docs.docker.com/installation/#installation). Then run: +Alternatively, you can run Twister on an isolated Linux container, using [Docker](https://www.docker.com/). First, [install Docker on your system](https://docs.docker.com/installation/#installation). Then run: # Leave out the "sudo -E" if you added yourself to the "docker" group sudo -E ./twister-on-docker run --remote diff --git a/doc/build-osx.md b/doc/build-osx.md index 1c40706b..4b6876ef 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -27,7 +27,7 @@ it's the path of least resistance to install [Git for OS X](https://code.google.com/p/git-osx-installer/). It is also available via Homebrew or MacPorts. -You will also need to install [Homebrew](http://mxcl.github.io/homebrew/) +You will also need to install [Homebrew](http://brew.sh/) or [MacPorts](https://www.macports.org/) in order to install library dependencies. It's largely a religious decision which to choose, but I tested only with Homebrew. @@ -36,7 +36,7 @@ The installation of the actual dependencies is covered in the Instructions sections below. -Instructions: HomeBrew +Instructions: Homebrew ---------------------- #### Install dependencies using Homebrew @@ -56,7 +56,7 @@ Instructions: HomeBrew ./autotool.sh ./configure --enable-logging --with-openssl=/usr/local/opt/openssl --with-libdb=/usr/local/opt/berkeley-db4 make -(If you have multi core CPU, use "make -j N" where N = number of your cores) +(If you have multi core CPU, use "make -j N" where N = the number of your cores) 3. If things go south, before trying again, make sure you clean it up: