From 7b0a4714cc8394f28eaa768f3863a7c4246bdee4 Mon Sep 17 00:00:00 2001
From: Ben Webb <ben@salilab.org>
Date: Wed, 18 Sep 2024 16:07:14 -0700
Subject: [PATCH] Move Mac Intel builds to macOS 14

With the release of macOS 15, Homebrew
no longer supports macOS 12. We already build
for arm64 Mac with macOS 13 and 15, so build
for Intel with macOS 14.
---
 build.sh           |  2 +-
 check_build.py     | 12 ++++++------
 imp_build_utils.py | 10 ++++++++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index a8d09e0..8ace618 100755
--- a/build.sh
+++ b/build.sh
@@ -449,7 +449,7 @@ END
   # Normal full build
   else
 
-    if [ $PLATFORM = "mac10v10-intel" ] || [ $PLATFORM = "mac10v15-intel" ] || [ $PLATFORM = "mac11v0-intel" ] || [ $PLATFORM = "mac13arm64-gnu" ] || [ $PLATFORM = "mac12-intel" ]; then
+    if [ $PLATFORM = "mac10v10-intel" ] || [ $PLATFORM = "mac10v15-intel" ] || [ $PLATFORM = "mac11v0-intel" ] || [ $PLATFORM = "mac13arm64-gnu" ] || [ $PLATFORM = "mac14-intel" ]; then
       export LANG="en_US.UTF-8"
       get_cmake $PLATFORM
       CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release" \
diff --git a/check_build.py b/check_build.py
index 290a355..1c8220a 100755
--- a/check_build.py
+++ b/check_build.py
@@ -1839,12 +1839,12 @@ def main():
 
     # Main platforms to build on: macOS (Intel, ARM64); old Mac;
     # Windows (32-bit, 64-bit)
-    mac12 = 'mac12-intel'
+    mac14 = 'mac14-intel'
     mac13arm = 'mac13arm64-gnu'
     mac64 = 'mac10v4-intel64'
     win32 = 'i386-w32'
     win64 = 'x86_64-w64'
-    all_archs = [mac12, mac13arm, mac64, win32, win64]
+    all_archs = [mac14, mac13arm, mac64, win32, win64]
 
     # Old Mac build is only for stable IMP release
     if opts.imp_branch == 'develop':
@@ -1885,7 +1885,7 @@ def main():
     if opts.imp_branch != 'develop':
         rh_rpms.insert(0, rh7_64)
         new_archs_map.insert(0, rh7_64)
-    all_archs_map = [debug8, mac12, mac13arm, win32, fast8, fastmac, static,
+    all_archs_map = [debug8, mac14, mac13arm, win32, fast8, fastmac, static,
                      release8, f40_64] + new_archs_map + [coverage, cuda]
     if opts.imp_branch != 'develop':
         all_archs_map.insert(1, mac64)
@@ -1906,7 +1906,7 @@ def main():
     c.include_component('ALLPYTHON', [fast8, release8])
     for m in ('mpi', 'spb', 'nestor'):
         mods = [release8, debug8, rh8_64, rh9_64, f40_64, fast8,
-                coverage, win32, win64, mac12, mac13arm, fastmac, focal,
+                coverage, win32, win64, mac14, mac13arm, fastmac, focal,
                 jammy, noble]
         # IMP.nestor *also* needs Python 3, not available on mac64
         # or RHEL7
@@ -1971,7 +1971,7 @@ def main():
         c.add_cmake_log(cuda, ['build', 'test', 'example'], [])
         # Add coverage build
         c.add_cmake_log(coverage, ['build', 'test', 'example'], [])
-        all_archs_map = [debug8, mac12, mac13arm, fast8, fastmac, static,
+        all_archs_map = [debug8, mac14, mac13arm, fast8, fastmac, static,
                          release8, win32, win64, cuda, coverage]
         if opts.imp_branch != 'develop':
             all_archs_map.insert(1, mac64)
@@ -2002,7 +2002,7 @@ def main():
             c.include_component(m, [cuda, coverage])
         for m in ('isd_emxl',):
             incs = [release8, debug8, f40_64, fast8, coverage, win32,
-                    win64, mac12, mac13arm, fastmac] + rh_rpms
+                    win64, mac14, mac13arm, fastmac] + rh_rpms
             if opts.imp_branch != 'develop':
                 incs.append(mac64)
             c.include_component(m, incs)
diff --git a/imp_build_utils.py b/imp_build_utils.py
index 3092894..b1bc3ce 100644
--- a/imp_build_utils.py
+++ b/imp_build_utils.py
@@ -451,6 +451,16 @@ def __init__(self, very_short, short, long, very_long, logfile):
                                    "Homebrew Python 3", "")
                       + percpp_vlong,
                       'bin.mac12-intel.log')),
+                 ('mac14-intel',
+                  Platform(
+                      'M14', 'Mac 14',
+                      'Debug build (64-bit Intel Mac; MacOS 14 '
+                      '(Sonoma); clang++; Boost 1.86; Python 3; '
+                      'per-cpp compilation)',
+                      mac_vlong % ("64-bit MacOS 14 (Sonoma) Mac",
+                                   "Homebrew Python 3", "")
+                      + percpp_vlong,
+                      'bin.mac14-intel.log')),
                  ('fastmac13',
                   Platform(
                       'McFst', 'Mac Fast',