From: Robert D. <rob...@us...> - 2009-01-25 03:07:52
|
Update of /cvsroot/maxima/maxima/share/sym In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24131/share/sym Modified Files: compile.lisp sym.system sym1.mac Log Message: Rework sym package to write compiler output files to *MAXIMA-OBJDIR*. Cut out variables $CHEMIN and *MAXIMA-SYMDIR* (superseded by *MAXIMA-OBJDIR*). Index: compile.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/share/sym/compile.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- compile.lisp 19 Mar 2007 03:04:28 -0000 1.3 +++ compile.lisp 25 Jan 2009 03:07:45 -0000 1.4 @@ -16,5 +16,5 @@ ; * e-mail : av...@sy... * ; *************************************************************** -(load (concatenate 'string *maxima-symdir* "/" "sym.system")) +(load ($file_search "sym.system")) (mk:compile-system "sym") Index: sym.system =================================================================== RCS file: /cvsroot/maxima/maxima/share/sym/sym.system,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sym.system 19 Mar 2007 03:04:28 -0000 1.2 +++ sym.system 25 Jan 2009 03:07:46 -0000 1.3 @@ -2,15 +2,8 @@ (mk:defsystem "sym" :source-extension "lisp" - :binary-pathname *maxima-symdir* - ;; Don't use separate directories because the files should be in $chemin - ;; #+clisp "binary-clisp" - ;; #+cmu "binary-cmucl" - ;; #+sbcl "binary-sbcl" - ;; #+gcl "binary-gcl" - ;; #+allegro "binary-acl6" - ;; #+openmcl "binary-openmcl" - ;; #-(or clisp cmu sbcl gcl allegro openmcl) "binary-unknownlisp" + :binary-pathname (maxima::maxima-objdir "share" "sym" + (concatenate 'string "binary-" maxima::*maxima-lispname*)) :components ;; Reflects the order in sym1.mac. ((:module macros Index: sym1.mac =================================================================== RCS file: /cvsroot/maxima/maxima/share/sym/sym1.mac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sym1.mac 19 Mar 2007 03:04:28 -0000 1.3 +++ sym1.mac 25 Jan 2009 03:07:46 -0000 1.4 @@ -19,8 +19,6 @@ */ -if (chemin = 'chemin) then -chemin:"/usr/local/maxima/sym/"; /* valeurs par defauts qui ne doivent pas ecraser celles deja donnees par l'utilisateur */ @@ -43,7 +41,4 @@ print("NOTE: To compile the system do"); print("load(\"sym/compile\");"); -block([file_search_maxima:chemin, - file_search_lisp:chemin], - load("load-sym-lisp-files"), - 'done); +block (load ("load-sym-lisp-files"), 'done); |