Build - fix windows build for cxxbridge

cxxbridge is now needed in the mmSolver build component.

Author: david-cattermole

scripts/internal/build_mmSolverLibs_linux.bash

@@ -132,7 +132,10 @@ then
     # CXX version used in the C++ buildings, and all the build scripts
     # using this value:
     # './Cargo.toml'
+    # './scripts/internal/build_mmSolver_windows64.bat'
+    # './scripts/internal/build_mmSolver_linux.bash'
     # './scripts/internal/build_mmSolverLibs_windows64.bat'
+    # './scripts/internal/build_mmSolverLibs_linux.bash'
     ${RUST_CARGO_EXE} install cxxbridge-cmd --version 1.0.129
 fi
 MMSOLVERLIBS_CXXBRIDGE_EXE="${HOME}/.cargo/bin/cxxbridge"

scripts/internal/build_mmSolverLibs_windows64.bat

@@ -142,6 +142,8 @@ IF %ERRORLEVEL% EQU 1 (
    :: CXX version used in the C++ buildings, and all the build scripts
    :: using this value:
    :: './Cargo.toml'
+   :: './scripts/internal/build_mmSolver_windows64.bat'
+   :: './scripts/internal/build_mmSolver_linux.bash'
    :: './scripts/internal/build_mmSolverLibs_windows64.bat'
    :: './scripts/internal/build_mmSolverLibs_linux.bash'
    %RUST_CARGO_EXE% install cxxbridge-cmd --version 1.0.129
@@ -264,21 +266,21 @@ CHDIR "%PROJECT_ROOT%"
 exit /b 0
 
 :failed_to_generate_cpp_header
-echo Failed to Generate C++ header files from Rust.
+echo Failed to Generate C++ header files from Rust for mmSolverLibs.
 exit /b 1
 
 :failed_to_build_rust
-echo Failed to build Rust code.
+echo Failed to build Rust code for mmSolverLibs.
 exit /b 1
 
 :failed_to_generate_cpp
-echo Failed to generate C++ build files.
+echo Failed to generate C++ build files for mmSolverLibs.
 exit /b 1
 
 :failed_to_build_cpp
-echo Failed to build C++ code.
+echo Failed to build C++ code for mmSolverLibs.
 exit /b 1
 
 :failed_to_install_cpp
-echo Failed to install C++ artifacts.
+echo Failed to install C++ artifacts for mmSolverLibs.
 exit /b 1

scripts/internal/build_mmSolver_linux.bash

@@ -73,6 +73,11 @@ echo "Build mmSolverLibs directory base: ${BUILD_MMSOLVERLIBS_DIR_BASE}"
 BUILD_TYPE=Release
 MMSOLVER_DEBUG=1
 
+BUILD_TYPE_DIR="debug"
+if [ "${BUILD_TYPE}" = "Release" ]; then
+    BUILD_TYPE_DIR="release"
+fi
+
 # Build options, to allow faster compilation times. (not to be used by
 # users wanting to build this project.)
 MMSOLVER_BUILD_PLUGIN=1
@@ -108,6 +113,14 @@ MMSOLVERLIBS_INSTALL_DIR="${BUILD_MMSOLVERLIBS_DIR_BASE}/install/maya${MAYA_VERS
 MMSOLVERLIBS_CMAKE_CONFIG_DIR="${MMSOLVERLIBS_INSTALL_DIR}/lib64/cmake/mmsolverlibs_cpp"
 MMSOLVERLIBS_RUST_DIR="${BUILD_MMSOLVERLIBS_DIR_BASE}/rust_linux_maya${MAYA_VERSION}/${BUILD_TYPE_DIR}"
 
+# Where to find the mmsolverlibs Rust libraries and headers.
+MMSOLVERLIBS_INSTALL_PATH="${BUILD_MMSOLVERLIBS_DIR_BASE}/install/maya${MAYA_VERSION}_linux/"
+MMSOLVERLIBS_ROOT="${PROJECT_ROOT}/lib"
+MMSOLVERLIBS_RUST_ROOT="${MMSOLVERLIBS_ROOT}/mmsolverlibs"
+MMSOLVERLIBS_CPP_TARGET_DIR="${BUILD_MMSOLVERLIBS_DIR_BASE}/rust_linux_maya${MAYA_VERSION}"
+MMSOLVERLIBS_LIB_DIR="${MMSOLVERLIBS_CPP_TARGET_DIR}/${BUILD_TYPE_DIR}"
+MMSOLVERLIBS_INCLUDE_DIR="${MMSOLVERLIBS_ROOT}/include"
+
 # Paths for dependencies.
 EXTERNAL_BUILD_DIR="${BUILD_OCIO_DIR_BASE}/cmake_linux_maya${MAYA_VERSION}_${BUILD_TYPE}/ext/dist"
 OCIO_INSTALL_DIR="${BUILD_OCIO_DIR_BASE}/install/maya${MAYA_VERSION}_linux/"
@@ -135,6 +148,26 @@ minizip_DIR="${EXTERNAL_BUILD_DIR}/lib64/cmake/minizip-ng"
 # We don't want to find system packages.
 CMAKE_IGNORE_PATH="/lib;/lib64;/usr;/usr/lib;/usr/lib64;/usr/local;/usr/local/lib;/usr/local/lib64;"
 
+# Check if 'cxxbridge' is installed or not, and then install it if
+# not.
+#
+# https://stackoverflow.com/questions/592620/how-can-i-check-if-a-program-exists-from-a-bash-script
+if ! command -v cxxbridge &> /dev/null
+then
+    # Install the needed 'cxxbridge' command.
+    #
+    # NOTE: When changing this version number, make sure to update the
+    # CXX version used in the C++ buildings, and all the build scripts
+    # using this value:
+    # './Cargo.toml'
+    # './scripts/internal/build_mmSolver_windows64.bat'
+    # './scripts/internal/build_mmSolver_linux.bash'
+    # './scripts/internal/build_mmSolverLibs_windows64.bat'
+    # './scripts/internal/build_mmSolverLibs_linux.bash'
+    ${RUST_CARGO_EXE} install cxxbridge-cmd --version 1.0.129
+fi
+MMSOLVERLIBS_CXXBRIDGE_EXE="${HOME}/.cargo/bin/cxxbridge"
+
 # A local copy of LDPK to reduce the amount of downloads to the
 # 3DEqualizer website (LDPK doesn't have a git repo to clone from).
 LDPK_URL="${PROJECT_ROOT}/external/archives/ldpk-2.12.0.tar"
@@ -174,6 +207,8 @@ ${CMAKE_EXE} \
     -DMMSOLVER_BUILD_TESTS=${MMSOLVER_BUILD_TESTS} \
     -DMAYA_LOCATION=${MAYA_LOCATION} \
     -DMAYA_VERSION=${MAYA_VERSION} \
+    -DMMSOLVERLIBS_CXXBRIDGE_EXE=${MMSOLVERLIBS_CXXBRIDGE_EXE} \
+    -DMMSOLVERLIBS_LIB_DIR=${MMSOLVERLIBS_LIB_DIR} \
     -Dmmsolverlibs_rust_DIR=${MMSOLVERLIBS_RUST_DIR} \
     -Dmmsolverlibs_cpp_DIR=${MMSOLVERLIBS_CMAKE_CONFIG_DIR} \
     -Dldpk_URL=${LDPK_URL} \

scripts/internal/build_mmSolver_windows64.bat

@@ -75,6 +75,13 @@ SET BUILD_PACKAGE=1
 SET BUILD_TYPE=Release
 SET MMSOLVER_DEBUG=1
 
+SET RELEASE_FLAG=
+SET BUILD_TYPE_DIR=debug
+IF "%BUILD_TYPE%"=="Release" (
+    SET RELEASE_FLAG=--release
+    SET BUILD_TYPE_DIR=release
+)
+
 :: Build options, to allow faster compilation times. (not to be used by
 :: users wanting to build this project.)
 SET MMSOLVER_BUILD_PLUGIN=1
@@ -107,6 +114,14 @@ SET MMSOLVERLIBS_INSTALL_DIR="%BUILD_MMSOLVERLIBS_DIR_BASE%\install\maya%MAYA_VE
 SET MMSOLVERLIBS_CMAKE_CONFIG_DIR="%MMSOLVERLIBS_INSTALL_DIR%\lib\cmake\mmsolverlibs_cpp"
 SET MMSOLVERLIBS_RUST_DIR="%BUILD_MMSOLVERLIBS_DIR_BASE%\rust_windows64_maya%MAYA_VERSION%\%BUILD_TYPE_DIR%"
 
+:: Where to find the mmsolverlibs Rust libraries and headers.
+SET MMSOLVERLIBS_INSTALL_PATH=%BUILD_MMSOLVERLIBS_DIR_BASE%\install\maya%MAYA_VERSION%_windows64\
+SET MMSOLVERLIBS_ROOT=%PROJECT_ROOT%\lib
+SET MMSOLVERLIBS_RUST_ROOT=%MMSOLVERLIBS_ROOT%\mmsolverlibs
+SET MMSOLVERLIBS_CPP_TARGET_DIR=%BUILD_MMSOLVERLIBS_DIR_BASE%\rust_windows64_maya%MAYA_VERSION%
+SET MMSOLVERLIBS_LIB_DIR=%MMSOLVERLIBS_CPP_TARGET_DIR%\%BUILD_TYPE_DIR%
+SET MMSOLVERLIBS_INCLUDE_DIR=%MMSOLVERLIBS_ROOT%\include
+
 :: Paths for dependencies.
 SET EXTERNAL_OCIO_BUILD_DIR=%BUILD_OCIO_DIR_BASE%\cmake_win64_maya%MAYA_VERSION%_%BUILD_TYPE%\ext\dist
 SET OCIO_INSTALL_DIR=%BUILD_OCIO_DIR_BASE%\install\maya%MAYA_VERSION%_windows64\
@@ -134,6 +149,29 @@ SET ZLIB_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%ZLIB_RELATIVE_LIB_PATH%
 
 SET minizip_DIR=%EXTERNAL_OCIO_BUILD_DIR%\%MINIZIP_RELATIVE_CMAKE_DIR%
 
+:: Check if 'cxxbridge.exe' is installed or not, and then install it if
+:: not.
+::
+:: https://stackoverflow.com/questions/4781772/how-to-test-if-an-executable-exists-in-the-path-from-a-windows-batch-file
+where /Q cxxbridge
+IF %ERRORLEVEL% EQU 1 (
+   :: Install the needed 'cxxbridge.exe' command.
+   ::
+   :: NOTE: When changing this version number, make sure to update the
+   :: CXX version used in the C++ buildings, and all the build scripts
+   :: using this value:
+   :: './Cargo.toml'
+   :: './scripts/internal/build_mmSolver_windows64.bat'
+   :: './scripts/internal/build_mmSolver_linux.bash'
+   :: './scripts/internal/build_mmSolverLibs_windows64.bat'
+   :: './scripts/internal/build_mmSolverLibs_linux.bash'
+   %RUST_CARGO_EXE% install cxxbridge-cmd --version 1.0.129
+)
+SET MMSOLVERLIBS_CXXBRIDGE_EXE="%USERPROFILE%\.cargo\bin\cxxbridge.exe"
+:: Convert back-slashes to forward-slashes.
+:: https://stackoverflow.com/questions/23542453/change-backslash-to-forward-slash-in-windows-batch-file
+SET "MMSOLVERLIBS_CXXBRIDGE_EXE=%MMSOLVERLIBS_CXXBRIDGE_EXE:\=/%"
+
 :: MinGW is a common install for developers on Windows and
 :: if installed and used it will cause build conflicts and
 :: errors, so we disable it.
@@ -215,6 +253,8 @@ CHDIR "%BUILD_DIR%"
     -DMMSOLVER_BUILD_TESTS=%MMSOLVER_BUILD_TESTS% ^
     -DMAYA_LOCATION=%MAYA_LOCATION% ^
     -DMAYA_VERSION=%MAYA_VERSION% ^
+    -DMMSOLVERLIBS_CXXBRIDGE_EXE=%MMSOLVERLIBS_CXXBRIDGE_EXE% ^
+    -DMMSOLVERLIBS_LIB_DIR=%MMSOLVERLIBS_LIB_DIR% ^
     -Dmmsolverlibs_rust_DIR=%MMSOLVERLIBS_RUST_DIR% ^
     -Dmmsolverlibs_cpp_DIR=%MMSOLVERLIBS_CMAKE_CONFIG_DIR% ^
     -DOpenColorIO_DIR=%OCIO_CMAKE_CONFIG_DIR% ^
@@ -261,17 +301,17 @@ CHDIR "%PROJECT_ROOT%"
 exit /b 0
 
 :failed_to_generate
-echo Failed to generate build files.
+echo Failed to generate build files for mmSolver component.
 exit /b 1
 
 :failed_to_build
-echo Failed to build.
+echo Failed to build mmSolver component.
 exit /b 1
 
 :failed_to_install
-echo Failed to install.
+echo Failed to install mmSolver component.
 exit /b 1
 
 :failed_to_build_zip
-echo Failed to build the ZIP package file.
+echo Failed to build the ZIP package file for mmSolver component.
 exit /b 1