wip

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

src/build-scripts/build_libpng.bash

@@ -2,9 +2,9 @@
 
 # Utility script to download and build libpng
 #
-# Copyright Contributors to the OpenImageIO project.
-# SPDX-License-Identifier: Apache-2.0
-# https://github.com/AcademySoftwareFoundation/OpenImageIO
+# Copyright Contributors to the Open Shading Language project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
 
 # Exit the whole script if any command fails.
 set -ex

src/build-scripts/build_openimageio.bash

@@ -48,7 +48,8 @@ if [[ "$DEBUG" == "1" ]] ; then
 fi
 
 # if [[ "$ARCH" == "windows64" ]] ; then
-cmake   -S . -B ${OPENIMAGEIO_BUILD_DIR} \
+cmake   -S ${OPENIMAGEIO_SOURCE_DIR} -B ${OPENIMAGEIO_BUILD_DIR} \
+        -G "$CMAKE_GENERATOR" \
         -DCMAKE_BUILD_TYPE="${OPENIMAGEIO_BUILD_TYPE}" \
         -DCMAKE_INSTALL_PREFIX="${OPENIMAGEIO_INSTALL_DIR}" \
         -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
@@ -62,7 +63,7 @@ time cmake --build ${OPENIMAGEIO_BUILD_DIR} --target install --config ${OPENIMAG
 popd
 
 export OpenImageIO_ROOT=$OPENIMAGEIO_INSTALL_DIR
-export PATH=$OpenImageIO_ROOT/bin:$PATH
+# export PATH=$OpenImageIO_ROOT/bin:$PATH
 export DYLD_LIBRARY_PATH=$OpenImageIO_ROOT/lib:$DYLD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$OpenImageIO_ROOT/lib:$LD_LIBRARY_PATH
 export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH

src/build-scripts/ci-build.bash

@@ -8,6 +8,12 @@
 # any command in it fails. This is crucial for CI tests.
 set -ex
 
+OSL_CMAKE_FLAGS="$MY_CMAKE_FLAGS $OSL_CMAKE_FLAGS"
+export OSL_SRC_DIR=${OSL_SRC_DIR:=$PWD}
+export OSL_BUILD_DIR=${OSL_BUILD_DIR:=${OSL_SRC_DIR}/build}
+export OSL_INSTALL_DIR=${OSL_INSTALL_DIR:=${OSL_SRC_DIR}/dist}
+export OSL_CMAKE_BUILD_TYPE=${OSL_CMAKE_BUILD_TYPE:=${CMAKE_BUILD_TYPE:=Release}}
+
 if [[ "$USE_SIMD" != "" ]] ; then
     OSL_CMAKE_FLAGS="$OSL_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
 fi
@@ -16,9 +22,9 @@ if [[ -n "$CODECOV" ]] ; then
     OSL_CMAKE_FLAGS="$OSL_CMAKE_FLAGS -DCODECOV=${CODECOV}"
 fi
 
-pushd build
-cmake .. -G "$CMAKE_GENERATOR" \
-        -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
+# pushd $OSL_BUILD_DIR
+cmake -S ${OSL_SRC_DIR} -B ${OSL_BUILD_DIR} -G "$CMAKE_GENERATOR" \
+        -DCMAKE_BUILD_TYPE="${OSL_CMAKE_BUILD_TYPE}" \
         -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" \
         -DCMAKE_INSTALL_PREFIX="$OSL_ROOT" \
         -DUSE_PYTHON="${USE_PYTHON:=1}" \
@@ -29,15 +35,15 @@ cmake .. -G "$CMAKE_GENERATOR" \
         $OSL_CMAKE_FLAGS -DVERBOSE=1
 
 # Save a copy of the generated files for debugging broken CI builds.
-mkdir cmake-save || /bin/true
-cp -r CMake* *.cmake cmake-save
+mkdir ${OSL_BUILD_DIR}/cmake-save || true
+cp -r ${OSL_BUILD_DIR}/CMake* ${OSL_BUILD_DIR}/*.cmake ${OSL_BUILD_DIR}/cmake-save
 
 : ${BUILDTARGET:=install}
 if [[ "$BUILDTARGET" != "none" ]] ; then
     echo "Parallel build ${CMAKE_BUILD_PARALLEL_LEVEL} of target ${BUILDTARGET}"
-    time ${OSL_CMAKE_BUILD_WRAPPER} cmake --build . --target ${BUILDTARGET} --config ${CMAKE_BUILD_TYPE}
+    time ${OSL_CMAKE_BUILD_WRAPPER} cmake --build ${OSL_BUILD_DIR} --target ${BUILDTARGET} --config ${OSL_CMAKE_BUILD_TYPE}
 fi
-popd
+# popd
 
 if [[ "${DEBUG_CI:=0}" != "0" ]] ; then
     echo "PATH=$PATH"
@@ -48,6 +54,7 @@ if [[ "${DEBUG_CI:=0}" != "0" ]] ; then
 fi
 
 if [[ "$BUILDTARGET" == clang-format ]] ; then
+    echo "Running " `which clang-format` " version " `clang-format --version`
     git diff --color
     THEDIFF=`git diff`
     if [[ "$THEDIFF" != "" ]] ; then

src/build-scripts/ci-coverage.bash

@@ -35,4 +35,9 @@ for g in $(find ../build -name "*.gcno" -type f); do
     echo "dirname $g = $(dirname $g) to " `$(echo "$g" | sed -e 's/\/build\//\//' -e 's/\.gcno/\.cpp/' -e 's/\.cpp\.cpp/\.cpp/' -e 's/\/CMakeFiles.*\.dir\//\//')`
     gcov -l -p -o $(dirname "$g") $(echo "$g" | sed -e 's/\/build\//\//' -e 's/\.gcno/\.cpp/' -e 's/\/CMakeFiles.*\.dir\//\//')
 done
+
+# Remove pointless .gcov files so we don't analyze them
+rm -f "*opt*include*"
+rm -f "*usr*local*"
+
 popd

src/build-scripts/gh-installdeps.bash

@@ -14,19 +14,17 @@ set -ex
 if [[ "$ASWF_ORG" != ""  ]] ; then
     # Using ASWF container
 
-    export PATH=/opt/rh/devtoolset-6/root/usr/bin:/usr/local/bin:$PATH
-
     #ls /etc/yum.repos.d
 
     if [[ "$ASWF_VFXPLATFORM_VERSION" == "2021" || "$ASWF_VFXPLATFORM_VERSION" == "2022" ]] ; then
         # CentOS 7 based containers need the now-nonexistant centos repo to be
         # excluded or all the subsequent yum install commands will fail.
-        yum-config-manager --disable centos-sclo-rh && true
+        yum-config-manager --disable centos-sclo-rh || true
         sed -i 's,^mirrorlist=,#,; s,^#baseurl=http://mirror\.centos\.org/centos/$releasever,baseurl=https://vault.centos.org/7.9.2009,' /etc/yum.repos.d/CentOS-Base.repo
     fi
 
-    sudo /usr/bin/yum install -y giflib giflib-devel && true
-    # sudo /usr/bin/yum install -y ffmpeg ffmpeg-devel && true
+    sudo /usr/bin/yum install -y giflib giflib-devel || true
+    # sudo /usr/bin/yum install -y ffmpeg ffmpeg-devel || true
 
     if [[ "${CONAN_LLVM_VERSION}" != "" ]] ; then
         mkdir conan
@@ -82,8 +80,9 @@ if [[ "$ASWF_ORG" != ""  ]] ; then
 else
     # Using native Ubuntu runner
 
-    # sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-    time sudo apt-get update
+    if [[ "${SKIP_APT_GET_UPDATE}" != "1" ]] ; then
+        time sudo apt-get update
+    fi
 
     time sudo apt-get -q install -y \
         git cmake ninja-build ccache g++ \

src/build-scripts/gh-win-installdeps.bash

@@ -13,7 +13,7 @@ VCPKG_INSTALLATION_ROOT=/c/vcpkg
 export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:=.}
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$DEP_DIR"
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release"
-export PATH="$PATH:$DEP_DIR/bin:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/bin:/bin:$PWD/ext/dist/bin:$PWD/ext/dist/lib"
+export PATH="$PATH:$DEP_DIR/bin:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/bin:$PWD/ext/dist/bin:$PWD/ext/dist/lib"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/bin"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/lib"