From 97494ab9d13a73f3b84092814e47445b31ee5e0b Mon Sep 17 00:00:00 2001 From: LZaw <28070263+LZaw@users.noreply.github.com> Date: Mon, 16 Nov 2020 02:30:16 +0100 Subject: [PATCH 1/8] Update LLVM and OSL versions --- scripts/travis/build-macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index 70e8c0941e..1cc226ea9f 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -71,7 +71,7 @@ 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 boost-python embree llvm@9 lz4 openimageio openvdb 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")' \ @@ -90,7 +90,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 From 75b8f8606ec61109575d5321286c30eda5378df8 Mon Sep 17 00:00:00 2001 From: LZaw <28070263+LZaw@users.noreply.github.com> Date: Mon, 16 Nov 2020 03:21:02 +0100 Subject: [PATCH 2/8] Update Cmake Command for OSL --- scripts/travis/build-macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index 1cc226ea9f..8d1710a888 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -102,7 +102,7 @@ cmake \ -DENABLERTTI=ON \ -DUSE_LIBCPLUSPLUS=ON \ -DUSE_QT=OFF \ - -DLLVM_DIRECTORY=/usr/local/opt/llvm@6/ \ + -DLLVM_DIRECTORY=/usr/local/opt/llvm@9/ \ -DCMAKE_INSTALL_PREFIX=$THISDIR \ .. From d1440e356dc264bdcb77127349f34e877ec0a960 Mon Sep 17 00:00:00 2001 From: LZaw Date: Mon, 16 Nov 2020 13:07:44 +0100 Subject: [PATCH 3/8] Test old OSL with LLVM7 --- scripts/travis/build-macos.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index 8d1710a888..b0dab881af 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -71,7 +71,7 @@ brew info python@2 brew upgrade boost brew upgrade qt -brew install boost-python embree llvm@9 lz4 openimageio openvdb xerces-c zlib +brew install boost-python embree llvm@7 lz4 openimageio openvdb 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")' \ @@ -90,7 +90,7 @@ echo "Building OSL..." git clone https://github.com/imageworks/OpenShadingLanguage.git pushd OpenShadingLanguage -git checkout Release-1.11.9.0 +git checkout Release-1.10.3 mkdir build cd build @@ -102,7 +102,7 @@ cmake \ -DENABLERTTI=ON \ -DUSE_LIBCPLUSPLUS=ON \ -DUSE_QT=OFF \ - -DLLVM_DIRECTORY=/usr/local/opt/llvm@9/ \ + -DLLVM_DIRECTORY=/usr/local/opt/llvm@7/ \ -DCMAKE_INSTALL_PREFIX=$THISDIR \ .. From 85ac3e60ad7ee4ea4dca575473f7d456cbc9f459 Mon Sep 17 00:00:00 2001 From: LZaw Date: Mon, 16 Nov 2020 14:53:11 +0100 Subject: [PATCH 4/8] Add missing Dependency --- scripts/travis/build-macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index b0dab881af..63aac7638c 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -71,7 +71,7 @@ brew info python@2 brew upgrade boost brew upgrade qt -brew install boost-python embree llvm@7 lz4 openimageio openvdb xerces-c zlib +brew install boost-python embree llvm@7 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")' \ From 76fdaef69ce0204a006ea9f299d05d987c0310c8 Mon Sep 17 00:00:00 2001 From: LZaw Date: Mon, 16 Nov 2020 16:12:23 +0100 Subject: [PATCH 5/8] Adapt OpenImageIO Version --- scripts/travis/build-macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index 63aac7638c..c7a082c450 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -71,7 +71,7 @@ brew info python@2 brew upgrade boost brew upgrade qt -brew install boost-python embree llvm@7 lz4 openimageio openvdb pugixml xerces-c zlib +brew install boost-python embree llvm@7 lz4 openimageio@2.0.4 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")' \ From 7d817b6306bba3d327890fa420499d0520771013 Mon Sep 17 00:00:00 2001 From: LZaw Date: Tue, 17 Nov 2020 13:13:09 +0100 Subject: [PATCH 6/8] Adapt OSL and LLVM version --- scripts/travis/build-macos.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index c7a082c450..2ccc754952 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -71,7 +71,7 @@ brew info python@2 brew upgrade boost brew upgrade qt -brew install boost-python embree llvm@7 lz4 openimageio@2.0.4 openvdb pugixml xerces-c zlib +brew install boost-python 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")' \ @@ -90,7 +90,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 +102,7 @@ cmake \ -DENABLERTTI=ON \ -DUSE_LIBCPLUSPLUS=ON \ -DUSE_QT=OFF \ - -DLLVM_DIRECTORY=/usr/local/opt/llvm@7/ \ + -DLLVM_DIRECTORY=/usr/local/opt/llvm@8/ \ -DCMAKE_INSTALL_PREFIX=$THISDIR \ .. From db5fa870c4ef85719a49cc96b3670a9b4505e542 Mon Sep 17 00:00:00 2001 From: LZaw <28070263+LZaw@users.noreply.github.com> Date: Sun, 3 Jan 2021 00:11:54 +0100 Subject: [PATCH 7/8] Remove Disney Material Flag From CMake Command --- scripts/travis/build-macos.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index 2ccc754952..56f485691e 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -165,7 +165,6 @@ 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 \ @@ -179,10 +178,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 \ .. From 87189be438c53ce0467ca08d05c1c6e124298ced Mon Sep 17 00:00:00 2001 From: LZaw Date: Fri, 29 Jan 2021 14:04:43 +0100 Subject: [PATCH 8/8] Build boost manually, remove SeExpr --- scripts/travis/build-macos.sh | 53 ++++++++++++++--------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh index 56f485691e..0ae593d886 100644 --- a/scripts/travis/build-macos.sh +++ b/scripts/travis/build-macos.sh @@ -69,9 +69,8 @@ brew unlink python@2 brew upgrade python@2 brew info python@2 -brew upgrade boost brew upgrade qt -brew install boost-python embree llvm@8 lz4 openimageio openvdb pugixml 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")' \ @@ -79,6 +78,25 @@ echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' \ 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. @@ -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. @@ -168,7 +157,7 @@ cmake \ -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 \