Change OSL to Version 1.11.9 and LLVM to Version 9

scripts/travis/build-macos.sh

@@ -69,16 +69,34 @@ brew unlink python@2
 brew upgrade python@2
 brew info python@2
 
-brew upgrade boost
 brew upgrade qt
-brew install boost-python embree llvm@6 lz4 openimageio openvdb xerces-c zlib
+brew install embree llvm@8 lz4 openimageio openvdb pugixml xerces-c zlib
 
 mkdir -p $HOME/Library/Python/2.7/lib/python/site-packages
 echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' \
     >> $HOME/Library/Python/2.7/lib/python/site-packages/homebrew.pth
 
 echo "travis_fold:end:brew-packages"
 
+#--------------------------------------------------------------------------------------------------
+# Build boost.
+#--------------------------------------------------------------------------------------------------
+
+echo "travis_fold:start:boost"
+echo "Building Boost..."
+
+git clone https://github.com/boostorg/boost.git
+pushd boost
+
+git checkout boost-1.69.0
+git submodule update --init
+
+./bootstrap.sh --prefix=$THISDIR --with-python-version=2.7 --with-python-root=/usr/local/opt/python@2/
+./b2 cxxflags=-std=c++11 install
+
+popd
+
+echo "travis_fold:end:boost"
 
 #--------------------------------------------------------------------------------------------------
 # Build OSL.
@@ -90,7 +108,7 @@ echo "Building OSL..."
 git clone https://github.com/imageworks/OpenShadingLanguage.git
 pushd OpenShadingLanguage
 
-git checkout Release-1.10.3
+git checkout Release-1.11.9.0
 
 mkdir build
 cd build
@@ -102,7 +120,7 @@ cmake \
     -DENABLERTTI=ON \
     -DUSE_LIBCPLUSPLUS=ON \
     -DUSE_QT=OFF \
-    -DLLVM_DIRECTORY=/usr/local/opt/llvm@6/ \
+    -DLLVM_DIRECTORY=/usr/local/opt/llvm@8/ \
     -DCMAKE_INSTALL_PREFIX=$THISDIR \
     ..
 
@@ -113,35 +131,6 @@ popd
 echo "travis_fold:end:osl"
 
 
-#--------------------------------------------------------------------------------------------------
-# Build SeExpr.
-#--------------------------------------------------------------------------------------------------
-
-echo "travis_fold:start:seexpr"
-echo "Building SeExpr..."
-
-git clone https://github.com/appleseedhq/SeExpr
-pushd SeExpr
-
-git checkout appleseed-qt5
-
-mkdir build
-cd build
-
-cmake \
-    -Wno-dev \
-    -DCMAKE_PREFIX_PATH=/usr/local/opt/qt \
-    -DCMAKE_INSTALL_PREFIX=$THISDIR \
-    ..
-
-mkdir src/doc/html
-make install -j 2
-
-popd
-
-echo "travis_fold:end:seexpr"
-
-
 #--------------------------------------------------------------------------------------------------
 # Prepare to run appleseed.
 # This must be done before compiling appleseed because the compiling process needs to invokes oslc.
@@ -165,11 +154,10 @@ cmake \
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
     -DCMAKE_PREFIX_PATH=/usr/local/opt/qt \
-    -DWITH_DISNEY_MATERIAL=ON \
     -DWITH_EMBREE=ON \
     -DUSE_SSE42=ON \
     -DUSE_STATIC_BOOST=OFF \
-    -DBoost_PYTHON_LIBRARY=/usr/local/lib/libboost_python27.dylib \
+    -DBoost_PYTHON_LIBRARY=$THISDIR/boost/lib/libboost_python27.dylib \
     -DOSL_INCLUDE_DIR=$THISDIR/include \
     -DOSL_LIBRARIES=$THISDIR/lib \
     -DOSL_EXEC_LIBRARY=$THISDIR/lib/liboslexec.dylib \
@@ -179,10 +167,6 @@ cmake \
     -DOSL_QUERY_INFO=$THISDIR/bin/oslinfo \
     -DPYTHON_INCLUDE_DIR=/usr/local/opt/python@2/Frameworks/Python.framework/Versions/2.7/include/python2.7/ \
     -DPYTHON_LIBRARY=/usr/local/opt/python@2/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib \
-    -DSEEXPR_INCLUDE_DIR=$THISDIR/include \
-    -DSEEXPR_LIBRARY=$THISDIR/lib/libSeExpr.dylib \
-    -DSEEXPREDITOR_INCLUDE_DIR=$THISDIR/include \
-    -DSEEXPREDITOR_LIBRARY=$THISDIR/lib/libSeExprEditor.dylib \
     -DZLIB_INCLUDE_DIR=/usr/local/opt/zlib/include \
     -DZLIB_LIBRARY=/usr/local/opt/zlib/lib/libz.dylib \
     ..