Merge pull request #290 from murraystevenson/macCI15

CI : Update macOS CI to Xcode 15

Author: johnhaddon

.github/workflows/main.yml

@@ -80,11 +80,10 @@ jobs:
 
     - name: Install toolchain (macOS)
       run: |
-        # Choose the earliest Xcode version available on a macos-14 runner.
-        sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
         # Install build requirements.
-        sudo pip3 install scons==4.6.0 --break-system-packages
+        pipx install scons==4.6.0
         brew install gpatch
+        echo "/opt/homebrew/opt/gpatch/libexec/gnubin" >> $GITHUB_PATH
         brew install bison
         # Make sure bison is discoverable.
         echo BISON_ROOT=/opt/homebrew/opt/bison >> $GITHUB_ENV
@@ -94,9 +93,16 @@ jobs:
         # Remove CommandLineTools so there is no potential for conflict with
         # our selected Xcode version.
         sudo rm -rf /Library/Developer/CommandLineTools
-        sudo rm -rf /Applications/Python\ 3.10
+        sudo rm -rf /Applications/Python\ 3.11
         # Remove little-cms2 to prevent our LibRaw builds from finding it.
         brew uninstall --ignore-dependencies little-cms2
+        # Pin CMake to 3.31.6
+        brew uninstall cmake
+        brew tap-new --no-git "local/pinned" >/dev/null
+        cmakeDir="$(brew --repo "local/pinned")/Formula"
+        mkdir -p "$cmakeDir"
+        curl -fsSL "https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce/Formula/c/cmake.rb" -o "$cmakeDir/cmake.rb"
+        brew install "local/pinned/cmake"
       shell: bash
       if: runner.os == 'macOS'
 

Boost/config.py

@@ -18,7 +18,7 @@
 		# even though we tell it quite explicitly to use the one in {buildDir}.
 		"DYLD_FALLBACK_FRAMEWORK_PATH" : "{buildDir}/lib",
 		"LD_LIBRARY_PATH" : "{buildDir}/lib",
-		"MACOSX_DEPLOYMENT_TARGET" : "10.9",
+		"MACOSX_DEPLOYMENT_TARGET" : "12.0",
 		# Give a helping hand to find the python headers, since the bootstrap
 		# below doesn't always seem to get it right.
 		"CPLUS_INCLUDE_PATH" : "{pythonIncludeDir}",

Changes.md

@@ -4,6 +4,7 @@
 - Boost : Updated to version 1.85.0.
 - Cortex : Updated to version 10.7.0.0a2.
 - Imath : Updated to version 3.1.12.
+- Jemalloc : Removed when building on macOS.
 - LLVM : Updated to version 17.0.6.
 - OpenColorIO : Updated to version 2.4.2.
 - OpenEXR : Updated to version 3.3.6.

Cycles/config.py

@@ -12,14 +12,21 @@
 
 	"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "OpenPGL", "LibWebP", "Zstandard" ],
 
+	"environment" : {
+
+		# Needed because the build process runs oslc.
+		"DYLD_FALLBACK_LIBRARY_PATH" : "{buildDir}/lib",
+
+	},
+
 	"commands" : [
 
 		# The Cycles archive includes empty folders under `./lib`
 		# named `{platform}_{architecture}`. The existence of a folder
 		# in lib matching the current platform and architecture causes
 		# the build to only look for dependencies within it, so we
 		# remove them to allow dependencies to be found in `{buildDir}`.
-		"rmdir --ignore-fail-on-non-empty ./lib/*",
+		"rm -r ./lib/*",
 
 		"mkdir build",
 		"cd build &&"

Jemalloc/config.py

@@ -24,4 +24,10 @@
 		"lib/libjemalloc*{sharedLibraryExtension}*",
 
 	],
+
+	"platform:macos" : {
+
+		"enabled" : False,
+
+	},
 }

OpenImageIO/config.py

@@ -36,7 +36,7 @@
 			" -D BUILD_MISSING_FMT=NO"
 			" -D OIIO_BUILD_TESTS=NO"
 			" -D OIIO_DOWNLOAD_MISSING_TESTDATA=NO"
-			" -D PYTHON_VERSION={pythonMajorVersion}"
+			" -D PYTHON_VERSION={pythonVersion}"
 			" -D Python_ROOT_DIR={buildDir}"
 			" -D Python_FIND_STRATEGY=LOCATION"
 			# These next two disable `iv`. This fails to

OpenShadingLanguage/config.py

@@ -39,6 +39,7 @@
 			" -D USE_BATCHED={useBatched}"
 			" -D OSL_SHADER_INSTALL_DIR={buildDir}/shaders"
 			" -D OSL_BUILD_PLUGINS=0"
+			" -D PYTHON_VERSION={pythonVersion}"
 			" -D Python_ROOT_DIR={buildDir}"
 			" -D Python_FIND_STRATEGY=LOCATION"
 			" {extraArguments}"
@@ -82,7 +83,7 @@
 
 		"variables" : {
 
-			"extraCommands" : "mv {buildDir}/lib/python{pythonVersion}/site-packages/oslquery.so {pythonLibDir}/python{pythonVersion}/site-packages/oslquery.so",
+			"extraCommands" : "mv {buildDir}/lib/python{pythonVersion}/site-packages/oslquery {pythonLibDir}/python{pythonVersion}/site-packages/oslquery",
 			"useBatched" : "0",
 
 		},

PySide/config.py

@@ -40,6 +40,7 @@
 		"environment" : {
 
 			"DYLD_FRAMEWORK_PATH" : "{buildDir}/lib",
+			"DYLD_FALLBACK_LIBRARY_PATH" : "{buildDir}/lib",
 
 		},
 

Python/config.py

@@ -70,7 +70,7 @@
 
 		"environment" : {
 
-			"MACOSX_DEPLOYMENT_TARGET" : "11.0",
+			"MACOSX_DEPLOYMENT_TARGET" : "12.0",
 
 		},
 

Qt/config.py

@@ -105,6 +105,12 @@
 
 	"platform:macos" : {
 
+		"environment" : {
+
+			"DYLD_FALLBACK_LIBRARY_PATH" : "{buildDir}/lib",
+
+		},
+
 		"variables" : {
 
 			"extraArgs" : "-no-freetype QMAKE_APPLE_DEVICE_ARCHS=arm64",