On 6/20/07, Waldek Hebisch wrote:
... It looks that 'directory' implementation in GCL is rather messy, so I will not try to fix it. However, you can try the following (which works like the old code): ...
Thanks! That patch (together with two other previous patches) worked fine. wh-sandbox now builds properly on Windows again. Here are the three patches: $ svn diff src/interp/*.pamphlet Index: src/interp/Makefile.pamphlet =================================================================== --- src/interp/Makefile.pamphlet (revision 613) +++ src/interp/Makefile.pamphlet (working copy) @@ -940,7 +940,7 @@ >> makedep.lisp ; \ echo '(load "'$$B'")' >> makedep.lisp ; \ done - echo '(load "makedep.lisp") (BOOT::spad-save "$@" nil)' | ${LISPSYS} + echo '(load "makedep.lisp") (BOOT::spad-save "$(BASE)$@" nil)' | ${LISPSYS} @ echo 4 ${DEPSYS} created @ Index: src/interp/daase.lisp.pamphlet =================================================================== --- src/interp/daase.lisp.pamphlet (revision 613) +++ src/interp/daase.lisp.pamphlet (working copy) @@ -900,7 +900,19 @@ (let (nrlibdirs asos skipasos aos) (chdir (string dirarg)) + #-:GCL (setq nrlibdirs (directory "*.NRLIB/index.KAF")) + + #| directory in GCL (at least gcl-2.6.8) on Windows is buggy, + it can not handle pathnames having wildcards in the middle, + so we need a workaround. |# + #+:GCL + (setq nrlibdirs + (mapcar #'(lambda (f) + (concatenate 'string (namestring f) + "/index.KAF")) + (directory "*.NRLIB"))) + (setq asys (directory "*.asy")) (setq asos (directory "*.ao")) $ svn diff src/lisp/*.pamphlet Index: src/lisp/Makefile.pamphlet =================================================================== --- src/lisp/Makefile.pamphlet (revision 613) +++ src/lisp/Makefile.pamphlet (working copy) @@ -81,7 +81,7 @@ echo '(load "axiom-package.lisp")' \ '(setq compiler::*default-system-p* t)' \ '(compile-file "axiom-lisp.lisp")' | $(AXIOM_LISP) - echo '(compiler::link (quote ("axiom-package.lisp" "axiom-lisp.$(OBJEXT)")) "lisp" ' \ + echo '(compiler::link nil "prelisp" ' \ ' (format nil "(progn (let ((*load-path* (cons ~S *load-path*))'\ ' (si::*load-types* ~S))' \ ' (compiler::emit-fn t))' \ @@ -91,6 +91,9 @@ ' si::*system-directory* (quote (list ".lsp")))' \ ' "$(lisp_c_objects) @axiom_c_runtime_extra@")' \ | $(AXIOM_LISP) + echo '(load "axiom-package.lisp") (load "axiom-lisp.$(OBJEXT)")' \ + '(in-package "AXIOM-LISP") (save-core "lisp$(EXEEXT)")' \ + | ./prelisp$(EXEEXT) $(INSTALL_PROGRAM) lisp$(EXEEXT) $(OUT) $(STAMP) $@ --------- Would you like me to commit this to wh-sandbox? Regards, Bill Page. _______________________________________________ Axiom-developer mailing list Axiom-developer@nongnu.org http://lists.nongnu.org/mailman/listinfo/axiom-developer