From: Andrej V. <an...@us...> - 2012-04-01 15:27:29
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Maxima, A Computer Algebra System". The branch, master has been updated via 09db8fe333ad0d8cd22d006347fcc204bc4bb8f6 (commit) from dab8e66cc18b04812af83557f663e1c0347cab23 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 09db8fe333ad0d8cd22d006347fcc204bc4bb8f6 Author: Andrej Vodopivec <and...@gm...> Date: Sun Apr 1 17:25:56 2012 +0200 Updates for osx binary. diff --git a/macosx/Makefile b/macosx/Makefile index deed9b1..1f49049 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -1,5 +1,5 @@ APPDIR = $(HOME)/Desktop -VERSION = 5.24.0 +VERSION = 5.27.0 LISP_PROGRAM = /usr/local/bin/sbcl LISP_NAME = sbcl @@ -12,14 +12,14 @@ all: ./configure --with-$(LISP_NAME) --prefix=$(PREFIX) make platypus -F -y -a Maxima \ - -c macosx/script \ -p /bin/sh \ -o None \ - -i interfaces/xmaxima/maxima-new.png \ + -i macosx/appIcon.icns \ -V $(VERSION) \ -u "Maxima Development Team" \ -I net.sourceforge.maxima \ - $(MAXIMA_APP) + macosx/script $(MAXIMA_APP) make install install -c macosx/maxima.sh $(APPRESOURCES) + install -c macosx/xmaxima.sh $(APPRESOURCES) install -c $(LISP_PROGRAM) $(BINDIR) diff --git a/macosx/appIcon.icns b/macosx/appIcon.icns new file mode 100644 index 0000000..c71298a Binary files /dev/null and b/macosx/appIcon.icns differ diff --git a/macosx/maxima.sh b/macosx/maxima.sh index 4809a37..cae31dd 100644 --- a/macosx/maxima.sh +++ b/macosx/maxima.sh @@ -1,6 +1,9 @@ -#!/bin/sh +#!/bin/bash -ROOT=`(cd \`dirname $0\` > /dev/null 2>&1 ; pwd)` +SCRIPT="${BASH_SOURCE[0]}" +while [ -L "$SCRIPT" ] ; do SCRIPT=`(readlink "$SCRIPT")` ; done + +ROOT=`(cd \`dirname "$SCRIPT"\` > /dev/null 2>&1 ; pwd)` MAXIMA_PREFIX=$ROOT/maxima/ export MAXIMA_PREFIX diff --git a/macosx/xmaxima.sh b/macosx/xmaxima.sh new file mode 100644 index 0000000..1ba50c0 --- /dev/null +++ b/macosx/xmaxima.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +SCRIPT="${BASH_SOURCE[0]}" +while [ -L "$SCRIPT" ] ; do SCRIPT=`(readlink "$SCRIPT")` ; done + +ROOT=`(cd \`dirname "$SCRIPT"\` > /dev/null 2>&1 ; pwd)` + +VERSION=`ls "$ROOT/maxima/share/maxima/"` +MAXIMA_XMAXIMADIR=$ROOT/maxima/share/maxima/$VERSION/xmaxima +export MAXIMA_XMAXIMADIR +XMAXIMA_MAXIMA=$ROOT/maxima.sh + +PATH="$MAXIMA_PREFIX/bin:$PATH" +export PATH + +exec wish $ROOT/maxima/bin/xmaxima "$@" ----------------------------------------------------------------------- Summary of changes: macosx/Makefile | 8 ++++---- macosx/appIcon.icns | Bin 0 -> 198769 bytes macosx/maxima.sh | 7 +++++-- macosx/xmaxima.sh | 16 ++++++++++++++++ 4 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 macosx/appIcon.icns create mode 100644 macosx/xmaxima.sh hooks/post-receive -- Maxima, A Computer Algebra System |