Try adjusting scripts to be more like oiio

Signed-off-by: Larry Gritz <[email protected]>

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

@@ -45,29 +45,36 @@ echo "All pre-installed VCPkg installs:"
 vcpkg list
 echo "---------------"
 # vcpkg update
-#
-# vcpkg install zlib:x64-windows
-# vcpkg install tiff:x64-windows
-# vcpkg install libpng:x64-windows
-#vcpkg install giflib:x64-windows
-#vcpkg install freetype:x64-windows
-# vcpkg install openexr:x64-windows
-# vcpkg install libjpeg-turbo:x64-windows
-
-# vcpkg install libraw:x64-windows
-# vcpkg install openjpeg:x64-windows
-# vcpkg install ffmpeg:x64-windows   # takes FOREVER!
-# vcpkg install webp:x64-windows  # No such vcpkg package?a
-
-# echo "$VCPKG_INSTALLATION_ROOT"
-# ls "$VCPKG_INSTALLATION_ROOT"
-# echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
-# ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
-# echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
-# ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
-# echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
-# ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
-
+# 
+
+#vcpkg install libdeflate:x64-windows-release
+#vcpkg install zlib:x64-windows-release
+# vcpkg install tiff:x64-windows-release
+# vcpkg install libpng:x64-windows-release
+# vcpkg install giflib:x64-windows-release
+# vcpkg install freetype:x64-windows-release
+# # vcpkg install openexr:x64-windows-release
+# vcpkg install libjpeg-turbo:x64-windows-release
+# 
+# vcpkg install libraw:x64-windows-release
+# vcpkg install openjpeg:x64-windows-release
+# # vcpkg install ffmpeg:x64-windows-release   # takes FOREVER!
+# # vcpkg install webp:x64-windows-release  # No such vcpkg package?a
+# 
+# #echo "$VCPKG_INSTALLATION_ROOT"
+# #ls "$VCPKG_INSTALLATION_ROOT"
+# #echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release"
+# #ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release"
+# #echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/lib"
+# #ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/lib"
+# #echo "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/bin"
+# #ls "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/bin"
+# 
+# # export PATH="$PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/bin"
+# export PATH="$DEP_DIR/lib:$DEP_DIR/bin:$PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/lib"
+export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release"
+# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows-release/lib:$DEP_DIR/lib:$DEP_DIR/bin"
+# 
 echo "All VCPkg installs:"
 vcpkg list
 #
@@ -86,8 +93,8 @@ vcpkg list
 # export PNG_ROOT=$PWD/ext/dist
 
 # We're currently getting libtiff from vcpkg
-src/build-scripts/build_libtiff.bash
-export TIFF_ROOT=$PWD/ext/dist
+# src/build-scripts/build_libtiff.bash
+# export TIFF_ROOT=$PWD/ext/dist
 
 # We're currently getting jpeg from vcpkg
 # LIBJPEGTURBO_CONFIG_OPTS=-DWITH_SIMD=OFF
@@ -105,17 +112,18 @@ source src/build-scripts/build_pybind11.bash
 
 echo "CMAKE_PREFIX_PATH = $CMAKE_PREFIX_PATH"
 
+if [[ "$OPENEXR_VERSION" != "" ]] ; then
+    OPENEXR_CXX_FLAGS=" /W1 /EHsc /DWIN32=1 "
+    #OPENEXR_BUILD_TYPE=$CMAKE_BUILD_TYPE
+    OPENEXR_INSTALL_DIR=$DEP_DIR
+    source src/build-scripts/build_openexr.bash
+    export PATH="$OPENEXR_INSTALL_DIR/bin:$OPENEXR_INSTALL_DIR/lib:$PATH"
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PATH
+    # the above line is admittedly sketchy
+fi
 
-OPENEXR_CXX_FLAGS=" /W1 /EHsc /DWIN32=1 "
-#OPENEXR_BUILD_TYPE=$CMAKE_BUILD_TYPE
-OPENEXR_INSTALL_DIR=$DEP_DIR
-source src/build-scripts/build_openexr.bash
-export PATH="$OPENEXR_INSTALL_DIR/bin:$OPENEXR_INSTALL_DIR/lib:$PATH"
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PATH
-# the above line is admittedly sketchy
-
-cp $DEP_DIR/lib/*.lib $DEP_DIR/bin
-cp $DEP_DIR/bin/*.dll $DEP_DIR/lib
+cp $DEP_DIR/lib/*.lib $DEP_DIR/bin || true
+cp $DEP_DIR/bin/*.dll $DEP_DIR/lib || true
 
 
 if [[ "$OPENIMAGEIO_VERSION" != "" ]] ; then
@@ -142,24 +150,16 @@ if [[ "$OPENIMAGEIO_VERSION" != "" ]] ; then
     source src/build-scripts/build_openimageio.bash
 fi
 
-
-cp $DEP_DIR/lib/*.lib $DEP_DIR/bin
-cp $DEP_DIR/bin/*.dll $DEP_DIR/lib
-echo "after OIIO install, DEP_DIR $DEP_DIR :"
+cp $DEP_DIR/lib/*.lib $DEP_DIR/bin || true
+cp $DEP_DIR/bin/*.dll $DEP_DIR/lib || true
+echo "DEP_DIR $DEP_DIR :"
 ls -R -l "$DEP_DIR"
 
 
-# export PATH="$PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
-export PATH="$DEP_DIR/lib:$DEP_DIR/bin:$PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib:$DEP_DIR/lib:$DEP_DIR/bin"
-
-
-# source src/build-scripts/build_imath.bash
+# source src/build-scripts/build_openexr.bash
+# export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$OPENEXR_ROOT"
 # source src/build-scripts/build_opencolorio.bash
 
 
-# For CI on Windows, prefer to pick up static libs where possible
-OSL_CMAKE_FLAGS="$OSL_CMAKE_FLAGS -DLINKSTATIC=1 -DBUILD_SHARED_LIBS=0"
-
 # Save the env for use by other stages
 src/build-scripts/save-env.bash