Merge branch 'joshuroar-master'

Author: Achimh3011

04-ClassMembers/member.py

@@ -4,7 +4,7 @@
 
 m1 = member.SomeClass("Pavel")
 print ("name =",m1.name)
-m1.name = "Günther"
+m1.name = "Gunther"
 print ("name =",m1.name)
 
 

CMakeLists.txt

@@ -1,7 +1,11 @@
 cmake_minimum_required(VERSION 2.8.3)
 FIND_PACKAGE(PythonInterp)
 FIND_PACKAGE(PythonLibs)
-FIND_PACKAGE(Boost COMPONENTS python)
+if(APPLE AND ${PYTHON_VERSION_MAJOR} EQUAL 3)
+    FIND_PACKAGE(Boost COMPONENTS python3)
+else()
+    FIND_PACKAGE(Boost COMPONENTS python)
+endif()
 
 ENABLE_TESTING()
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
@@ -20,4 +24,3 @@ ADD_SUBDIRECTORY(10-Embedding)
 ADD_SUBDIRECTORY(11-Iterators)
 ADD_SUBDIRECTORY(12-Exceptions)
 ADD_SUBDIRECTORY(13-AutoInstantiation)
-

README.md

@@ -21,7 +21,7 @@ There is a special package needed called boost-python. The standard boost packag
 
 + `brew install cmake boost-python`
 
-Furthermore, for the homebrew python lib to be used, unfortunately the full path has to be given:
+Furthermore, for the homebrew python lib to be used, its path must be provided to cmake. This is handled in the `build.sh` script, but for reference, or if any issues arise, that can be done manually as follows (substitute the path as appropriate for your Python version):
 
     cmake -DPYTHON_LIBRARY=/usr/local/Cellar/python/2.7.9/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib ..
 
@@ -39,7 +39,7 @@ All examples contain tests, but these only try to run the examples without check
 
 ## Python 3
 
-The code works with PYthon3 both on Linux and on OS X. However, there is an astonishing number of loops to hop through.
+The code works with Python 3 both on Linux and on OS X. However, there are several caveats.
 
 ### Linux
 
@@ -49,7 +49,12 @@ The code works with PYthon3 both on Linux and on OS X. However, there is an asto
 
 ### OS X (again with homebrew)
 
+Some effort has been made to make Python 3 compilation automatic, by making modifications to `build.sh` and `CMakeLists.txt` that account for quirks on the Apple platform regarding cmake, paths, and naming conventions for python/python3. Having said that, if you use `build.sh`, then you will still need to do the following:
+
 + Build Boost::Python against Python 3 (needs at least version 1.56.0)
-+ make sure `python` resolves to python3 (e.g., by using a python3 VE)
++ make sure `python` resolves to python3 (e.g., by using virtualenv)
+
+If you are building without `build.sh`, then you will additionally need to:
+
 + run `cmake -DBOOST_ROOT=xxx -DPYTHON_LIBRARY=xxx -DPYTHON_INCLUDE_DIR=xxx ..`
-+ set DYLD_LIBRARY_PATH to the directory where the boost::python shared library resides before `make test`
++ As of the time of this writing, the naming convention is that python2 is called "python" and python3 is called "python3" on the Apple platform. Therefore, in `CMakeLists.txt` verify that the line `FIND_PACKAGE(Boost COMPONENTS python)` is changed to `FIND_PACKAGE(Boost COMPONENTS python3)`.

build.sh

@@ -5,5 +5,25 @@ set -x
 cd ${0%%$(basename $0)}
 mkdir build
 cd build
-cmake -DCMAKE_BUILD_TYPE=DEBUG .. && make && make test
+
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+    cmake -DCMAKE_BUILD_TYPE=DEBUG .. && make && make test
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    PYTHON_VERSION=`python -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_info[:2]));sys.stdout.write(t)";`
+    PYTHON_LIBRARY=/usr/local/Frameworks/Python.framework/Versions/$PYTHON_VERSION/lib/libpython$PYTHON_VERSION.dylib
+    PYTHON_INCLUDE_DIR=/usr/local/Frameworks/Python.framework/Versions/$PYTHON_VERSION/Headers/
+    cmake -DPYTHON_LIBRARY=$PYTHON_LIBRARY -DPYTHON_INCLUDE_DIR=$PYTHON_INCLUDE_DIR -DCMAKE_BUILD_TYPE=DEBUG .. && make && make test
+elif [[ "$OSTYPE" == "cygwin" ]]; then
+    : # POSIX compatibility layer and Linux environment emulation for Windows
+elif [[ "$OSTYPE" == "msys" ]]; then
+    : # shell and GNU utilities compiled for Windows as part of MinGW
+elif [[ "$OSTYPE" == "win32" ]]; then
+    : # good luck
+elif [[ "$OSTYPE" == "freebsd"* ]]; then
+    : # ...
+else
+    : # Unknown.
+fi
+
+