1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150
|
--- ./lsp/Makefile.pamphlet.~1.5.~ 2005-09-05 18:50:31.000000000 +0000
+++ ./lsp/Makefile.pamphlet 2005-09-20 21:20:10.000000000 +0000
@@ -1012,14 +1012,7 @@
@echo 1 building ${LSP} ${GCLVERSION}
gcldir:
- @echo 2 building ${GCLVERSION}
- @tar -zxf ${ZIPS}/${GCLVERSION}.tgz
-<<gcl-2.6.7.socket.patch>>
-<<gcl-2.6.7.libspad.patch>>
-<<gcl-2.6.7.toploop.patch>>
-<<gcl-2.6.7.tail-recursive.patch>>
-<<gcl-2.6.7.collectfn.fix>>
-<<gclConfigureMake>>
+ echo '(compiler::link nil "${OUT}/lisp" (format nil "(progn (let ((*load-path* (cons ~S *load-path*))(si::*load-types* ~S)) (compiler::emit-fn t))(when (fboundp (quote si::sgc-on)) (si::sgc-on t))(setq compiler::*default-system-p* t))" si::*system-directory* (quote (list ".lsp"))) "${OBJ}/${SYS}/lib/cfuns-c.o ${OBJ}/${SYS}/lib/sockio-c.o ${OBJ}/${SYS}/lib/libspad.a")' | gcl
@echo 13 finished system build on `date` | tee >gcldir
ccldir: ${LSP}/ccl/Makefile
--- ./src/algebra/Lattice.pamphlet.orig 2005-01-04 23:45:59.000000000 +0000
+++ ./src/algebra/Lattice.pamphlet 2005-02-14 18:45:10.000000000 +0000
@@ -39620,13 +39620,14 @@
@ cp -p ${SRC}/doc/gloss.text ${LIB}
@ cp -p ${SRC}/doc/topics.data ${MID}
@ echo rebuilding daase files
- @ (cd ${MID} ; \
- echo ')set out le 200' >/tmp/tmp.input ; \
- echo ')fin' >>/tmp/tmp.input ; \
- echo '(make-databases "" (QUOTE ("unix")))' >>/tmp/tmp.input ; \
- echo '(bye)' >>/tmp/tmp.input ; \
- cat /tmp/tmp.input | ${INTERPSYS} ; \
- rm -f /tmp/tmp.input )
+# @ (cd ${MID} ; \
+# echo ')set out le 200' >/tmp/tmp.input ; \
+# echo ')fin' >>/tmp/tmp.input ; \
+# echo '(make-databases "" (QUOTE ("unix")))' >>/tmp/tmp.input ; \
+# echo '(bye)' >>/tmp/tmp.input ; \
+# cat /tmp/tmp.input | ${INTERPSYS} ; \
+# rm -f /tmp/tmp.input )
+ @ (cp ${SRC}/../debian/*.daase ${MID})
@ echo If all went well, go-ahead Mike and do a db-install as well !
db-install:
@@ -39758,7 +39759,8 @@
@ echo rebuilding databases...
@ cp ${SRC}/doc/gloss.text ${MID}
@ cp ${SRC}/doc/topics.data ${MID}
- @ (cd ${MID} ; echo ')lisp (make-databases "" nil)' | ${INTERPSYS} )
+# @ (cd ${MID} ; echo ')lisp (make-databases "" nil)' | ${INTERPSYS} )
+ @ (cp ${SRC}/../debian/*.daase ${MID})
check:
@ echo Checking that INTERP.EXPOSED and NRLIBs are consistent
--- ./src/etc/Makefile.pamphlet.orig 2005-01-30 12:03:12.000000000 +0000
+++ ./src/etc/Makefile.pamphlet 2005-02-14 18:47:16.000000000 +0000
@@ -33,9 +33,10 @@
@ cp ${SRC}/doc/gloss.text ${INT}/algebra
@ cp ${SRC}/doc/topics.data ${INT}/algebra
@ cp ${SRC}/doc/topics.data ${INT}/algebra
- @ (cd ${INT}/algebra ; \
- echo ')lisp (make-databases "" nil)' | ${INTERPSYS} )
- @ cp ${INT}/algebra/*.daase ${MNT}/${SYS}/algebra
+# @ (cd ${INT}/algebra ; \
+# echo ')lisp (make-databases "" nil)' | ${INTERPSYS} )
+# @ cp ${INT}/algebra/*.daase ${MNT}/${SYS}/algebra
+ @ (cp ${SRC}/../debian/*.daase ${MNT}/${SYS}/algebra)
@
\section{summary}
--- ./src/boot/Makefile.pamphlet.orig 2005-06-05 03:23:35.000000000 +0000
+++ ./src/boot/Makefile.pamphlet 2005-09-20 21:36:15.000000000 +0000
@@ -1173,7 +1173,8 @@
Until this is fixed we need to continue to use the old scheme.
<<environment>>=
-CMD0= (progn (mapcar (function (lambda (x) (load x))) (quote (${OBJS1}))) (system::save-system "${SAVESYS}"))
+#CMD0= (progn (mapcar (function (lambda (x) (load x))) (quote (${OBJS1}))) (system::save-system "${SAVESYS}"))
+CMD0= (compiler::link (quote (${OBJS1})) "${SAVESYS}" (format nil "(let ((*load-path* (cons ~S *load-path*))(si::*load-types* ~S)) (compiler::emit-fn t)) (when (fboundp (quote si::sgc-on)) (si::sgc-on t)) (setq compiler::*default-system-p* t)" si::*system-directory* (quote (list ".lsp"))))
@
\subsection{boothdr.lisp \cite{1}}
--- ./src/interp/Makefile.pamphlet.orig 2005-09-20 21:48:56.000000000 +0000
+++ ./src/interp/Makefile.pamphlet 2005-09-20 21:49:14.000000000 +0000
@@ -576,7 +576,28 @@
\begin{verbatim}
<<save depsys image>>=
@ (cd ${MNT}/${SYS}/bin ; \
- echo '(progn (load "${OUT}/makedep.lisp") (spad-save "${DEPSYS}"))' | ${LISPSYS})
+ echo '(progn \
+ (setq si::*collect-binary-modules* t) \
+ (load "${OUT}/makedep.lisp") \
+ (compiler::link \
+ (remove-duplicates si::*binary-modules* :test (quote equal)) \
+ "$(DEPSYS)" \
+ (format nil "\
+ (setq si::*collect-binary-modules* t) \
+ (let ((si::*load-path* (cons ~S si::*load-path*))\
+ (si::*load-types* ~S))\
+ (compiler::emit-fn t))\
+ (load \"$(OUT)/makedep.lisp\")\
+ (gbc t)\
+ (when si::*binary-modules* \
+ (error si::*binary-modules*))\
+ (setq si::collect-binary-modules* nil si::*binary-modules* nil)\
+ (gbc t)\
+ (when (fboundp (quote si::sgc-on)) (si::sgc-on t))\
+ (setq compiler::*default-system-p* t)\
+ " si::*system-directory* (quote (list ".lsp")))\
+ "" \
+ nil))' | ${LISPSYS})
@
\end{verbatim}
@@ -880,8 +901,36 @@
@ echo '#+:akcl (setq compiler::*suppress-compiler-notes* t)' >> ${OUT}/makeint.lisp
@ echo '#+:akcl (si::gbc-time 0)' >> ${OUT}/makeint.lisp
@ echo '#+:akcl (setq si::*system-directory* "${SPAD}/bin/")' >> ${OUT}/makeint.lisp
+# @ (cd ${OBJ}/${SYS}/bin ; \
+# echo '(progn (gbc t) (load "${OUT}/makeint.lisp") (gbc t) (user::spad-save "${SAVESYS}"))' | ${LISPSYS} )
@ (cd ${OBJ}/${SYS}/bin ; \
- echo '(progn (gbc t) (load "${OUT}/makeint.lisp") (gbc t) (user::spad-save "${SAVESYS}"))' | ${LISPSYS} )
+ echo '(progn \
+ (setq si::*collect-binary-modules* t)\
+ (setq x si::*system-directory*)\
+ (load "${OUT}/makeint.lisp")\
+ (setq si::*system-directory* x)\
+ (unintern (quote x))\
+ (compiler::link \
+ (remove-duplicates si::*binary-modules* :test (quote equal))\
+ "$(SAVESYS)" \
+ (format nil "\
+ (let ((si::*load-path* (cons ~S si::*load-path*))\
+ (si::*load-types* ~S))\
+ (compiler::emit-fn t))\
+ (setq si::*collect-binary-modules* t)\
+ (setq x si::*system-directory*)\
+ (load \"$(OUT)/makeint.lisp\")\
+ (setq si::*system-directory* x)\
+ (unintern (quote x))\
+ (when si::*binary-modules* \
+ (error si::*binary-modules*))\
+ (setq si::collect-binary-modules* nil si::*binary-modules* nil)\
+ (gbc t)\
+ (when (fboundp (quote si::sgc-on)) (si::sgc-on t))\
+ (setq compiler::*default-system-p* t)\
+ " si::*system-directory* (quote (list ".lsp")))\
+ "$(OBJ)/$(SYS)/lib/sockio-c.o $(OBJ)/$(SYS)/lib/cfuns-c.o $(OBJ)/$(SYS)/lib/libspad.a" \
+ nil))' | $(LISPSYS))
@ echo 6 ${SAVESYS} created
@ cp ${SAVESYS} ${AXIOMSYS}
@ echo 6a ${AXIOMSYS} created
|