[Maxima-commits] CVS: maxima/src maxima.bat.in,NONE,1.1 maxima.in,1.17,1.18 Makefile.am,1.27,1.28 .cvsignore,1.3,1.4 maxima.bat,1.1,NONE

[James A. <amu...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26954/src

Modified Files:
	maxima.in Makefile.am .cvsignore 
Added Files:
	maxima.bat.in 
Removed Files:
	maxima.bat 
Log Message:
Major changes:

1) Static installation for clisp and cmucl -- installed maxima no
   longer depends on external versions of clisp and cmucl. Requires
   (clisp,cmucl)-runtime to be established at configure time. Default
   should determine the proper values. The values are manually
   settable.

   Static installation is not necessary for GCL. Should be added for
   SBCL, ACL and OpenMCL.

2) Real support for maxima.bat script. Basic functionality complete,
   but untested.


--- NEW FILE: maxima.bat.in ---
@echo off



set arg0=%0

set arg1=%1

set arg2=%2

set arg3=%3

set arg4=%4

set arg5=%5

set arg6=%6

set arg7=%7

set arg8=%8

set arg9=%9



set lisp=@DEFAULTLISP@

set version=@VERSION@

set prefix=@prefix@

set package=@PACKAGE@

set verbose=false



:startparseargs

if "%1" == "-l" goto foundlisp

if "%1" == "--lisp" goto foundlisp

if "%1" == "-u" goto foundversion

if "%1" == "--use-version" goto foundversion

if "%1" == "-v" goto foundverbose

if "%1" == "--verbose" goto foundverbose



:continueparseargs

shift

if not "%1" == "" goto startparseargs

goto endparseargs



:foundlisp

set lisp=%2

shift

goto continueparseargs



:foundversion

set version=%2

shift

goto continueparseargs



:foundverbose

set verbose=true

goto continueparseargs



:endparseargs



if "%MAXIMA_PREFIX%" == "" goto defaultvars

set maxima_verpkglibexecdir="%MAXIMA_PREFIX%\libexec\%package%\%version%"

goto endsetupvars



defaultvars:

set maxima_verpkglibexecdir="%prefix%\libexec\%package%\%version%"

set clisp=d:\msys\1.0\home\amundson\bin\clisp-2.31\bin\clisp



:endsetupvars



set maxima_image_base="%maxima_verpkglibexecdir%\binary-%lisp%"



if "%verbose%" == "true" @echo on

if "%lisp%" == "gcl" goto dogcl

if "%lisp%" == "clisp" goto doclisp



@echo "maxima error: lisp %lisp% not known."

goto end



:dogcl

echo "Gcl? you lose."

goto end



:doclisp

"%maxima_image_base%\lisp.exe" -q -M "%maxima_image_base%\maxima.mem" "" -- "%arg1%" "%arg2%" "%arg3%" "%arg4%" "%arg5%" "%arg6%" "%arg7%" "%arg8%" "%arg9%"

goto end



:end








Index: maxima.in
===================================================================
RCS file: /cvsroot/maxima/maxima/src/maxima.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- maxima.in	20 Nov 2003 13:01:51 -0000	1.17
+++ maxima.in	24 Nov 2003 03:36:53 -0000	1.18
@@ -100,9 +100,17 @@
     set -x
 fi
 if [ "$MAXIMA_LISP" = "clisp" ]; then
-    exec "@CLISP_NAME@" -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    if [ "$in_maxima_local" = "true" ]; then
+	exec "@CLISP_NAME@" -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    else
+	exec "$MAXIMA_VERPKGLIBDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    fi
 elif [ "$MAXIMA_LISP" = "cmucl" ]; then
-    exec "@CMUCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    if [ "$in_maxima_local" = "true" ]; then
+	exec "@CMUCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    else
+	exec "$MAXIMA_VERPKGLIBDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" -quiet -core "$maxima_image_base.core" -eval '(user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
     exec "$maxima_image_base" -eval '(user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then

Index: Makefile.am
===================================================================
RCS file: /cvsroot/maxima/maxima/src/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am	20 Nov 2003 13:01:51 -0000	1.27
+++ Makefile.am	24 Nov 2003 03:36:53 -0000	1.28
@@ -1,5 +1,10 @@
 include $(top_srcdir)/common.mk
+
+if WIN32
+bin_SCRIPTS = maxima maxima.bat
+else
 bin_SCRIPTS = maxima
+endif
 
 LOADDEFSYSTEM = (load "$(top_srcdir)/lisp-utils/defsystem.lisp")
 LOADMAKEDEPENDS = (load "$(top_srcdir)/lisp-utils/make-depends.lisp")
@@ -25,9 +30,11 @@
 install-clisp:
 	$(mkinstalldirs) "$(DESTDIR)$(verpkglibdir)/binary-clisp"
 	$(INSTALL_DATA) binary-clisp/maxima.mem "$(DESTDIR)$(verpkglibdir)/binary-clisp/maxima.mem"
+	$(INSTALL_PROGRAM) @CLISP_RUNTIME_PATH@ "$(DESTDIR)$(verpkglibdir)/binary-clisp/@CLISP_RUNTIME@"
 
 uninstall-clisp:
 	rm -f "$(DESTDIR)$(verpkglibdir)/binary-clisp/maxima.mem"
+	rm -f "$(DESTDIR)$(verpkglibdir)/binary-clisp/@CLISP_RUNTIME@"
 
 clean-clisp:
 	rm -rf binary-clisp
@@ -58,9 +65,11 @@
 install-cmucl:
 	$(mkinstalldirs) "$(DESTDIR)$(verpkglibdir)/binary-cmucl"
 	$(INSTALL_DATA) binary-cmucl/maxima.core "$(DESTDIR)$(verpkglibdir)/binary-cmucl/maxima.core"
+	$(INSTALL_PROGRAM) @CMUCL_RUNTIME_PATH@ "$(DESTDIR)$(verpkglibdir)/binary-cmucl/@CMUCL_RUNTIME@"
 
 uninstall-cmucl:
 	rm -f "$(DESTDIR)$(verpkglibdir)/binary-cmucl/maxima.core"
+	rm -f "$(DESTDIR)$(verpkglibdir)/binary-cmucl/@CMUCL_RUNTIME@"
 
 clean-cmucl:
 	rm -rf binary-cmucl

Index: .cvsignore
===================================================================
RCS file: /cvsroot/maxima/maxima/src/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	20 Nov 2003 13:01:51 -0000	1.3
+++ .cvsignore	24 Nov 2003 03:36:53 -0000	1.4
@@ -3,6 +3,7 @@
 
 autoconf-variables.lisp
 maxima
+maxima.bat
 
 binary-*
 

--- maxima.bat DELETED ---