[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Axiom-developer] FreeBSD patches
|
From: |
Mark Murray |
|
Subject: |
[Axiom-developer] FreeBSD patches |
|
Date: |
Fri, 29 Oct 2004 18:48:20 +0100 |
root writes:
> ok, clearly i've missed a patch. sorry about that. do you happen to
> have the email that contained the patches you're expecting? i'll look
> to merging them this weekend if i can.
Hi
This set of patches does quite a bit. It has Makefile.MACOSX and
Makefile.freebsd enhancements. It also has some path changes to things
like tangle(1), which in FreeBSD's case is preinstalled by the ports
system. FreeBSD also uses a preinstalled GCL. Some of this will no
doubt not be of universal appeal, and I'm happy to keep them as local
diffs.
I have attempted to clean up the MACOSX stuff a bit. Lots of your
changes that were marked as MACOSX requirements are actually
BSD/POSIX, and I've tried to make the changes as universal as
possible. I don't have a MACOSX box, but I've done my best to
make the changes sane.
Note that MACOS/BSD/POSIX do not have an malloc.h include. It is
an error to assume that the kernel malloc.h in sys/ is a substitute.
It bst this achieves nothing, and at worst it will pollute your
namespace with erronious malloc()/free() prototypes. MACOS/BSD/POSIX
get their malloc() definition from stdlib.h.
I haven't looked too hard at the headers, but I have seen that the
order that some of them are included in is rather strange. For
example, it makes little sense to #include <sys/types.h> after other
standard headers, because those headers often depend on <sys/types.h>.
You can often get away with it, but it can be dodgy.
The Axiom library code gets intalled in a place that is way off the
usual ${PATH}, so I've modified the install to create an "axiom"
script in ${PREFIX}/bin, where ${PREFIX} is usually /usr/local, but
can be reset to anything the sysadmin wants. I've also created an
"AXIOMsys" script in ${PREFIX}/bin that launches the binary of the
same name without having to get the user to set all sorts of
environment variables. This makes TeXmacs work in Axiom mode with
no extra work.
I've fixed some warnings, and I've tried to fix "make clean" so that
it removes more generated files, mainly "Makefile" and "Makefile.dvi".
Much of the clever stuff to make the external GCL work is done by
Camm, so if there are lisp-related questions, please ask him.
My offer of a FreeBSD box to test this stuff on still stands.
Thanks!
M
Index: Makefile
===================================================================
RCS file: /cvsroot/axiom/axiom/Makefile,v
retrieving revision 1.12
diff -u -d -r1.12 Makefile
--- Makefile 22 Aug 2004 09:19:32 -0000 1.12
+++ Makefile 29 Oct 2004 13:46:12 -0000
@@ -9,7 +9,8 @@
#GCLVERSION=gcl-2.6.2
#GCLVERSION=gcl-2.6.2a
#GCLVERSION=gcl-2.6.3
-GCLVERSION=gcl-2.6.5
+#GCLVERSION=gcl-2.6.5
+GCLVERSION=gcl-system
AWK=gawk
GCLDIR=${LSP}/${GCLVERSION}
SRC=${SPD}/src
@@ -22,8 +23,9 @@
INC=${SPD}/src/include
CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
INSTALL=/usr/local/axiom
-COMMAND=${INSTALL}/mnt/${SYS}/bin/axiom
-TANGLE=${SPADBIN}/lib/notangle
+COMMAND=${PREFIX}/bin/axiom
+COMMAND1=${PREFIX}/bin/AXIOMsys
+TANGLE=notangle
NOISE="-o ${TMP}/trace"
@@ -71,6 +73,7 @@
@mkdir -p ${OBJ}/noweb
@mkdir -p ${TMP}
@mkdir -p ${MNT}/${SYS}/bin/lib
+ifneq "${SYS}" "freebsd"
@( cd ${OBJ}/noweb ; \
tar -zxf ${ZIPS}/noweb-2.10a.tgz ; \
cd ${OBJ}/noweb/src ; \
@@ -82,6 +85,7 @@
${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \
MAN=${MNT}/${SYS}/bin/man \
TEXINPUTS=${MNT}/${SYS}/bin/tex all install >${TMP}/trace )
+endif
@echo The file marks the fact that noweb has been made > noweb
nowebclean:
@@ -98,9 +102,24 @@
@echo 78 installing Axiom in ${INSTALL}
@mkdir -p ${INSTALL}
@cp -pr ${MNT} ${INSTALL}
- @echo AXIOM=${INSTALL}/mnt/${SYS} >${COMMAND}
+ @echo '#!/bin/sh -' >${COMMAND}
+ @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND}
+ @echo export AXIOM >>${COMMAND}
+ @echo DAASE='$${AXIOM}' >>${COMMAND}
+ @echo export DAASE >>${COMMAND}
+ @echo PATH='$${PATH}':'$${AXIOM}/bin' >>${COMMAND}
+ @echo export PATH >>${COMMAND}
@cat ${SRC}/etc/axiom >>${COMMAND}
@chmod +x ${COMMAND}
+ @echo '#!/bin/sh -' >${COMMAND1}
+ @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND1}
+ @echo export AXIOM >>${COMMAND1}
+ @echo DAASE='$${AXIOM}' >>${COMMAND1}
+ @echo export DAASE >>${COMMAND1}
+ @echo PATH='$${PATH}':'$${AXIOM}/bin' >>${COMMAND1}
+ @echo export PATH >>${COMMAND1}
+ @echo '$${AXIOM}/bin/AXIOMsys' '$$@' >>${COMMAND1}
+ @chmod +x ${COMMAND1}
@echo 79 Axiom installation finished.
@echo
@echo Please add $(shell dirname ${COMMAND}) to your PATH variable
@@ -123,5 +142,5 @@
@ ${ENV} $(MAKE) -f Makefile.${SYS} clean
@ rm -f noweb
@ rm -f *~
- @echo 9 finished system build on `date` | tee >lastBuildDate
+ @ rm -f Makefile.${SYS}
Index: Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/Makefile.pamphlet,v
retrieving revision 1.27
diff -u -d -r1.27 Makefile.pamphlet
--- Makefile.pamphlet 27 Oct 2004 01:10:41 -0000 1.27
+++ Makefile.pamphlet 29 Oct 2004 13:46:16 -0000
@@ -50,7 +50,7 @@
@ ${ENV} $(MAKE) -f Makefile.${SYS} clean
@ rm -f noweb
@ rm -f *~
- @echo 9 finished system build on `date` | tee >lastBuildDate
+ @ rm -f Makefile.${SYS}
@
@@ -185,8 +185,9 @@
INC=${SPD}/src/include
CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
INSTALL=/usr/local/axiom
-COMMAND=${INSTALL}/mnt/${SYS}/bin/axiom
-TANGLE=${SPADBIN}/lib/notangle
+COMMAND=${PREFIX}/bin/axiom
+COMMAND1=${PREFIX}/bin/AXIOMsys
+TANGLE=notangle
NOISE="-o ${TMP}/trace"
@@ -268,6 +269,7 @@
@mkdir -p ${OBJ}/noweb
@mkdir -p ${TMP}
@mkdir -p ${MNT}/${SYS}/bin/lib
+ifneq "${SYS}" "freebsd"
@( cd ${OBJ}/noweb ; \
tar -zxf ${ZIPS}/noweb-2.10a.tgz ; \
cd ${OBJ}/noweb/src ; \
@@ -279,6 +281,7 @@
${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \
MAN=${MNT}/${SYS}/bin/man \
TEXINPUTS=${MNT}/${SYS}/bin/tex all install >${TMP}/trace )
+endif
@echo The file marks the fact that noweb has been made > noweb
nowebclean:
@@ -337,6 +340,9 @@
libspadclean:
@echo 17 cleaning ${OBJ}/${SYS}/lib
@rm -rf ${OBJ}/${SYS}/lib
+ @( cd src ; ${SPADBIN}/document ${NOISE} Makefile )
+ @( cd src ; ${ENV} ${MAKE} clean )
+ @rm -f ${SPD}/src/Makefile ${SPD}/src/Makefile.dvi
@
@@ -398,6 +404,7 @@
@rm -rf ${INT}/ccl
@rm -rf ${OBJ}/${SYS}/ccl
@rm -rf ${LSP}/gcldir
+ @rm -f ${LSP}/Makefile ${LSP}/Makefile.dvi
@
\subsection{install}
@@ -406,9 +413,24 @@
@echo 78 installing Axiom in ${INSTALL}
@mkdir -p ${INSTALL}
@cp -pr ${MNT} ${INSTALL}
- @echo AXIOM=${INSTALL}/mnt/${SYS} >${COMMAND}
+ @echo '#!/bin/sh -' >${COMMAND}
+ @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND}
+ @echo export AXIOM >>${COMMAND}
+ @echo DAASE='$${AXIOM}' >>${COMMAND}
+ @echo export DAASE >>${COMMAND}
+ @echo PATH='$${PATH}':'$${AXIOM}/bin' >>${COMMAND}
+ @echo export PATH >>${COMMAND}
@cat ${SRC}/etc/axiom >>${COMMAND}
@chmod +x ${COMMAND}
+ @echo '#!/bin/sh -' >${COMMAND1}
+ @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND1}
+ @echo export AXIOM >>${COMMAND1}
+ @echo DAASE='$${AXIOM}' >>${COMMAND1}
+ @echo export DAASE >>${COMMAND1}
+ @echo PATH='$${PATH}':'$${AXIOM}/bin' >>${COMMAND1}
+ @echo export PATH >>${COMMAND1}
+ @echo '$${AXIOM}/bin/AXIOMsys' '$$@' >>${COMMAND1}
+ @chmod +x ${COMMAND1}
@echo 79 Axiom installation finished.
@echo
@echo Please add $(shell dirname ${COMMAND}) to your PATH variable
@@ -550,6 +572,11 @@
optimizations for function calling in Axiom. This is handled automatically
by changing this variable.
+If GCLVERSION is ``gcl-system'', then no GCL is not built locally,
+and it is assumed that the ``gcl'' command is available off the
+path. If this GCL is unsuitable for building Axiom, then very bad
+things will happen.
+
NOTE WELL: IF YOU CHANGE THIS YOU SHOULD ERASE THE lsp/Makefile FILE.
This will cause the build to remake the lsp/Makefile from the
lsp/Makefile.pamphlet file and get the correct version. If you
@@ -563,7 +590,8 @@
#GCLVERSION=gcl-2.6.2
#GCLVERSION=gcl-2.6.2a
#GCLVERSION=gcl-2.6.3
-GCLVERSION=gcl-2.6.5
+#GCLVERSION=gcl-2.6.5
+GCLVERSION=gcl-system
@
\subsection{Makefile.axposf1v3}
@@ -859,6 +887,60 @@
<<clean>>
@
+\subsection{Makefile.freebsd}
+On FreeBSD the POSIX [[SIGCHLD]] signal is used in preference to
+the SYSV [[SIGCLD]].
+
+Annoyingly enough it seems that GCL uses a default extension of
+.lsp rather than .lisp so we add the {\bf LISP} variable here. We
+need to depend on the default extension behavior because the system
+build will load either the interpreted or compiled form of a file
+depending on which is available. This varies at different stages
+of the build.
+
+Also FreeBSD does not include gawk or nawk by default so we change
+the [[AWK]] variable to use [[awk]].
+<<Makefile.freebsd>>=
+# System dependent Makefile for the freebsd platform
+# Platform variable
+PLF:=FREEBSDplatform
+# C compiler flags
+CCF:="-O -pipe -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}
-I/usr/X11R6/include -I/usr/local/include"
+# Loader flags
+LDF:="-L/usr/X11R6/lib -L/usr/local/lib"
+# C compiler to use
+CC:=gcc
+AWK=awk
+RANLIB=ranlib
+TOUCH=touch
+TAR=tar
+AXIOMXLROOT=${AXIOM}/compiler
+O=o
+BYE=bye
+LISP=lsp
+DAASE=${SRC}/share
+# where the libXpm.a library lives
+XLIB=/usr/X11R6/lib
+
+ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
+ TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
+ LISP=${LISP} DAASE=${DAASE} XLIB=${XLIB} TANGLE=${TANGLE}
+
+all: rootdirs srcsetup lspdir srcdir
+ @echo 45 Makefile.freebsd called
+ @echo 46 Environment : ${ENV}
+ @echo 47 finished system build on `date` | tee >lastBuildDate
+
+<<rootdirs>>
+<<noweb>>
+<<literate commands>>
+<<srcsetup>>
+<<src>>
+<<lsp>>
+<<document>>
+<<clean>>
+
+@
\subsection{Makefile.linux}
Annoyingly enough it seems that GCL uses a default extension of .lsp
rather than .lisp so we add the {\bf LISP} variable here. We need to
@@ -1333,24 +1415,24 @@
@
\subsection{Makefile.MACOSX}
-On the MAC OSX someone decided (probably a BSDism) to rename the
-[[SIGCLD]] signal to [[SIGCHLD]]. In order to handle this in the
-low level C socket code (in particular, in [[src/lib/fnct_key.c]])
-we change the platform variable to be [[MACOSXplatform]] and create
-this new stanza.
+On MAC OSX the POSIX [[SIGCHLD]] signal is used in preference to
+the SYSV [[SIGCLD]].
-Also it appears that the MAC OSX does not include gawk or nawk by
-default so we change the [[AWK]] variable to use [[awk]].
+Annoyingly enough it seems that GCL uses a default extension of
+.lsp rather than .lisp so we add the {\bf LISP} variable here. We
+need to depend on the default extension behavior because the system
+build will load either the interpreted or compiled form of a file
+depending on which is available. This varies at different stages
+of the build.
-We need to add [[-I/usr/include/sys]] because [[malloc.h]] has been
-moved on this platform.
+Also it appears that MAC OSX does not include gawk or nawk by default
+so we change the [[AWK]] variable to use [[awk]].
<<Makefile.MACOSX>>=
# System dependent Makefile for the MAC OSX platform
# Platform variable
PLF:=MACOSXplatform
# C compiler flags
-CCF:="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include
\
- -I/usr/include/sys"
+CCF:="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include"
#CCF:=-g -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include
# Loader flags
LDF:= -L/usr/X11R6/lib
@@ -1395,7 +1477,5 @@
Bath BA2 5QR UK Tel. +44-1225-837430
{\bf http://www.codemist.co.uk}
\bibitem{4} \$SPAD/zips/noweb-2.10a.tgz, the noweb source tree
-\bibitem{5} \$SPAD/zips/advi-1.2.0.tar.gz, the advi source tree
\end{thebibliography}
\end{document}
-
Index: lsp/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/lsp/Makefile.pamphlet,v
retrieving revision 1.11
diff -u -d -r1.11 Makefile.pamphlet
--- lsp/Makefile.pamphlet 15 Oct 2004 23:58:22 -0000 1.11
+++ lsp/Makefile.pamphlet 29 Oct 2004 13:46:22 -0000
@@ -830,6 +830,39 @@
echo 20 applying toploop patch to unixport/init_gcl.lsp ; \
patch <${SPD}/zips/${GCLVERSION}.unixport.init_gcl.lsp.patch )
@
+\subsection{GCL already installed}
+<<gcl-system>>=
+# locally installed GCL
+OUT=${OBJ}/${SYS}/bin
+
+all:
+ @echo 21 building ${LSP} ${GCLVERSION}
+
+gcldir:
+ @echo 22 building for ${GCLVERSION}
+ 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 23 finished gcl build on `date` | tee >gcldir
+
+ccldir: ${LSP}/ccl/Makefile
+ @echo 21 building CCL
+ @mkdir -p ${INT}/ccl
+ @mkdir -p ${OBJ}/${SYS}/ccl
+ @( cd ccl ; ${ENV} ${MAKE} )
+
+${LSP}/ccl/Makefile: ${LSP}/ccl/Makefile.pamphlet
+ @echo 22 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
+ @( cd ccl ; ${SPADBIN}/document ${NOISE} Makefile )
+
+document:
+ @echo 23 making docs in ${LSP}
+ @mkdir -p ${INT}/doc/lsp/ccl
+ @( cd ccl ; ${ENV} ${MAKE} document )
+
+clean:
+ @echo 24 cleaning ${LSP}/ccl
+ @( cd ccl ; ${ENV} ${MAKE} clean )
+@
+\eject
<<*>>=
# gcl version 2.4.1
OUT=${OBJ}/${SYS}/bin
Index: src/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/Makefile.pamphlet,v
retrieving revision 1.11
diff -u -d -r1.11 Makefile.pamphlet
--- src/Makefile.pamphlet 15 Jul 2004 03:45:11 -0000 1.11
+++ src/Makefile.pamphlet 29 Oct 2004 13:46:26 -0000
@@ -24,10 +24,15 @@
<<environment>>=
SETUP=scriptsdir libdir
-DIRS=bootdir interpdir sharedir algebradir inputdir etcdir clefdir docdir \
- graphdir
+DIRSINITIAL=bootdir interpdir sharedir algebradir
+DIRSCOMPLETE=${DIRSINITIAL} inputdir etcdir clefdir docdir graphdir
+ifeq ($(PASS1),)
+DIRS=${DIRSCOMPLETE}
+else
+DIRS=${DIRSINITIAL}
+endif
DOCS=scriptsdocument libdocument ${DIRS:dir=document}
-CLNS=scriptsclean libclean ${DIRS:dir=clean}
+CLNS=scriptsclean libclean ${DIRSCOMPLETE:dir=clean}
@
\subsection{The scripts directory}
@@ -55,6 +60,7 @@
scriptsclean: ${SRC}/scripts/Makefile
@echo 4 cleaning ${SRC}/scripts
@( cd scripts ; ${ENV} ${MAKE} clean )
+ @rm -f ${SRC}/scripts/Makefile ${SRC}/scripts/Makefile.dvi
@
@@ -79,6 +85,7 @@
clefclean: ${SRC}/clef/Makefile
@echo 8 cleaning ${SRC}/clef
@( cd clef ; ${ENV} ${MAKE} clean )
+ @ rm -f ${SRC}/clef/Makefile ${SRC}/clef/Makefile.dvi
@
@@ -105,6 +112,7 @@
shareclean: ${SRC}/share/Makefile
@echo 12 cleaning ${SRC}/share
@( cd share ; ${ENV} ${MAKE} clean )
+ @rm -f ${SRC}/share/Makefile ${SRC}/share/Makefile.dvi
@
@@ -163,6 +171,7 @@
@echo 20 cleaning ${SRC}/lib
@( cd lib ; ${ENV} ${MAKE} clean )
@rm -rf ${OBJ}/${SYS}/lib
+ @rm -f ${SRC}/input/Makefile ${SRC}/input/Makefile.dvi
@
\subsection{The boot directory}
@@ -196,6 +205,7 @@
@echo 24 cleaning ${SRC}/boot
@( cd boot ; ${ENV} ${MAKE} clean )
@rm -rf ${OBJ}/${SYS}/boot
+ @rm -f ${SRC}/boot/Makefile ${SRC}/boot/Makefile.dvi
@
\subsection{The interp directory}
@@ -229,6 +239,7 @@
@echo 28 cleaning ${SRC}/interp
@( cd interp ; ${ENV} ${MAKE} clean )
@rm -rf ${OBJ}/${SYS}/interp
+ @rm -f ${SRC}/interp/Makefile ${SRC}/interp/Makefile.dvi
@
\subsection{The algebra directory}
@@ -268,7 +279,7 @@
@echo 32 cleaning ${SRC}/algebra
@( cd algebra ; ${ENV} ${MAKE} clean )
@rm -rf ${OBJ}/${SYS}/algebra
-
+ @rm -f ${SRC}/algebra/Makefile ${SRC}/algebra/Makefile.dvi
@
\subsection{The input directory}
The input directory contains code used for examples, regression
@@ -306,6 +317,7 @@
@echo 36 cleaning ${SRC}/input
@( cd input ; ${ENV} ${MAKE} clean )
@rm -rf ${OBJ}/${SYS}/input
+ @rm -f ${SRC}/input/Makefile ${SRC}/input/Makefile.dvi
@
\subsection{The etc directory}
@@ -335,6 +347,7 @@
@echo 40 cleaning ${SRC}/etc
@( cd etc ; ${ENV} ${MAKE} clean )
@rm -rf ${OBJ}/${SYS}/etc
+ @rm -f ${SRC}/etc/Makefile ${SRC}/etc/Makefile.dvi
@
\subsection{The doc directory}
@@ -360,6 +373,7 @@
@echo 44 cleaning ${SRC}/doc
@( cd doc ; ${ENV} ${MAKE} clean )
@rm -rf ${OBJ}/${SYS}/doc
+ @rm -f ${SRC}/doc/Makefile ${SRC}/doc/Makefile.dvi
@
\subsection{The graph directory}
@@ -385,6 +399,7 @@
@rm -rf ${INT}/graph
@rm -rf ${OBJ}/${SYS}/graph
@rm -rf ${MNT}/${SYS}/graph
+ @rm -f ${SRC}/graph/Makefile ${SRC}/graph/Makefile.dvi
@
\section{The Makefile}
@@ -422,7 +437,7 @@
@echo 50 making docs in ${SRC}
clean: ${CLNS}
- @echo 51 cleaning ${SRC}
+ @echo 51 cleaning ${SRC} ${CLNS}
@
\eject
Index: src/algebra/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/algebra/Makefile.pamphlet,v
retrieving revision 1.10
diff -u -d -r1.10 Makefile.pamphlet
--- src/algebra/Makefile.pamphlet 3 Jul 2004 19:06:29 -0000 1.10
+++ src/algebra/Makefile.pamphlet 29 Oct 2004 13:49:24 -0000
@@ -40940,6 +40940,8 @@
<<axiom.sty (OUT from IN)>>
+clean:
+
@
\eject
\begin{thebibliography}{99}
Index: src/booklets/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/booklets/Makefile.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 Makefile.pamphlet
--- src/booklets/Makefile.pamphlet 28 Aug 2003 12:15:28 -0000 1.1
+++ src/booklets/Makefile.pamphlet 29 Oct 2004 13:49:26 -0000
@@ -19,6 +19,7 @@
clean:
@echo 2 cleaning ${INT}/docs/src/booklets
@rm -rf ${INT}/docs/src/booklets
+ @rm -f Makefile Makefile.dvi
@
\eject
\begin{thebibliography}{99}
Index: src/booklets/Sorting.booklet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/booklets/Sorting.booklet,v
retrieving revision 1.1
diff -u -d -r1.1 Sorting.booklet
--- src/booklets/Sorting.booklet 28 Aug 2003 12:15:28 -0000 1.1
+++ src/booklets/Sorting.booklet 29 Oct 2004 13:49:40 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{/home/axiomgnu/new/mnt/linux/bin/tex/noweb}
+\usepackage{noweb}
\begin{document}
\title{Sorting Facilities}
\author{Timothy Daly}
Index: src/boot/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/boot/Makefile.pamphlet,v
retrieving revision 1.6
diff -u -d -r1.6 Makefile.pamphlet
--- src/boot/Makefile.pamphlet 27 Jun 2004 15:00:58 -0000 1.6
+++ src/boot/Makefile.pamphlet 29 Oct 2004 13:49:47 -0000
@@ -1151,7 +1151,7 @@
expansion. Adding a single quote symbol will break this expansion.
<<environment>>=
-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}}
@@ -1615,6 +1615,7 @@
clean:
@echo 43 cleaning ${OUT}
@rm -f ${OUT}
+ @rm -f Makefile Makefile.dvi
@
\section{The Makefile}
Index: src/clef/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/clef/Makefile.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 Makefile.pamphlet
--- src/clef/Makefile.pamphlet 27 Jun 2004 15:00:58 -0000 1.3
+++ src/clef/Makefile.pamphlet 29 Oct 2004 13:49:47 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../mnt/linux/bin/axiom}
+\usepackage{axiom}
\begin{document}
\title{\$SPAD/src/clef Makefile}
\author{Timothy Daly}
@@ -57,6 +57,9 @@
@ ${CC} ${CLEFOBJS} -o ${OUT}/clef
<<edible>>
+
+clean:
+
@
\eject
\begin{thebibliography}{99}
Index: src/clef/edible.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/clef/edible.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 edible.c.pamphlet
--- src/clef/edible.c.pamphlet 30 Jul 2004 16:45:33 -0000 1.4
+++ src/clef/edible.c.pamphlet 29 Oct 2004 13:49:50 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../mnt/linux/bin/axiom}
+\usepackage{axiom}
\begin{document}
\title{\$SPAD/src/clef edible.c}
\author{The Axiom Team}
Index: src/doc/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/doc/Makefile.pamphlet,v
retrieving revision 1.7
diff -u -d -r1.7 Makefile.pamphlet
--- src/doc/Makefile.pamphlet 27 Jun 2004 15:00:59 -0000 1.7
+++ src/doc/Makefile.pamphlet 29 Oct 2004 13:49:50 -0000
@@ -105,6 +105,7 @@
clean:
@echo 4 cleaning ${SRC}/doc
+ @rm -f Makefile Makefile.dvi
@
\eject
\begin{thebibliography}{99}
Index: src/doc/axiom.bib.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/doc/axiom.bib.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 axiom.bib.pamphlet
--- src/doc/axiom.bib.pamphlet 28 Aug 2003 12:28:30 -0000 1.1
+++ src/doc/axiom.bib.pamphlet 29 Oct 2004 13:50:47 -0000
@@ -12231,7 +12231,7 @@
\subsection{Makefile}
<<Makefile>>=
@MISC{Makefile,
- path=./mnt/linux/bin/Makefile.pamphlet
+ path=./mnt/${SYS}/bin/Makefile.pamphlet
}
@
Index: src/etc/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/etc/Makefile.pamphlet,v
retrieving revision 1.6
diff -u -d -r1.6 Makefile.pamphlet
--- src/etc/Makefile.pamphlet 27 Jun 2004 15:00:59 -0000 1.6
+++ src/etc/Makefile.pamphlet 29 Oct 2004 13:50:49 -0000
@@ -91,6 +91,7 @@
@rm -rf ${MID}
@echo 4 cleaning ${DOC}
@rm -rf ${DOC}
+ @rm -f Makefile Makefile.dvi
@
\eject
Index: src/etc/axiom
===================================================================
RCS file: /cvsroot/axiom/axiom/src/etc/axiom,v
retrieving revision 1.3
diff -u -d -r1.3 axiom
--- src/etc/axiom 7 Feb 2004 03:24:24 -0000 1.3
+++ src/etc/axiom 29 Oct 2004 13:50:49 -0000
@@ -1,8 +1,10 @@
-export AXIOM
system=`uname -s`
case "$system" in
+ FreeBSD) clef -e $AXIOM/bin/AXIOMsys "$@"
+ ;;
+
Linux) clef -e $AXIOM/bin/AXIOMsys "$@"
;;
Index: src/graph/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/graph/Makefile.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 Makefile.pamphlet
--- src/graph/Makefile.pamphlet 27 Jun 2004 15:00:59 -0000 1.1
+++ src/graph/Makefile.pamphlet 29 Oct 2004 13:50:51 -0000
@@ -414,7 +414,7 @@
${DOC}/viewports:
@ echo 25 making ${DOC}/viewports from ${IN}/viewports
- @ cp -pr ${IN}/viewports ${DOC}
+ @ echo XXXXXX cp -pr ${IN}/viewports ${DOC}
<<viewmandir>>
<<Gdrawsdir>>
Index: src/graph/viewman/cleanup.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/graph/viewman/cleanup.c.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 cleanup.c.pamphlet
--- src/graph/viewman/cleanup.c.pamphlet 27 Jun 2004 15:01:22 -0000
1.1
+++ src/graph/viewman/cleanup.c.pamphlet 29 Oct 2004 13:50:53 -0000
@@ -53,7 +53,9 @@
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#if !defined(FREEBSDplatform) && !defined(MACOSXplatform)
#include <malloc.h>
+#endif
#include <assert.h>
#include <signal.h>
#include <sys/wait.h>
Index: src/graph/viewman/sselect.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/graph/viewman/sselect.c.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 sselect.c.pamphlet
--- src/graph/viewman/sselect.c.pamphlet 27 Jun 2004 15:01:24 -0000
1.1
+++ src/graph/viewman/sselect.c.pamphlet 29 Oct 2004 13:50:53 -0000
@@ -104,7 +104,11 @@
/* flush(spadSock); */
/* send_int(spadSock,1); acknowledge to spad */
checkClosedChild = no;
+#if defined(FREEBSDplatform) || defined(MACOSXplatform)
+ bsdSignal(SIGCHLD,endChild,DontRestartSystemCalls);
+#else
bsdSignal(SIGCLD,endChild,DontRestartSystemCalls);
+#endif
}
}
ret_val = select(n, (void *)rd, (void *)wr, (void *)ex, (void *)timeout);
Index: src/graph/viewman/viewman.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/graph/viewman/viewman.c.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 viewman.c.pamphlet
--- src/graph/viewman/viewman.c.pamphlet 27 Jun 2004 15:01:24 -0000
1.1
+++ src/graph/viewman/viewman.c.pamphlet 29 Oct 2004 13:50:55 -0000
@@ -116,7 +116,11 @@
int keepLooking,code;
bsdSignal(SIGPIPE,brokenPipe,DontRestartSystemCalls);
+#if defined(FREEBSDplatform) || defined(MACOSXplatform)
+ bsdSignal(SIGCHLD,endChild,RestartSystemCalls);
+#else
bsdSignal(SIGCLD,endChild,RestartSystemCalls);
+#endif
bsdSignal(SIGTERM,goodbye,DontRestartSystemCalls);
/* Connect up to AXIOM server */
Index: src/include/useproto.h
===================================================================
RCS file: /cvsroot/axiom/axiom/src/include/useproto.h,v
retrieving revision 1.3
diff -u -d -r1.3 useproto.h
--- src/include/useproto.h 27 Oct 2004 01:10:41 -0000 1.3
+++ src/include/useproto.h 29 Oct 2004 13:50:55 -0000
@@ -34,7 +34,7 @@
#ifndef _USEPROTO_H_
#define _USEPROTO_H_ 1
-#if defined(SGIplatform)||defined(LINUXplatform)||defined(HPplatform)
||defined(RIOSplatform) ||defined(RIOS4platform) || defined(SUN4OS5platform) ||
defined(MACOSXplatform)
+#if defined(SGIplatform) || defined(LINUXplatform) || defined(HPplatform) ||
defined(RIOSplatform) || defined(RIOS4platform) || defined(SUN4OS5platform) ||
defined(FREEBSDplatform) || defined(MACOSXplatform)
#ifdef _NO_PROTO
#undef _NO_PROTO
#endif
Index: src/input/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/input/Makefile.pamphlet,v
retrieving revision 1.10
diff -u -d -r1.10 Makefile.pamphlet
--- src/input/Makefile.pamphlet 15 Jul 2004 03:45:11 -0000 1.10
+++ src/input/Makefile.pamphlet 29 Oct 2004 13:51:28 -0000
@@ -6880,6 +6880,7 @@
@rm -rf ${MID}
@echo 7 cleaning ${OUT}
@rm -rf ${OUT}
+ @rm -f Makefile Makefile.dvi
<<algaggr>>
<<algbrbf>>
Index: src/interp/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/Makefile.pamphlet,v
retrieving revision 1.11
diff -u -d -r1.11 Makefile.pamphlet
--- src/interp/Makefile.pamphlet 27 Jun 2004 15:01:27 -0000 1.11
+++ src/interp/Makefile.pamphlet 29 Oct 2004 13:52:07 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../src/scripts/tex/axiom}
+\usepackage{axiom}
\begin{document}
\title{\$SPAD/src/interp Makefile}
\author{Timothy Daly}
@@ -616,8 +616,29 @@
@ echo '(load "${OUT}/c-util")' >> ${OUT}/makedep.lisp
@ echo '(unless (probe-file "${OUT}/g-util.${O}") (compile-file
"${OUT}/g-util.${LISP}" :output-file "${OUT}/g-util.${O}"))' >>
${OUT}/makedep.lisp
@ echo '(load "${OUT}/g-util")' >> ${OUT}/makedep.lisp
- @ (cd ${MNT}/${SYS}/bin ; \
- echo '(progn (load "${OUT}/makedep.lisp") (spad-save "${DEPSYS}"))'
| ${LISPSYS})
+ @ (cd ${OBJ}/${SYS}/bin ; \
+ 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))
@ echo 4 ${DEPSYS} created
@
@@ -670,7 +691,33 @@
@ 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} )
+ 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
@@ -6262,6 +6309,7 @@
<<Makefile.dvi (DOC from IN)>>=
${DOC}/Makefile.dvi: ${IN}/Makefile.pamphlet ${DOC}/axiom.sty
@echo 613 making ${DOC}/Makefile.dvi from ${IN}/Makefile.pamphlet
+ @touch ${IN}/Makefile.dvi
@cp ${IN}/Makefile.dvi ${DOC}
@
@@ -7112,6 +7160,9 @@
<<document>>
<<axiom.sty (OUT from IN)>>
+
+clean:
+
@
pp
\eject
Index: src/interp/debugsys.lisp.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/debugsys.lisp.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 debugsys.lisp.pamphlet
--- src/interp/debugsys.lisp.pamphlet 24 May 2004 22:53:51 -0000 1.2
+++ src/interp/debugsys.lisp.pamphlet 29 Oct 2004 13:52:09 -0000
@@ -79,7 +79,7 @@
(thesymb "/int/interp/buildom.clisp")
(thesymb "/int/interp/cattable.clisp")
(thesymb "/int/interp/cformat.clisp")
- (thesymb "/obj/linux/interp/cfuns.o")
+ (thesymb "/obj/${SYS}/interp/cfuns.o")
(thesymb "/int/interp/clam.clisp")
(thesymb "/int/interp/clammed.clisp")
(thesymb "/int/interp/comp.lisp")
@@ -152,7 +152,7 @@
(thesymb "/int/interp/sfsfun.clisp")
(thesymb "/int/interp/simpbool.clisp")
(thesymb "/int/interp/slam.clisp")
- (thesymb "/obj/linux/interp/sockio.o")
+ (thesymb "/obj/${SYS}/interp/sockio.o")
(thesymb "/int/interp/spad.lisp")
(thesymb "/int/interp/spaderror.lisp")
(thesymb "/int/interp/template.clisp")
@@ -232,13 +232,13 @@
())
(list
(thesymb "/int/interp/ax.clisp"))
- "/mnt/linux"
+ "/mnt/${SYS}"
"/lsp"
"/src"
"/int"
"/obj"
"/mnt"
- "linux")
+ "${SYS}")
(in-package "SCRATCHPAD-COMPILER")
(boot::set-restart-hook)
(in-package "BOOT")
@@ -247,7 +247,7 @@
(load (user::thepath "/int/interp/obey.lsp"))
;(si::multiply-bignum-stack 10)
(si::gbc-time 0)
-(setq si::*system-directory* (user::thepath "/mnt/linux/bin/"))
+(setq si::*system-directory* (user::thepath "/mnt/${SYS}/bin/"))
(gbc t)
@
Index: src/interp/nlib.lisp.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/nlib.lisp.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 nlib.lisp.pamphlet
--- src/interp/nlib.lisp.pamphlet 24 May 2004 22:53:55 -0000 1.3
+++ src/interp/nlib.lisp.pamphlet 29 Oct 2004 13:52:12 -0000
@@ -295,7 +295,15 @@
(defun rpackfile (filespec)
(setq filespec (make-filename filespec))
(if (string= (pathname-type filespec) "NRLIB")
- (recompile-lib-file-if-necessary (concat (namestring filespec)
"/code.lsp"))
+ (let* ((base (pathname-name filespec))
+ (code (concatenate 'string (namestring filespec) "/code.lsp"))
+ (temp (concatenate 'string (namestring filespec) "/" base ".lsp"))
+ (o (make-pathname :type "o")))
+ (si::system (format nil "cp ~S ~S" code temp))
+ (recompile-lib-file-if-necessary temp)
+ (si::system (format nil "mv ~S ~S~%"
+ (namestring (merge-pathnames o temp))
+ (namestring (merge-pathnames o code)))))
;; only pack non libraries to avoid lucid file handling problems
(let* ((rstream (rdefiostream (list (cons 'file filespec) (cons 'mode
'input))))
(nstream nil)
Index: src/interp/util.lisp.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/util.lisp.pamphlet,v
retrieving revision 1.5
diff -u -d -r1.5 util.lisp.pamphlet
--- src/interp/util.lisp.pamphlet 24 May 2004 22:54:05 -0000 1.5
+++ src/interp/util.lisp.pamphlet 29 Oct 2004 13:52:20 -0000
@@ -77,6 +77,16 @@
; (compile-file collectfn))
; (load collectfn)
; (compiler::emit-fn t)
+;
+; (let ((collectfn (concatenate 'string si::*system-directory*
"../cmpnew/gcl_collectfn.lsp"))
+; (collectfn1 (concatenate 'string obj "/" sys "/interp/collectfn")))
+; (with-open-file (st collectfn :direction :input)
+; (with-open-file (st1 (concatenate 'string collectfn1 ".lsp") :direction
:output)
+; (si::copy-stream st st1)))
+; (unless (probe-file (concatenate 'string collectfn1 ".o"))
+; (compile-file collectfn1))
+; (load collectfn1)
+;
(mapcar
#'load
(directory (concatenate 'string obj "/" sys "/interp/*.fn")))
@@ -813,7 +823,7 @@
This function will do that. A correct call looks like:
\begin{verbatim}
(in-package "BOOT")
-(recompile-all-libs "/spad/mnt/linux/algebra")
+(recompile-all-libs "/spad/mnt/${SYS}/algebra")
\end{verbatim}
<<recompile-all-libs>>=
(defun recompile-all-libs (dir)
@@ -838,11 +848,11 @@
Note that it will build a pathname from the current {\bf AXIOM}
shell variable. So if the {\bf AXIOM} shell variable had the value
\begin{verbatim}
-/spad/mnt/linux
+/spad/mnt/${SYS}
\end{verbatim}
then the wildcard expands to
\begin{verbatim}
-/spad/mnt/linux/nalg/*.spad
+/spad/mnt/${SYS}/nalg/*.spad
\end{verbatim}
and all of the matching files would be recompiled.
<<recompile-all-algebra-files>>=
@@ -879,7 +889,7 @@
before compiling this file. A correct call looks like:
\begin{verbatim}
(in-package "BOOT")
-(reroot "/spad/mnt/linux")
+(reroot "/spad/mnt/${SYS}")
\end{verbatim}
<<reroot>>=
(defun reroot (dir)
Index: src/lib/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/Makefile.pamphlet,v
retrieving revision 1.8
diff -u -d -r1.8 Makefile.pamphlet
--- src/lib/Makefile.pamphlet 27 Jun 2004 15:01:39 -0000 1.8
+++ src/lib/Makefile.pamphlet 29 Oct 2004 13:52:23 -0000
@@ -490,10 +490,15 @@
clean:
@echo 70 cleaning ${IN}
@rm -rf ${MID} ${OUT} ${DOCINT} ${DOCMNT}
+ @rm -f Makefile Makefile.dvi
@
\subsection{Makefile documentation}
<<Makefile.dvi>>=
+${IN}/Makefile.dvi:
+ @echo 71a Bodging ${IN}/Makefile.dvi
+ @touch ${IN}/Makefile.dvi
+
${DOCMNT}/Makefile.dvi: ${IN}/Makefile.dvi
@echo 71 making ${DOCMNT}/Makefile.dvi from ${IN}/Makefile.dvi
@cp ${IN}/Makefile.dvi ${DOCMNT}/Makefile.dvi
Index: src/lib/XDither.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/XDither.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 XDither.c.pamphlet
--- src/lib/XDither.c.pamphlet 27 Jun 2004 15:01:41 -0000 1.4
+++ src/lib/XDither.c.pamphlet 29 Oct 2004 13:52:25 -0000
@@ -51,7 +51,9 @@
#include <stdio.h>
#include <stdlib.h>
+#if !defined(FREEBSDplatform) && !defined(MACOSXplatform)
#include <malloc.h>
+#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Index: src/lib/XShade.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/XShade.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 XShade.c.pamphlet
--- src/lib/XShade.c.pamphlet 27 Jun 2004 15:01:42 -0000 1.4
+++ src/lib/XShade.c.pamphlet 29 Oct 2004 13:52:25 -0000
@@ -50,8 +50,10 @@
#include "useproto.h"
#include <stdio.h>
-#include <malloc.h>
#include <stdlib.h>
+#if !defined(FREEBSDplatform) && !defined(MACOSXplatform)
+#include <malloc.h>
+#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Index: src/lib/bsdsignal.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/bsdsignal.c.pamphlet,v
retrieving revision 1.7
diff -u -d -r1.7 bsdsignal.c.pamphlet
--- src/lib/bsdsignal.c.pamphlet 27 Oct 2004 01:10:41 -0000 1.7
+++ src/lib/bsdsignal.c.pamphlet 29 Oct 2004 13:52:25 -0000
@@ -9,13 +9,6 @@
\eject
\tableofcontents
\eject
-\section{MAC OSX platform change}
-We needed to change [[SIGCLD]] to [[SIGCHLD]] for the [[MAC OSX]] platform
-and we need to create a new platform variable. This change is made to
-propogate that platform variable.
-<<mac osx platform change>>=
-#if defined(LINUXplatform) || defined (ALPHAplatform)|| defined(RIOSplatform)
|| defined(SUN4OS5platform) ||defined(SGIplatform) ||defined(HP10platform) ||
defined(MACOSXplatform)
-@
\section{License}
<<license>>=
/*
@@ -74,7 +67,7 @@
struct sigaction in,out;
in.sa_handler = action;
/* handler is reinstalled - calls are restarted if restartSystemCall */
-<<mac osx platform change>>
+#if defined(LINUXplatform) || defined (ALPHAplatform) || defined(RIOSplatform)
|| defined(SUN4OS5platform) || defined(SGIplatform) || defined(HP10platform) ||
defined(FREEBSDplatform) || defined(MACOSXplatform)
if(restartSystemCall) in.sa_flags = SA_RESTART;
else in.sa_flags = 0;
#elif defined(SUNplatform)
Index: src/lib/cfuns-c.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/cfuns-c.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 cfuns-c.c.pamphlet
--- src/lib/cfuns-c.c.pamphlet 27 Jun 2004 15:01:43 -0000 1.4
+++ src/lib/cfuns-c.c.pamphlet 29 Oct 2004 13:52:27 -0000
@@ -52,9 +52,11 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
#include <sys/types.h>
#include <sys/stat.h>
+#if !defined(FREEBSDplatform) && !defined(MACOSXplatform)
+#include <malloc.h>
+#endif
#include "cfuns-c.H1"
Index: src/lib/fnct_key.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/fnct_key.c.pamphlet,v
retrieving revision 1.5
diff -u -d -r1.5 fnct_key.c.pamphlet
--- src/lib/fnct_key.c.pamphlet 27 Oct 2004 01:10:41 -0000 1.5
+++ src/lib/fnct_key.c.pamphlet 29 Oct 2004 13:52:27 -0000
@@ -9,18 +9,6 @@
\eject
\tableofcontents
\eject
-\section{MAC OSX port}
-On the MAC OSX the signal [[SIGCLD]] has been renamed to [[SIGCHLD]].
-In order to handle this change we need to ensure that the platform
-variable is set properly and that the platform variable is changed
-everywhere.
-<<mac os signal rename>>=
-#if defined(MACOSXplatform)
- bsdSignal(SIGCHLD, null_fnct,RestartSystemCalls);
-#else
- bsdSignal(SIGCLD, null_fnct,RestartSystemCalls);
-#endif
-@
\section{License}
<<license>>=
/*
@@ -364,7 +352,11 @@
close(fd);
}
}
-<<mac os signal rename>>
+#if defined(FREEBSDplatform) || defined(MACOSXplatform)
+ bsdSignal(SIGCHLD, null_fnct, RestartSystemCalls);
+#else
+ bsdSignal(SIGCLD, null_fnct, RestartSystemCalls);
+#endif
switch (id = fork()) {
case -1:
perror("Special key");
Index: src/lib/openpty.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/openpty.c.pamphlet,v
retrieving revision 1.8
diff -u -d -r1.8 openpty.c.pamphlet
--- src/lib/openpty.c.pamphlet 27 Oct 2004 01:10:41 -0000 1.8
+++ src/lib/openpty.c.pamphlet 29 Oct 2004 13:52:29 -0000
@@ -9,16 +9,6 @@
\eject
\tableofcontents
\eject
-\section{MAC OSX platform changes}
-Since we have no other information we are adding the [[MACOSXplatform]]
variable
-to the list everywhere we find [[LINUXplatform]]. This may not be correct but
-we have no way to know yet.
-<<mac osx platform change 1>>=
-#if defined(SUN4OS5platform) ||defined(ALPHAplatform) || defined(HP10platform)
|| defined(LINUXplatform) || defined(MACOSXplatform)
-@
-<<mac osx platform change 2>>=
-#if defined(SUNplatform) || defined(HP9platform) || defined(LINUXplatform) ||
defined(MACOSXplatform)
-@
\section{License}
<<license>>=
/*
@@ -33,7 +23,7 @@
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
+ notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
@@ -102,7 +92,7 @@
#endif
{
-#if defined(SUNplatform) || defined (HP9platform) || defined(RTplatform)
||defined(AIX370platform)
+#if defined(SUNplatform) || defined (HP9platform) || defined(RTplatform) ||
defined(AIX370platform) || defined(FREEBSDplatform) || defined(MACOSXplatform)
int looking = 1, i;
int oflag = O_RDWR; /* flag for opening the pty */
@@ -145,7 +135,7 @@
return(fdm);
#endif
-<<mac osx platform change 1>>
+#if defined(SUN4OS5platform) || defined(ALPHAplatform) ||
defined(HP10platform) || defined(LINUXplatform) || defined(FREEBSDplatform) ||
defined(MACOSXplatform)
extern int grantpt(int);
extern int unlockpt(int);
extern char* ptsname(int);
@@ -214,7 +204,7 @@
sprintf(serv, "/dev/ttyp%02x", channelNo);
channelNo++;
#endif
-<<mac osx platform change 2>>
+#if defined(SUNplatform) || defined(HP9platform) || defined(LINUXplatform) ||
defined(FREEBSDplatform) || defined(MACOSXplatform)
static int channelNo = 0;
static char group[] = "pqrstuvwxyzPQRST";
static int groupNo = 0;
Index: src/lib/pixmap.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/pixmap.c.pamphlet,v
retrieving revision 1.5
diff -u -d -r1.5 pixmap.c.pamphlet
--- src/lib/pixmap.c.pamphlet 27 Oct 2004 01:10:41 -0000 1.5
+++ src/lib/pixmap.c.pamphlet 29 Oct 2004 13:52:31 -0000
@@ -369,8 +369,7 @@
write_pixmap_file(Display *dsp, int scr, char *fn, Window wid, int x, int y,
int width,int height)
#endif
{
- XpmAttributes attr;
- XImage *xi,*xireturn;
+ XImage *xi;
int status;
/* reads image structure in ZPixmap format */
Index: src/lib/wct.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/wct.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 wct.c.pamphlet
--- src/lib/wct.c.pamphlet 27 Jun 2004 15:01:44 -0000 1.4
+++ src/lib/wct.c.pamphlet 29 Oct 2004 13:52:33 -0000
@@ -287,7 +287,7 @@
printTime((long *)&(pwct->ftime));
cc = skimString(pwct->fimage, pwct->fsize, NHEAD, NTAIL);
printf("%s", " " + (cc - (NHEAD + NTAIL)));
- printf(" [%d w, %d c]", pwct->wordc, pwct->fsize);
+ printf(" [%d w, %ld c]", pwct->wordc, (long)pwct->fsize);
printf("\n");
#ifdef SHOW_WORDS
Index: src/scripts/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/scripts/Makefile.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 Makefile.pamphlet
--- src/scripts/Makefile.pamphlet 27 Jun 2004 15:01:44 -0000 1.2
+++ src/scripts/Makefile.pamphlet 29 Oct 2004 13:52:33 -0000
@@ -19,6 +19,10 @@
@cp -pr * ${OUT}
@mkdir -p ${OUT}/tex
@rm -f ${OUT}/Makefile*
+
+clean:
+ @echo 2 cleaning ${SRC}/scripts
+ @rm -f Makefile Makefile.dvi
@
\eject
\begin{thebibliography}{99}
Index: src/scripts/document
===================================================================
RCS file: /cvsroot/axiom/axiom/src/scripts/document,v
retrieving revision 1.3
diff -u -d -r1.3 document
--- src/scripts/document 12 Nov 2003 11:16:15 -0000 1.3
+++ src/scripts/document 29 Oct 2004 13:52:33 -0000
@@ -1,12 +1,14 @@
#!/bin/sh
+
latex=`which latex`
if [ "$latex" = "" ] ; then
echo document ERROR You must install latex first
exit 0
fi
-tangle=$AXIOM/bin/lib/notangle
-weave=$AXIOM/bin/lib/noweave
+tangle=notangle
+weave=noweave
+
if [ "$#" = "3" ]; then
REDIRECT=$2
FILE=`basename $3 .pamphlet`
Index: src/share/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/share/Makefile.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 Makefile.pamphlet
--- src/share/Makefile.pamphlet 27 Jun 2004 15:01:46 -0000 1.3
+++ src/share/Makefile.pamphlet 29 Oct 2004 13:52:33 -0000
@@ -31,6 +31,9 @@
@ echo 2 finished ${IN}
<<util.ht>>
+
+clean:
+
@
\eject
\begin{thebibliography}{99}
--
Mark Murray
iumop ap!sdn w,I idlaH
- [Axiom-developer] FreeBSD patches,
Mark Murray <=