Skip to content

Add error-handling, whitespace-safety, and Rosetta support to scripts/ccl & scripts/ccl64 #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add error-handling, whitespace-safety, and Rosetta support to scripts/ccl & scripts/ccl64 #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba6877f
Add whitespace safety and error handling
gwerbin Jul 24, 2022
3aa4ba7
Apply similar fixes from scripts/ccl64
gwerbin Jul 24, 2022
6d34148
Require opt-in to Mac Rosetta w/ CCL_USE_ROSETTA
gwerbin Jul 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions scripts/ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh

set -eu

# Change the definition of CCL_DEFAULT_DIRECTORY below to refer to
# your Clozure CL installation directory. The lisp will use this
# environment variable to set up translations for the CCL: logical
Expand All @@ -8,43 +10,45 @@
# Any definition of CCL_DEFAULT_DIRECTORY already present in the
# environment takes precedence over definition made below.

if [ -z "$CCL_DEFAULT_DIRECTORY" ]; then
if [ -z "${CCL_DEFAULT_DIRECTORY:-}" ]; then
CCL_DEFAULT_DIRECTORY=/usr/local/src/ccl
fi

# If you don't want to guess the name of the lisp kernel on
# If you don't want to guess the name of the OpenMCL kernel on
# every invocation (or if you want to use a kernel with a
# non-default name), you might want to uncomment and change
# the following line:
#OPENMCL_KERNEL=some_name

if [ -z "$OPENMCL_KERNEL" ]; then
case `uname -s` in
Darwin) case `arch` in
ppc*) OPENMCL_KERNEL=dppccl ;;
i386) OPENMCL_KERNEL=dx86cl ;;
esac ;;
Linux) case `uname -m` in
ppc*) OPENMCL_KERNEL=ppccl ;;
*86*) OPENMCL_KERNEL=lx86cl ;;
*arm*) OPENMCL_KERNEL=armcl ;;
*aarch64*) OPENMCL_KERNEL=armcl ;;
esac ;;
if [ -z "${OPENMCL_KERNEL:-}" ]; then
case "$(uname -s)" in
Darwin) case "$(arch)" in
ppc*) OPENMCL_KERNEL=dppccl ;;
i386) OPENMCL_KERNEL=dx86cl ;;
*)
echo "Unsupported architecture"
exit 1 ;;
esac ;;
Linux)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be an indentation issue here (or GitHub is not displaying things correctly).

case "$(uname -m)" in
ppc*) OPENMCL_KERNEL=ppccl ;;
*86*) OPENMCL_KERNEL=lx86cl ;;
*arm*) OPENMCL_KERNEL=armcl ;;
*aarch64*) OPENMCL_KERNEL=armcl ;;
*)
echo "Unsupported architecture"
exit 1 ;;
esac ;;
FreeBSD) OPENMCL_KERNEL=fx86cl ;;
SunOS) OPENMCL_KERNEL=sx86cl ;;
CYGWIN*)
OPENMCL_KERNEL=wx86cl.exe
CCL_DEFAULT_DIRECTORY="C:/cygwin$CCL_DEFAULT_DIRECTORY"
;;
SunOS) OPENMCL_KERNEL=sx86cl
;;
FreeBSD) OPENMCL_KERNEL=fx86cl
;;
CCL_DEFAULT_DIRECTORY="C:/cygwin$CCL_DEFAULT_DIRECTORY" ;;
*)
echo "Can't determine host OS. Fix this."
exit 1
;;
echo "Can't determine host OS."
exit 1 ;;
esac
fi

export CCL_DEFAULT_DIRECTORY
exec ${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL} "$@"

exec "${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL}" "$@"
97 changes: 42 additions & 55 deletions scripts/ccl64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh
#

set -eu

# Change the definition of CCL_DEFAULT_DIRECTORY below to refer to
# your Clozure CL installation directory. The lisp will use this
# environment variable to set up translations for the CCL: logical
Expand All @@ -8,7 +10,7 @@
# Any definition of CCL_DEFAULT_DIRECTORY already present in the
# environment takes precedence over definition made below.

if [ -z "$CCL_DEFAULT_DIRECTORY" ]; then
if [ -z "${CCL_DEFAULT_DIRECTORY:-}" ]; then
CCL_DEFAULT_DIRECTORY=/usr/local/src/ccl
fi

Expand All @@ -18,65 +20,50 @@ fi
# the following line:
#OPENMCL_KERNEL=some_name

if [ -z "$OPENMCL_KERNEL" ]; then
case `uname -s` in
Darwin)
case `arch` in
ppc*)
OPENMCL_KERNEL=dppccl64
;;
i386|x86_64)
OPENMCL_KERNEL=dx86cl64
;;
esac
;;
Linux)
case `uname -m` in
ppc64)
OPENMCL_KERNEL=ppccl64
;;
x86_64)
OPENMCL_KERNEL=lx86cl64
;;
if [ -z "${OPENMCL_KERNEL:-}" ]; then
case "$(uname -s)" in
Darwin) case "$(arch)" in
ppc*) OPENMCL_KERNEL=dppccl64 ;;
i386|x86_64) OPENMCL_KERNEL=dx86cl64 ;;
arm64)
if [ "${CCL_USE_ROSETTA:-0}" = 1 ]; then
# Run under the MacOS Rosetta binary translator
OPENMCL_KERNEL=dx86cl64
else
echo "Unsupported architecture"
exit 1
fi ;;
*)
echo "Can't determine machine architecture. Fix this."
exit 1
;;
esac
;;
FreeBSD)
case `uname -m` in
amd64)
OPENMCL_KERNEL=fx86cl64
;;
echo "Unsupported architecture"
exit 1 ;;
esac ;;
Linux) case "$(uname -m)" in
ppc64) OPENMCL_KERNEL=ppccl64 ;;
x86_64) OPENMCL_KERNEL=lx86cl64 ;;
*)
echo "unsupported architecture"
exit 1
;;
esac
;;
SunOS)
case `uname -m` in
i86pc)
OPENMCL_KERNEL=sx86cl64
;;
echo "Unsupported architecture"
exit 1 ;;
esac ;;
FreeBSD) case "$(uname -m)" in
amd64) OPENMCL_KERNEL=fx86cl64 ;;
*)
echo "unsupported architecture"
exit 1
;;
esac
;;
echo "Unsupported architecture"
exit 1 ;;
esac ;;
SunOS) case "$(uname -m)" in
i86pc) OPENMCL_KERNEL=sx86cl64 ;;
*)
echo "Unsupported architecture"
exit 1 ;;
esac ;;
CYGWIN*)
OPENMCL_KERNEL=wx86cl64.exe
CCL_DEFAULT_DIRECTORY="C:/cygwin$CCL_DEFAULT_DIRECTORY"
;;
OPENMCL_KERNEL=wx86cl64.exe
CCL_DEFAULT_DIRECTORY="C:/cygwin$CCL_DEFAULT_DIRECTORY" ;;
*)
echo "Can't determine host OS. Fix this."
exit 1
;;
echo "Can't determine host OS."
exit 1 ;;
esac
fi

export CCL_DEFAULT_DIRECTORY
exec ${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL} "$@"

exec "${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL}" "$@"