Menu
▾
▴
[Maxima-commits] CVS: maxima/src macdes.lisp, 1.34, 1.35 init-cl.lisp, 1.112, 1.113
|
From: Andreas E. <ar...@us...> - 2008-04-09 17:59:14
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5297/src Modified Files: macdes.lisp init-cl.lisp Log Message: moved *maxima-demodir* and combine-path th where they belong: init-cl. changed combine-path to accept a variable number of arguments. so now there is no need to explicitly cons up argument-lists. adapted all call sites of combine-path. Index: macdes.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/macdes.lisp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- macdes.lisp 9 Apr 2008 17:25:45 -0000 1.34 +++ macdes.lisp 9 Apr 2008 17:58:33 -0000 1.35 @@ -10,12 +10,6 @@ (defvar $manual_demo "manual.demo") -(defvar *maxima-demodir*) - -(defun combine-path (list) - "splice a '/' between the path components given as arguments" - (format nil "~{~A~^/~}" list)) - (defmspec $example (l) (declare (special *need-prompt*)) (let ((example (second l))) Index: init-cl.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/init-cl.lisp,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- init-cl.lisp 1 Apr 2008 16:24:47 -0000 1.112 +++ init-cl.lisp 9 Apr 2008 17:58:33 -0000 1.113 @@ -28,6 +28,7 @@ (defvar *maxima-userdir*) (defvar *maxima-tempdir*) (defvar *maxima-lang-subdir*) +(defvar *maxima-demodir*) (defmvar $maxima_tempdir) (putprop '$maxima_tempdir 'shadow-string-assignment 'assign) @@ -89,6 +90,10 @@ (defvar $chemin nil) +(defun combine-path (&rest list) + "splice a '/' between the path components given as arguments" + (format nil "~{~A~^/~}" list)) + (defun maxima-parse-dirstring (str) (let ((sep "/")) (if (position (character "\\") str) @@ -103,72 +108,53 @@ (concatenate 'string (string-right-trim ":" dev) ":") "")) "/" - (combine-path (rest (pathname-directory str)))))) + (apply #'combine-path (rest (pathname-directory str)))))) (defun set-pathnames-with-autoconf (maxima-prefix-env) (let ((libdir) (libexecdir) (datadir) (infodir) - (package-version (combine-path (list *autoconf-package* - *autoconf-version*))) - (binary-subdirectory (concatenate 'string - "binary-" *maxima-lispname*))) + (package-version (combine-path *autoconf-package* *autoconf-version*)) + (binary-subdirectory (concatenate 'string "binary-" *maxima-lispname*))) (if maxima-prefix-env (progn - (setq libdir (combine-path (list maxima-prefix-env "lib"))) - (setq libexecdir (combine-path (list maxima-prefix-env "libexec"))) - (setq datadir (combine-path (list maxima-prefix-env "share"))) - (setq infodir (combine-path (list maxima-prefix-env "info")))) + (setq libdir (combine-path maxima-prefix-env "lib")) + (setq libexecdir (combine-path maxima-prefix-env "libexec")) + (setq datadir (combine-path maxima-prefix-env "share")) + (setq infodir (combine-path maxima-prefix-env "info"))) (progn - (setq libdir (maxima-parse-dirstring *autoconf-libdir*)) + (setq libdir (maxima-parse-dirstring *autoconf-libdir*)) (setq libexecdir (maxima-parse-dirstring *autoconf-libexecdir*)) - (setq datadir (maxima-parse-dirstring *autoconf-datadir*)) - (setq infodir (maxima-parse-dirstring *autoconf-infodir*)))) - (setq *maxima-imagesdir* - (combine-path (list libdir package-version binary-subdirectory))) - (setq *maxima-sharedir* - (combine-path (list datadir package-version "share"))) - (setq *maxima-symdir* - (combine-path (list datadir package-version "share" "sym"))) - (setq *maxima-srcdir* - (combine-path (list datadir package-version "src"))) - (setq *maxima-demodir* - (combine-path (list datadir package-version "demo"))) - (setq *maxima-testsdir* - (combine-path (list datadir package-version "tests"))) - (setq *maxima-docdir* - (combine-path (list datadir package-version "doc"))) - (setq *maxima-infodir* infodir) - (setq *maxima-htmldir* - (combine-path (list datadir package-version "doc" "html"))) - (setq *maxima-plotdir* - (combine-path (list libexecdir package-version))))) + (setq datadir (maxima-parse-dirstring *autoconf-datadir*)) + (setq infodir (maxima-parse-dirstring *autoconf-infodir*)))) + (setq *maxima-imagesdir* (combine-path libdir package-version binary-subdirectory)) + (setq *maxima-sharedir* (combine-path datadir package-version "share")) + (setq *maxima-symdir* (combine-path datadir package-version "share" "sym")) + (setq *maxima-srcdir* (combine-path datadir package-version "src")) + (setq *maxima-demodir* (combine-path datadir package-version "demo")) + (setq *maxima-testsdir* (combine-path datadir package-version "tests")) + (setq *maxima-docdir* (combine-path datadir package-version "doc")) + (setq *maxima-infodir* infodir) + (setq *maxima-htmldir* (combine-path datadir package-version "doc" "html")) + (setq *maxima-plotdir* (combine-path libexecdir package-version)))) (defun set-pathnames-without-autoconf (maxima-prefix-env) (let ((maxima-prefix (if maxima-prefix-env maxima-prefix-env (maxima-parse-dirstring *autoconf-prefix*))) - (binary-subdirectory (concatenate 'string - "binary-" *maxima-lispname*))) + (binary-subdirectory (concatenate 'string "binary-" *maxima-lispname*))) - (setq *maxima-imagesdir* - (combine-path (list maxima-prefix "src" binary-subdirectory))) - (setq *maxima-sharedir* - (combine-path (list maxima-prefix "share"))) - (setq *maxima-symdir* - (combine-path (list maxima-prefix "share" "sym"))) - (setq *maxima-srcdir* - (combine-path (list maxima-prefix "src"))) - (setq *maxima-demodir* - (combine-path (list maxima-prefix "demo"))) - (setq *maxima-testsdir* - (combine-path (list maxima-prefix "tests"))) - (setq *maxima-docdir* - (combine-path (list maxima-prefix "doc"))) - (setq *maxima-infodir* (combine-path (list maxima-prefix "doc" "info"))) - (setq *maxima-htmldir* (combine-path (list maxima-prefix "doc" "html"))) - (setq *maxima-plotdir* (combine-path (list maxima-prefix "plotting"))))) + (setq *maxima-imagesdir* (combine-path maxima-prefix "src" binary-subdirectory)) + (setq *maxima-sharedir* (combine-path maxima-prefix "share")) + (setq *maxima-symdir* (combine-path maxima-prefix "share" "sym")) + (setq *maxima-srcdir* (combine-path maxima-prefix "src")) + (setq *maxima-demodir* (combine-path maxima-prefix "demo")) + (setq *maxima-testsdir* (combine-path maxima-prefix "tests")) + (setq *maxima-docdir* (combine-path maxima-prefix "doc")) + (setq *maxima-infodir* (combine-path maxima-prefix "doc" "info")) + (setq *maxima-htmldir* (combine-path maxima-prefix "doc" "html")) + (setq *maxima-plotdir* (combine-path maxima-prefix "plotting")))) (defun default-userdir () (let ((home-env (maxima-getenv "HOME")) @@ -188,7 +174,7 @@ (if (string= *autoconf-win32* "true") "c:\\user\\" "/tmp"))) - (combine-path (list (maxima-parse-dirstring base-dir) maxima-dir)))) + (combine-path (maxima-parse-dirstring base-dir) maxima-dir))) (defun default-tempdir () (let ((home-env (maxima-getenv "HOME")) @@ -379,35 +365,31 @@ ;; actually, this entry is not correct. ;; there should be a separate directory for compiled ;; lisp code. jfa 04/11/02 - (combine-path (list *maxima-userdir* lisp-patterns)) - (combine-path (list *maxima-sharedir* lisp-patterns)) - (combine-path (list *maxima-sharedir* share-subdirs - lisp-patterns)) - (combine-path (list *maxima-srcdir* lisp-patterns)))) + (combine-path *maxima-userdir* lisp-patterns) + (combine-path *maxima-sharedir* lisp-patterns) + (combine-path *maxima-sharedir* share-subdirs lisp-patterns) + (combine-path *maxima-srcdir* lisp-patterns))) (setq $file_search_maxima (list '(mlist) - (combine-path (list *maxima-userdir* maxima-patterns)) - (combine-path (list *maxima-sharedir* maxima-patterns)) - (combine-path (list *maxima-sharedir* share-subdirs - maxima-patterns)))) + (combine-path *maxima-userdir* maxima-patterns) + (combine-path *maxima-sharedir* maxima-patterns) + (combine-path *maxima-sharedir* share-subdirs maxima-patterns))) (setq $file_search_demo (list '(mlist) - (combine-path (list *maxima-sharedir* demo-patterns)) - (combine-path (list *maxima-sharedir* share-subdirs - demo-patterns)) - (combine-path (list *maxima-demodir* demo-patterns)))) + (combine-path *maxima-sharedir* demo-patterns) + (combine-path *maxima-sharedir* share-subdirs demo-patterns) + (combine-path *maxima-demodir* demo-patterns))) (setq $file_search_usage (list '(mlist) - (combine-path (list *maxima-sharedir* usage-patterns)) - (combine-path (list *maxima-sharedir* share-subdirs - usage-patterns)) - (combine-path (list *maxima-docdir* usage-patterns)))) + (combine-path *maxima-sharedir* usage-patterns) + (combine-path *maxima-sharedir* share-subdirs usage-patterns) + (combine-path *maxima-docdir* usage-patterns))) (setq $file_search_tests - `((mlist) ,(combine-path (list *maxima-testsdir* maxima-patterns)))) + `((mlist) ,(combine-path *maxima-testsdir* maxima-patterns))) (setq $chemin (list '(mlist) - (combine-path (list *maxima-symdir* lisp-patterns)) - (combine-path (list *maxima-symdir* maxima-patterns)))) + (combine-path *maxima-symdir* lisp-patterns) + (combine-path *maxima-symdir* maxima-patterns))) ;; If *maxima-lang-subdir* is not nil test whether corresponding info directory ;; with some data really exists. If not this probably means that required ;; language pack wasn't installed and we reset *maxima-lang-subdir* to nil. |