contrib/macos/mk_app is hopelessly outdated.
I move the only useful line "sed FRICASVER" to Makefile.in.
contrib/macos/README is also outdated, the TODOs in it are done.
BTW, I think contrib/cygwin/ is outdated. Is contrib/sbcl/,
contrib/omcl.diff also outdated?
- Qian
--
You received this message because you are subscribed to the Google Groups "FriCAS -
computer algebra system" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/fricas-devel/d195930a-27f3-4b91-b8f7-92736a432cf7%40gmail.com.
diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
index 5156231a..98e6657e 100644
--- a/.github/workflows/macOS.yml
+++ b/.github/workflows/macOS.yml
@@ -31,7 +31,8 @@ jobs:
test "$GITHUB_REF_TYPE" != "tag" && rm -r target/*/src
make dist-macos
cp -v `brew list gmp | grep libgmp.10.dylib` FriCAS.app/Contents/Resources/usr/local/lib/fricas/target/*/lib/
- make dist-macos-dmg
+ ## reduce chance of error caused by "hdiutil: Resource busy"
+ make dist-macos-dmg || make dist-macos-dmg
mv FriCAS.dmg ../fricas/FriCAS-macOS-x86_64-${{ github.sha }}.dmg
- name: Upload macOS binary
uses: actions/upload-artifact@v4
diff --git a/Makefile.in b/Makefile.in
index 4093a5c3..df076c95 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -251,7 +251,8 @@ dist-macos: out-of-source-check
${MKDIR_P} FriCAS.app/Contents/{MacOS,Resources}
${MAKE} DESTDIR=./FriCAS.app/Contents/Resources install-src
sed -e 's|/usr/local|`dirname $$0`/..|' -i .bak FriCAS.app/Contents/Resources/usr/local/bin/fricas
- cp $(fricas_top_srcdir)/contrib/macos/Info.plist ./FriCAS.app/Contents/
+ rm -f FriCAS.app/Contents/Resources/usr/local/bin/fricas.bak
+ sed -e "s/FRICASVER/${PACKAGE_VERSION}/" $(fricas_top_srcdir)/contrib/macos/Info.plist > ./FriCAS.app/Contents/Info.plist
cp $(fricas_top_srcdir)/contrib/macos/appIcon.icns ./FriCAS.app/Contents/Resources/
cc -framework CoreFoundation $(fricas_top_srcdir)/contrib/macos/FriCAS.c -o ./FriCAS.app/Contents/MacOS/FriCAS
diff --git a/contrib/macos/Info.plist b/contrib/macos/Info.plist
index 44f40fe4..a840bbb9 100644
--- a/contrib/macos/Info.plist
+++ b/contrib/macos/Info.plist
@@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string>appIcon.icns</string>
<key>CFBundleIdentifier</key>
- <string>pl.wroc.uni.math.fricas</string>
+ <string>org.fricas.fricas</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -21,7 +21,7 @@
<key>CFBundleVersion</key>
<string>FRICASVER</string>
<key>LSMinimumSystemVersion</key>
- <string>MACOSXVER</string>
+ <string>10.15.0</string>
<key>LSMultipleInstancesProhibited</key>
<false/>
<key>LSBackgroundOnly</key>
diff --git a/contrib/macos/README b/contrib/macos/README
deleted file mode 100644
index 951e80eb..00000000
--- a/contrib/macos/README
+++ /dev/null
@@ -1,26 +0,0 @@
-mk_app: Create MacOS X application bundle for FriCAS.
-
-Prerequisites:
- - Xcode (tested with 4.6.2)
- - Command Line Tools for Xcode
- - MacOS 10.7.5
-
-Notes:
- - To build FriCAS for MacOS 10.6.8 (Snow Leopard) with newer Xcode versions,
- you need to download Xcode 4.3.3, find and copy 'MacOSX10.6.sdk' directory to
- /Application/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
-
-TODO:
- - Put application bundle into an Apple disk image (.dmg)
- - Enable computations with GMP library.
-
-Run 'mk_app build' script to obtain FriCAS.app directory with (hopefully)
-working application bundle. Note that the script doesn't use FriCAS sources
-from the repository, but rather downloads full version from sourceforge.net.
-
-If you wish to build FriCAS with another version of SBCL Common Lisp compiler,
-please change SBCLVER variable.
-
-Run 'mk_app dist' to create compressed archive with FriCAS bundle.
-
-To clean up build directory issue 'mk_app clean' command.
diff --git a/contrib/macos/mk_app b/contrib/macos/mk_app
deleted file mode 100644
index cc6bf0de..00000000
--- a/contrib/macos/mk_app
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh -e
-
-function fail() {
- echo $@
- exit 1
-}
-
-export PATH="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin"
-unalias -a
-
-ROOT=`pwd`
-CURL="curl -L -O -#"
-
-MACOSXVER="10.6"
-MACOSXSDK="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSXVER}.sdk"
-ARCH="x86_64"
-
-SRCDIR=`cd ${ROOT}/../..; pwd`
-
-SBCLVER="1.1.8"
-SBCLTBZ="sbcl-${SBCLVER}-x86-64-darwin-binary.tar.bz2"
-SBCLDIR="sbcl-${SBCLVER}-x86-64-darwin"
-
-[ -f "${SRCDIR}/contrib/macos/mk_app" ] || \
- fail "Please start the command in 'contrib/macos' directory."
-
-[ -d "${MACOSXSDK}" ] || \
- fail "No MacOSX ${MACOSXVER} SDK installed."
-
-FRICASVER=`sed -n 's#.*\[FriCAS\], \[\(.*\)\],#\1#p' "${SRCDIR}/configure.ac"`
-
-[ -n "${FRICASVER}" ] || \
- fail "Cannot extract FriCAS version number from sources."
-
-export CC="gcc -isysroot ${MACOSXSDK} -mmacosx-version-min=${MACOSXVER} -arch ${ARCH}"
-
-action=${1:-build}
-
-if [ "${action}" == "build" ]; then
- if [ ! -f ${SBCLTBZ} ]; then
- echo "Downloading ${SBCLTBZ}:"
- ${CURL} "http://downloads.sf.net/sourceforge/sbcl/${SBCLVER}/${SBCLTBZ}";
- fi
-
- [ -d ${SBCLDIR} ] || tar xvjf ${SBCLTBZ}
-
- export LC_ALL=C
- export LANG=C
-
- rm -rf FriCAS.app
- mkdir -p FriCAS.app/Contents/{MacOS,Resources}
-
- mkdir -p build
- pushd build
- ${SRCDIR}/configure \
- --prefix="" \
- --with-lisp="${ROOT}/${SBCLDIR}/run-sbcl.sh"
- make
- make DESTDIR=${ROOT}/FriCAS.app/Contents/Resources install
- popd
-
- sed -e "s,FRICASVER,${FRICASVER}," \
- -e "s,MACOSXVER,${MACOSXVER}.0," \
- Info.plist > ${ROOT}/FriCAS.app/Contents/Info.plist
-
- ${CC} -O2 -Wall -framework CoreFoundation FriCAS.c \
- -o FriCAS.app/Contents/MacOS/FriCAS
-
- install appIcon.icns FriCAS.app/Contents/Resources/
-fi
-
-if [ "${action}" == "dist" ]; then
- tar cvJf FriCAS-${FRICASVER}-${ARCH}-macos${MACOSXVER}.tar.xz FriCAS.app
-fi
-
-if [ "${action}" == "clean" ]; then
- rm -vrf ${SBCLDIR}
- rm -vrf FriCAS.app
- rm -vrf build
- rm -vf *~
-fi
