README-OSX.md
authorDirk Zimmermann <dirk@pep-project.org>
Tue, 22 Nov 2016 15:14:28 +0100
changeset 141426697bb8bc2c
parent 1413 41c869ac1c48
child 1415 8c9d32441394
README-OSX.md
README-OSX.md
     1.1 --- a/README-OSX.md	Tue Nov 22 14:57:53 2016 +0100
     1.2 +++ b/README-OSX.md	Tue Nov 22 15:14:28 2016 +0100
     1.3 @@ -12,15 +12,6 @@
     1.4  Note that you need [Xcode installed](https://www.macports.org/install.php)
     1.5  for MacPorts, and for building the engine. You also need to accept Xcode's EULA.
     1.6  
     1.7 -*Note*: Use the script `macports_env.sh` (or a similar one) to set up a clean build environment
     1.8 -before building the engine:
     1.9 -
    1.10 -```
    1.11 -. macports_env.sh
    1.12 -```
    1.13 -
    1.14 -If you don't use that environment, please make sure you've set up all search paths correctly.
    1.15 -
    1.16  #### MacPorts dependencies
    1.17  
    1.18  ```
    1.19 @@ -32,6 +23,14 @@
    1.20  sudo port install zlib
    1.21  ```
    1.22  
    1.23 +There are others, please refer to the engine README.txt.
    1.24 +
    1.25 +Make sure that `python` is a version 2 one:
    1.26 +
    1.27 +```
    1.28 +sudo port select python python27
    1.29 +```
    1.30 +
    1.31  ### Other dependecies
    1.32  
    1.33  #### [yml2](https://fdik.org/yml/toolchain)
    1.34 @@ -57,19 +56,6 @@
    1.35  cp ./src/.libs/libetpan.a ~/lib/
    1.36  ```
    1.37  
    1.38 -##### libetpan with xcodebuild
    1.39 -
    1.40 -The build with autoconf (see previous section) is preferred. This is just for completeness.
    1.41 -*Don't actually build libetpan with xcodebuild.*
    1.42 -
    1.43 -```
    1.44 -git clone https://github.com/fdik/libetpan libetpan-osx
    1.45 -cd libetpan-osx/build-mac
    1.46 -xcodebuild -project libetpan.xcodeproj/ -target "static libetpan"
    1.47 -mkdir ~/lib
    1.48 -cp build/Release/libetpan.a ~/lib/
    1.49 -```
    1.50 -
    1.51  ### Configuration
    1.52  
    1.53  You can change some defaults by editing `Makefile.conf`. But this readme assumes you don't.
    1.54 @@ -102,13 +88,8 @@
    1.55  
    1.56  ### Run tests
    1.57  
    1.58 -Make sure that you add `/opt/local/lib` to each definition of `LD_LIBRARY_PATH`
    1.59 -in `test/Makefile`. This ensures that libgpgme will be found:
    1.60 -
    1.61 -```
    1.62 -test: pEpEngineTest
    1.63 -        LD_LIBRARY_PATH=/opt/local/lib:~/lib:../src ./pEpEngineTest
    1.64 -```
    1.65 +If you installed the test keys in your keyring (README.txt),
    1.66 +this should just work:
    1.67  
    1.68  ```
    1.69  make test