Skip to content

Commit 6ffbcc9

Browse files
author
Chris Piker
committed
Updated MacOS docs
1 parent 92ab164 commit 6ffbcc9

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,17 @@ prequisites are provided below \.\.\.
3636
$ sudo yum install expat-devel fftw-devel openssl-devel # RedHat 7 and similar
3737
$ sudo apt install libexpat-dev libfftw3-dev libssl-dev zlib1g-dev # Debian 9 and similar
3838
```
39-
And on windows using [vcpkg](https://github.com/microsoft/vcpkg).
39+
and on windows using [vcpkg](https://github.com/microsoft/vcpkg)\.\.\.
4040
```batchfile
4141
> vcpkg install openssl fftw3 zlib expat pthreads --triplet x64-windows-static
4242
```
43+
or on mac using [brew](https://brew.sh)
44+
```bash
45+
$ brew install openssl
46+
$ brew install fftw
47+
```
48+
The expat library should already be present on MacOS once the compiler install
49+
command `xcode-select --install` has been run.
4350

4451
## Build and Install
4552

doc/install_fedora.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ the following commands. Pressing Y as needed.
6161
========================
6262

6363
$ cd
64-
$ mkdir svn
65-
$ cd svn
66-
$ svn co https://saturn.physics.uiowa.edu/svn/das2/core/stable/libdas2_3
67-
$ cd libdas2
64+
$ mkdir git
65+
$ cd git
66+
$ git clone https://github.com/das-developers/das2C.git
67+
$ cd das2C
6868

6969

7070
4. Set environment variables

doc/install_mac.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ installer for which will expect mouse clicks to proceeds.
2727

2828
After installing XCode check that you have the tools run:
2929

30-
$ svn -version
30+
$ git -version
3131

3232
and you should see a bit of diagnostic information about the subversion tool
33-
printed to the screen. If instead you see the message: "-bash: svn: command
33+
printed to the screen. If instead you see the message: "-bash: git: command
3434
not found", then svn is not installed.
3535

3636
To check that you have a compiler run
3737

38-
$ gcc --version
38+
$ clang --version
3939

4040
and you should see a small bit of diagnostic information about the compiler,
4141
if instead the output is "-bash: gcc: command not found" then gcc is not
@@ -57,8 +57,7 @@ It install homebrew (from https://brew.sh ):
5757
To test that it's installed run:
5858

5959
$ brew --version
60-
61-
60+
6261
3. Install prerequisite libraires
6362
=================================
6463
To install the header files and libraies needed to compile libdas2 run
@@ -72,10 +71,10 @@ the following commands:
7271
========================
7372

7473
$ cd
75-
$ mkdir svn
76-
$ cd svn
77-
$ svn co https://saturn.physics.uiowa.edu/svn/das2/core/stable/libdas2_3
78-
$ cd libdas2
74+
$ mkdir git
75+
$ cd git
76+
$ git clone https://github.com/das-developers/das2C.git
77+
$ cd das2C
7978

8079
4. Set environment variables
8180
============================

0 commit comments

Comments
 (0)