luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GHA: MacOS maintenance update 

GHA obsoleted macos-12 so we move to macos-13 for Intel.  Building with oldest
Intel image to provide feedback of continued expected support on that platform,
while ARM64 builds with latest to check the other end of their SDKs.

Lock the TCL version via brew to 8.6+ (currently the project is not expected to
build on TCL9 until other work is completed) so this is causing build failure.

Added additional diagnostics to show the location of executables/DSOs if they
got built from the tree.

Introduced GHA timeout clamping (MacOS default shell seems not to behave under
CI as well as Linux does, re signal/pipe handling)

'brew install tcl-tk@8' appears to append the @8 to the installed path such as
/usr/local/opt/tcl-tk@8 which configure needs to know.  configure_mac updated
to detect this now TCL9 is the default version that maybe installed at the old
location.  Then there is the issue of both TCL versions being installed
side-by-side on the same system causing more issues over selection.
This commit is contained in:
Darryl L. Miles 2025-01-03 09:08:14 +00:00 committed by Tim Edwards
parent 3f85689985
commit 46eb71491c
3 changed files with 139 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
.github/workflows/main-macos.yml vendored
View File

@ -10,8 +10,9 @@ on:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel # A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs: jobs:
simple_build_macos12: simple_build_macos13:
runs-on: macos-12 runs-on: macos-13
timeout-minutes: 45 # x86_64 seems non-SSD based (slower)
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -21,8 +22,8 @@ jobs:
run: | run: |
brew install --cask xquartz brew install --cask xquartz
PACKAGE_LIST="xquartz" PACKAGE_LIST="xquartz"
brew install cairo tcl-tk tcsh brew install cairo tcl-tk@8 tcsh
_package_list="cairo tcl-tk tcsh" _package_list="cairo tcl-tk@8 tcsh"
# These seem needed maybe they are being provided from somewhere else GHA runner # These seem needed maybe they are being provided from somewhere else GHA runner
# or brew transitive depend either way doesn't hurt to confirm they are installed. # or brew transitive depend either way doesn't hurt to confirm they are installed.
_package_list="$_package_list libglu freeglut" _package_list="$_package_list libglu freeglut"
@ -51,6 +52,7 @@ jobs:
brew info libglu > $TMPFILE && head -n1 $TMPFILE brew info libglu > $TMPFILE && head -n1 $TMPFILE
brew info freeglut > $TMPFILE && head -n1 $TMPFILE brew info freeglut > $TMPFILE && head -n1 $TMPFILE
brew info tcl-tk > $TMPFILE && head -n1 $TMPFILE brew info tcl-tk > $TMPFILE && head -n1 $TMPFILE
brew info tcl-tk@8 > $TMPFILE && head -n1 $TMPFILE
brew info tcsh > $TMPFILE && head -n1 $TMPFILE brew info tcsh > $TMPFILE && head -n1 $TMPFILE
echo "" echo ""
cc -v 2>&1 cc -v 2>&1
@ -74,7 +76,7 @@ jobs:
echo "=== search.sh" echo "=== search.sh"
cat search.sh cat search.sh
chmod a+x search.sh chmod a+x search.sh
find /opt /usr $HOME \( -iname "libX11.*dylib" -or -iname "Xlib.h" \) -exec ./search.sh {} \; 2>/dev/null find /opt /usr $HOME \( -iname "libX11.*dylib" -or -iname "Xlib.h" -or -iname "libtcl*dylib" -or -iname "tcl.h" \) -exec ./search.sh {} \; 2>/dev/null
# #
# Example symbols that were found missing from the tcl-tk X11 implementation # Example symbols that were found missing from the tcl-tk X11 implementation
#find /opt /usr $HOME -iname "x*.h" -exec grep -Hn "XCreateGC" {} \; 2>/dev/null || true #find /opt /usr $HOME -iname "x*.h" -exec grep -Hn "XCreateGC" {} \; 2>/dev/null || true
@ -87,6 +89,20 @@ jobs:
# tail -n 50 "$i" # tail -n 50 "$i"
# echo "======" # echo "======"
#done #done
# Different GHA platforms have different layouts (x86_64/arm64)
echo "=== /opt"
ls -l /opt
if [ -d /opt/homebrew ]
then
echo "=== /opt/homebrew"
ls -l /opt/homebrew
fi
echo "=== /usr/local/opt"
ls -l /usr/local/opt
echo "=== /usr/local/opt/runner"
ls -l /usr/local/opt/runner
echo "Done" echo "Done"
- name: Build - name: Build
@ -124,6 +140,7 @@ jobs:
set +e set +e
echo "=== ls -l" echo "=== ls -l"
ls -l ls -l
find . -type f \( -name "*.dylib" -or -name "magic" -or -name "magicexec" -or -name "magicdnull" \)
echo "=== find /usr/local/bin" echo "=== find /usr/local/bin"
find /usr/local/bin -mtime 0 find /usr/local/bin -mtime 0
echo "=== find /usr/local/share" echo "=== find /usr/local/share"
@ -136,6 +153,9 @@ jobs:
otool -L tcltk/magicexec otool -L tcltk/magicexec
echo "=== otool -L tcltk/magicdnull" echo "=== otool -L tcltk/magicdnull"
otool -L tcltk/magicdnull otool -L tcltk/magicdnull
set +o pipefail # macosx this is on by default (turn it off)
echo "=== magic --version" echo "=== magic --version"
magic --version magic --version
echo "=== magic -d help -noconsole" echo "=== magic -d help -noconsole"
@ -146,8 +166,13 @@ jobs:
echo "version ; quit" | magic -d null -noconsole -T scmos echo "version ; quit" | magic -d null -noconsole -T scmos
- name: Summary - name: Summary
if: always()
run: | run: |
set +e set +e
ls -l
touch MAKE.LOG # just in case it did not even build
grep "error:" MAKE.LOG > MAKE_error.LOG grep "error:" MAKE.LOG > MAKE_error.LOG
grep "warning:" MAKE.LOG > MAKE_warning.LOG grep "warning:" MAKE.LOG > MAKE_warning.LOG
@ -157,7 +182,6 @@ jobs:
grep -v "Wunused-label" | grep -v "Wunused-label" |
grep -v "Wunused-but-set-variable" > MAKE_warning_filtered.LOG grep -v "Wunused-but-set-variable" > MAKE_warning_filtered.LOG
ls -l
wc -l *.LOG wc -l *.LOG
error_count=$( grep -c "error:" MAKE_error.LOG) error_count=$( grep -c "error:" MAKE_error.LOG)
@ -179,16 +203,21 @@ jobs:
echo "---" echo "---"
echo "$title" echo "$title"
echo "" echo ""
[ -f scripts/config.log ] && grep "./configure" scripts/config.log | head -n1
echo ""
echo "PACKAGE_LIST=$PACKAGE_LIST" echo "PACKAGE_LIST=$PACKAGE_LIST"
echo "CONFIGURE_ARGS=$CONFIGURE_ARGS" echo "CONFIGURE_ARGS=$CONFIGURE_ARGS"
echo "" echo ""
echo "total ${total_error_count} error(s) ${total_warning_count} warning(s) :" if [ -s MAKE.LOG ]
echo "|Count|Warning Group (-j build log inaccuracies)|" then
echo "|--:|:--|" echo "total ${total_error_count} error(s) ${total_warning_count} warning(s) :"
# due to -j build the log lines might get corrupted, so missing/incorrect/bogus entries might be seen echo "|Count|Warning Group (-j build log inaccuracies)|"
# so we add extra: egrep "\[\-W.*\]" (to try to remove that) echo "|--:|:--|"
sed -e 's#.*\(\[\-W\)#\1#' -e 's#\(\]\).*$#\1#' MAKE_warning.LOG | egrep "\[\-W.*\]" | sort | uniq -c | sort -n | tr -s ' ' | tr ' ' '|' | awk '{print $0"|"}' # due to -j build the log lines might get corrupted, so missing/incorrect/bogus entries might be seen
echo "" # so we add extra: egrep "\[\-W.*\]" (to try to remove that)
sed -e 's#.*\(\[\-W\)#\1#' -e 's#\(\]\).*$#\1#' MAKE_warning.LOG | egrep "\[\-W.*\]" | sort | uniq -c | sort -n | tr -s ' ' | tr ' ' '|' | awk '{print $0"|"}'
echo ""
fi
grep -A100 "Configuration Summary" CONFIGURE.LOG | grep -v "Configuration Summary" | egrep "^.*:" | sed -e '/\---/,//d' grep -A100 "Configuration Summary" CONFIGURE.LOG | grep -v "Configuration Summary" | egrep "^.*:" | sed -e '/\---/,//d'
echo "" echo ""
grep DCAD_DIR MAKE.LOG | tail -n1 grep DCAD_DIR MAKE.LOG | tail -n1
@ -205,15 +234,16 @@ jobs:
cp *.mak dist/BUILD-INFO/ cp *.mak dist/BUILD-INFO/
cp *.LOG dist/BUILD-INFO/ cp *.LOG dist/BUILD-INFO/
- name: Upload archive magic-macos12 - name: Upload archive magic-macos13
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: magic-macos12 name: magic-macos13
path: | path: |
${{ github.workspace }}/dist ${{ github.workspace }}/dist
simple_build_macos: simple_build_macos:
runs-on: macos-latest runs-on: macos-latest
timeout-minutes: 30 # arm64 seems SSD based (faster)
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -223,8 +253,8 @@ jobs:
run: | run: |
brew install --cask xquartz brew install --cask xquartz
PACKAGE_LIST="xquartz" PACKAGE_LIST="xquartz"
brew install cairo tcl-tk tcsh brew install cairo tcl-tk@8 tcsh
_package_list="cairo tcl-tk tcsh" _package_list="cairo tcl-tk@8 tcsh"
# These seem needed maybe they are being provided from somewhere else GHA runner # These seem needed maybe they are being provided from somewhere else GHA runner
# or brew transitive depend either way doesn't hurt to confirm they are installed. # or brew transitive depend either way doesn't hurt to confirm they are installed.
_package_list="$_package_list libglu freeglut" _package_list="$_package_list libglu freeglut"
@ -253,6 +283,7 @@ jobs:
brew info libglu > $TMPFILE && head -n1 $TMPFILE brew info libglu > $TMPFILE && head -n1 $TMPFILE
brew info freeglut > $TMPFILE && head -n1 $TMPFILE brew info freeglut > $TMPFILE && head -n1 $TMPFILE
brew info tcl-tk > $TMPFILE && head -n1 $TMPFILE brew info tcl-tk > $TMPFILE && head -n1 $TMPFILE
brew info tcl-tk@8 > $TMPFILE && head -n1 $TMPFILE
brew info tcsh > $TMPFILE && head -n1 $TMPFILE brew info tcsh > $TMPFILE && head -n1 $TMPFILE
echo "" echo ""
cc -v 2>&1 cc -v 2>&1
@ -276,7 +307,7 @@ jobs:
echo "=== search.sh" echo "=== search.sh"
cat search.sh cat search.sh
chmod a+x search.sh chmod a+x search.sh
find /opt /usr $HOME \( -iname "libX11.*dylib" -or -iname "Xlib.h" \) -exec ./search.sh {} \; 2>/dev/null find /opt /usr $HOME \( -iname "libX11.*dylib" -or -iname "Xlib.h" -or -iname "libtcl*dylib" -or -iname "tcl.h" \) -exec ./search.sh {} \; 2>/dev/null
# #
# Example symbols that were found missing from the tcl-tk X11 implementation # Example symbols that were found missing from the tcl-tk X11 implementation
#find /opt /usr $HOME -iname "x*.h" -exec grep -Hn "XCreateGC" {} \; 2>/dev/null || true #find /opt /usr $HOME -iname "x*.h" -exec grep -Hn "XCreateGC" {} \; 2>/dev/null || true
@ -289,6 +320,20 @@ jobs:
# tail -n 50 "$i" # tail -n 50 "$i"
# echo "======" # echo "======"
#done #done
# Different GHA platforms have different layouts (x86_64/arm64)
echo "=== /opt"
ls -l /opt
if [ -d /opt/homebrew ]
then
echo "=== /opt/homebrew"
ls -l /opt/homebrew
fi
echo "=== /usr/local/opt"
ls -l /usr/local/opt
echo "=== /usr/local/opt/runner"
ls -l /usr/local/opt/runner
echo "Done" echo "Done"
- name: Build - name: Build
@ -326,6 +371,7 @@ jobs:
set +e set +e
echo "=== ls -l" echo "=== ls -l"
ls -l ls -l
find . -type f \( -name "*.dylib" -or -name "magic" -or -name "magicexec" -or -name "magicdnull" \)
echo "=== find /usr/local/bin" echo "=== find /usr/local/bin"
find /usr/local/bin -mtime 0 find /usr/local/bin -mtime 0
echo "=== find /usr/local/share" echo "=== find /usr/local/share"
@ -338,6 +384,9 @@ jobs:
otool -L tcltk/magicexec otool -L tcltk/magicexec
echo "=== otool -L tcltk/magicdnull" echo "=== otool -L tcltk/magicdnull"
otool -L tcltk/magicdnull otool -L tcltk/magicdnull
set +o pipefail # macosx this is on by default (turn it off)
echo "=== magic --version" echo "=== magic --version"
magic --version magic --version
echo "=== magic -d help -noconsole" echo "=== magic -d help -noconsole"
@ -348,8 +397,13 @@ jobs:
echo "version ; quit" | magic -d null -noconsole -T scmos echo "version ; quit" | magic -d null -noconsole -T scmos
- name: Summary - name: Summary
if: always()
run: | run: |
set +e set +e
ls -l
touch MAKE.LOG # just in case it did not even build
grep "error:" MAKE.LOG > MAKE_error.LOG grep "error:" MAKE.LOG > MAKE_error.LOG
grep "warning:" MAKE.LOG > MAKE_warning.LOG grep "warning:" MAKE.LOG > MAKE_warning.LOG
@ -359,7 +413,6 @@ jobs:
grep -v "Wunused-label" | grep -v "Wunused-label" |
grep -v "Wunused-but-set-variable" > MAKE_warning_filtered.LOG grep -v "Wunused-but-set-variable" > MAKE_warning_filtered.LOG
ls -l
wc -l *.LOG wc -l *.LOG
error_count=$( grep -c "error:" MAKE_error.LOG) error_count=$( grep -c "error:" MAKE_error.LOG)
@ -381,16 +434,21 @@ jobs:
echo "---" echo "---"
echo "$title" echo "$title"
echo "" echo ""
[ -f scripts/config.log ] && grep "./configure" scripts/config.log | head -n1
echo ""
echo "PACKAGE_LIST=$PACKAGE_LIST" echo "PACKAGE_LIST=$PACKAGE_LIST"
echo "CONFIGURE_ARGS=$CONFIGURE_ARGS" echo "CONFIGURE_ARGS=$CONFIGURE_ARGS"
echo "" echo ""
echo "total ${total_error_count} error(s) ${total_warning_count} warning(s) :" if [ -s MAKE.LOG ]
echo "|Count|Warning Group (-j build log inaccuracies)|" then
echo "|--:|:--|" echo "total ${total_error_count} error(s) ${total_warning_count} warning(s) :"
# due to -j build the log lines might get corrupted, so missing/incorrect/bogus entries might be seen echo "|Count|Warning Group (-j build log inaccuracies)|"
# so we add extra: egrep "\[\-W.*\]" (to try to remove that) echo "|--:|:--|"
sed -e 's#.*\(\[\-W\)#\1#' -e 's#\(\]\).*$#\1#' MAKE_warning.LOG | egrep "\[\-W.*\]" | sort | uniq -c | sort -n | tr -s ' ' | tr ' ' '|' | awk '{print $0"|"}' # due to -j build the log lines might get corrupted, so missing/incorrect/bogus entries might be seen
echo "" # so we add extra: egrep "\[\-W.*\]" (to try to remove that)
sed -e 's#.*\(\[\-W\)#\1#' -e 's#\(\]\).*$#\1#' MAKE_warning.LOG | egrep "\[\-W.*\]" | sort | uniq -c | sort -n | tr -s ' ' | tr ' ' '|' | awk '{print $0"|"}'
echo ""
fi
grep -A100 "Configuration Summary" CONFIGURE.LOG | grep -v "Configuration Summary" | egrep "^.*:" | sed -e '/\---/,//d' grep -A100 "Configuration Summary" CONFIGURE.LOG | grep -v "Configuration Summary" | egrep "^.*:" | sed -e '/\---/,//d'
echo "" echo ""
grep DCAD_DIR MAKE.LOG | tail -n1 grep DCAD_DIR MAKE.LOG | tail -n1

4
INSTALL_MacOS.md
View File

@ -3,9 +3,11 @@
Get [Homebrew](https://brew.sh). Get [Homebrew](https://brew.sh).
```sh ```sh
brew install cairo tcl-tk python3 # TCL9 should be supported soon (Q2 2025)
brew install cairo tcl-tk@8 python3
brew install --cask xquartz brew install --cask xquartz
./scripts/configure_mac ./scripts/configure_mac
# If you have both TCL8 and TCL9 installed you may need to verify TCL8 was selected.
make database/database.h make database/database.h
make -j$(sysctl -n hw.ncpu) make -j$(sysctl -n hw.ncpu)
make install # may need sudo depending on your setup make install # may need sudo depending on your setup

54
scripts/configure_mac
View File

@ -36,6 +36,56 @@ do
fi fi
done done
# This appeared to have the "@8" suffix add to the installed path
brew_prefix_tcl_tk=$(brew --prefix tcl-tk)
echo "brew_prefix_tcl_tk=$(brew --prefix tcl-tk)"
brew_prefix_tcl_tk_at8=$(brew --prefix tcl-tk@8)
echo "brew_prefix_tcl_tk_at8=$(brew --prefix tcl-tk@8)"
# Changed the order to reflect current state to use TCL8 in preference to default,
# but you can swap/edit these to modify the first-found-is-selected for building.
for d in "${brew_prefix_tcl_tk_at8}" "${brew_prefix_tcl_tk}"
do
if [ -d "$d" ]
then
echo "Directory Exists: $d"
ls -l "${d}/"
if [ -z "$tcl_tk_prefix_dir" ]
then
if [ -f "${d}/include/tcl.h" ]
then
echo "Found tcl-tk: ${d}"
tcl_tk_prefix_dir="${d}"
else
echo "WARNING: Not Found tcl.h in ${d}/include/"
ls -l "${d}/include/"
if [ -d "${d}/lib" ]
then
# A subdir exists
ls -l "${d}/lib"
# TEST does it build if we set
echo "Found tcl-tk (lib): ${d}/lib"
tcl_tk_prefix_dir="${d}/lib"
elif [ -d "${d}/include/tcl-tk" ]
then
# A subdir exists
ls -l "${d}/include/tcl-tk"
# TEST does it build if we set
if [ -f "${d}/include/tcl-tk/tcl.h" ]
then
echo "Found tcl-tk: ${d}/include/tcl-tk"
tcl_tk_prefix_dir="${d}/include/tcl-tk"
fi
fi
fi
else
echo "WARNING: Multiple tcl-tk packages found installed (side-by-side) please manually edit this script or fixup configure command line" 1>&2
echo "WARNING: The version being used for this build is: $tcl_tk_prefix_dir" 1>&2
fi
fi
done
# Restores the original script default when the above detection fails
tcl_tk_prefix_dir=${tcl_tk_prefix_dir:-$brew_prefix_tcl_tk}
if [ -n "$x11_include_dir" ] if [ -n "$x11_include_dir" ]
then then
# On some versions of MacOSX (example macosx12 / XCode 14.2) the tcl-tk # On some versions of MacOSX (example macosx12 / XCode 14.2) the tcl-tk
@ -61,8 +111,8 @@ then
fi fi
./configure\ ./configure\
--with-tcl=$(brew --prefix tcl-tk)\ --with-tcl="${tcl_tk_prefix_dir}"\
--with-tk=$(brew --prefix tcl-tk)\ --with-tk="${tcl_tk_prefix_dir}"\
--with-cairo=$(brew --prefix cairo)/include\ --with-cairo=$(brew --prefix cairo)/include\
$CONFARGS\ $CONFARGS\
"LDFLAGS=-L$(brew --prefix cairo)/lib" "LDFLAGS=-L$(brew --prefix cairo)/lib"