diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | INSTALL | 19 | ||||
| -rw-r--r-- | TODO | 19 | ||||
| -rw-r--r-- | config/var-def.mk | 4 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 10 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/graph/view2D/process2d.c | 37 | ||||
| -rw-r--r-- | src/graph/view3D/process3d.c | 11 |
10 files changed, 54 insertions, 75 deletions
@@ -1,3 +1,11 @@ +2008-04-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * configure.ac.pamphlet (oa_shrlib_flags): Tidy. + (oa_shrobj_flags): Likewise. + * config/var-def.mk (LINK_SHRLIB): Tidy. + * INSTALL: Update. + * TODO: Likewise. + 2008-04-04 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac.pamphlet: When using CLisp, ensure FFI is supported. @@ -1,18 +1,21 @@ Requirements ============ -OpenAxiom uses GCL (the GNU Common Lisp) for its runtime support. So, -if you already have a running GCL (2.6.7 or 2.6.8), that is good. -Otherwise, you would need to download a dependency tarball from -OpenAxiom's download web site. See instructions below. +OpenAxiom currenly requires a Lisp system for its runtime support. +OpenAxiom is known to build with the GNU Common Lisp (GCL versions 2.6.7 +or 2.6.8), Steel Bank Common Lisp (SBCL version 1.0.x or higher), and +CLisp (version 2.44.x or higher). So, if you already have any of the +above mentioned Lisp system, your are good to go. Otherwise, you +would need to download a dependency tarball from OpenAxiom's download +web site. See instructions below. OpenAxiom needs `noweb' for extracting its source codes. If you don't have running `noweb' utilities, you would need to either download the dependency tarball from OpenAxiom's download web site, or separately install them, and then proceed with configuration as detailed below. -Note that GCL and `noweb' are needed only to build OpenAxiom. They are -not needed to run it. +Note that GCL or SBCL or CLisp, and `noweb' are needed only to build +OpenAxiom. They are not needed once the system is installed. Finally, you would need a working GNU C compiler. It is also recommended that you install X11 development headers and libraries, especially @@ -21,8 +24,8 @@ still need a working GNU C compiler though. Ah, one more note: OpenAxiom requires GNU Make. -1. GCL and noweb prerequisites - --------------------------- +1. Lisp and noweb prerequisites + ---------------------------- If any of GCL or noweb is missing from the environment environment where you're building, then you need to either separately install @@ -8,7 +8,6 @@ application (or as a Firefox extension) * Make highlighting more configurable * Build domains for theorem proving and proof checking facilities. -* Support more Lisp systems * Better support on Windows platform (MinGW/MSYS) * Modernize algebras * Better documentations @@ -19,7 +18,7 @@ * Integrate to development environments * Revisit the underlying definition of the types DFlo in foam - interface, and Float in OpenAxiom. + interface, and DoubleFloat in OpenAxiom. * Audit all codes that manipulate sockets. @@ -36,17 +35,10 @@ * Document src/scripts/document.in -* cleanup the Makefile pamphlets - * Improve Boot documentation * Reduce the number of bar Lisp codes to the minimum residual. -* Fix codes in src/interp, src/hyper, and src/hyper/pages/util.ht that - hardcode pathnames. - In general, the OpenAxiom system should be able to work properly with - relative paths to that it can be "moved" around seamlessly. - * Audit cleanup rules * Audit file copying. @@ -57,6 +49,15 @@ === DONE === ============ +* Support more Lisp systems (GCL, SBCL, CLisp) + +* cleanup the Makefile pamphlets + +* Fix codes in src/interp, src/hyper, and src/hyper/pages/util.ht that + hardcode pathnames. + In general, the OpenAxiom system should be able to work properly with + relative paths to that it can be "moved" around seamlessly. + * Support out-of-source build. * Support parallel build. diff --git a/config/var-def.mk b/config/var-def.mk index a08fccde..03d0b6a5 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -79,9 +79,9 @@ LINK = $(LIBTOOL) --mode=link $(CC) -static ## to be very selective about when and where to use. Sadly, that ends ## up negating the whole point of having Libtool in the first place. ifeq (@oa_use_libtool_for_shared_lib@,no) -LINK_SHRLIB = $(CC) -shared +LINK_SHRLIB = $(CC) else -LINK_SHRLIB = $(LIBTOOL) --mode=link $(CC) -module +LINK_SHRLIB = $(LIBTOOL) --mode=link $(CC) endif @@ -1992,8 +1992,8 @@ ac_config_headers="$ac_config_headers config/axiom-c-macros.h" oa_use_libtool_for_shared_lib=yes -oa_shrobj_flags='-prefer-pic' -oa_shrlib_flags='-shared' +oa_shrobj_flags= +oa_shrlib_flags= # Tell Libtool to assume `dlopen' so that it does not have to # emulate it. @@ -19320,9 +19320,11 @@ case $host in ;; *darwin*) oa_shrobj_flags='-dynamic' - oa_shrlib_flags='-dynamic' + oa_shrlib_flags='-dynamiclib -undefined suppress -flat_namespace' ;; *) + oa_shrobj_flags='-prefer-pic' + oa_shrlib_flags='-shared -module' ;; esac diff --git a/configure.ac b/configure.ac index 75ccc331..bd94c21f 100644 --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,8 @@ AC_PREREQ([2.60]) AC_CONFIG_SRCDIR(src/Makefile.pamphlet) oa_use_libtool_for_shared_lib=yes -oa_shrobj_flags='-prefer-pic' -oa_shrlib_flags='-shared' +oa_shrobj_flags= +oa_shrlib_flags= # Tell Libtool to assume `dlopen' so that it does not have to # emulate it. AC_LIBTOOL_DLOPEN @@ -32,9 +32,11 @@ case $host in ;; *darwin*) oa_shrobj_flags='-dynamic' - oa_shrlib_flags='-dynamic' + oa_shrlib_flags='-dynamiclib -undefined suppress -flat_namespace' ;; *) + oa_shrobj_flags='-prefer-pic' + oa_shrlib_flags='-shared -module' ;; esac AC_SUBST(oa_use_libtool_for_shared_lib) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 12194d6c..65d43eea 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1092,7 +1092,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-04-04], +AC_INIT([OpenAxiom], [1.2.0-2008-04-05], [open-axiom-bugs@lists.sf.net]) @ @@ -1221,8 +1221,8 @@ abstract away from those details. In particular, we rely on GNU \Tool{libtool} to take care of that for us. <<initialize shared libraries tool>>= oa_use_libtool_for_shared_lib=yes -oa_shrobj_flags='-prefer-pic' -oa_shrlib_flags='-shared' +oa_shrobj_flags= +oa_shrlib_flags= # Tell Libtool to assume `dlopen' so that it does not have to # emulate it. AC_LIBTOOL_DLOPEN @@ -1241,9 +1241,11 @@ case $host in ;; *darwin*) oa_shrobj_flags='-dynamic' - oa_shrlib_flags='-dynamic' + oa_shrlib_flags='-dynamiclib -undefined suppress -flat_namespace' ;; *) + oa_shrobj_flags='-prefer-pic' + oa_shrlib_flags='-shared -module' ;; esac AC_SUBST(oa_use_libtool_for_shared_lib) diff --git a/src/ChangeLog b/src/ChangeLog index 8a5e1373..b33da222 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-04-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * graph/view2D/process2d.c (processEvents): Tidy. + * graph/view3D/process3d.c (processEvents): Likewise. + 2008-04-04 Gabriel Dos Reis <gdr@cs.tamu.edu> * hyper/hyper.h: Simplify font definitions. diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c index 7df82480..97f641ef 100644 --- a/src/graph/view2D/process2d.c +++ b/src/graph/view2D/process2d.c @@ -59,12 +59,7 @@ static int doit=0; /* globish variable for picking/dropping/clearing - all sort void -#ifdef _NO_PROTO -doPick (i,bKey) - int i,bKey; -#else doPick (int i,int bKey) -#endif { int vCommand=pick2D; @@ -86,12 +81,7 @@ doPick (int i,int bKey) void -#ifdef _NO_PROTO -doDrop (i,bKey) - int i,bKey; -#else doDrop (int i,int bKey) -#endif { int vCommand=drop2D; int viewGoAhead; @@ -121,12 +111,7 @@ doDrop (int i,int bKey) } void -#ifdef _NO_PROTO -clickedOnGraphSelect (i,bKey) - int i,bKey; -#else clickedOnGraphSelect (int i,int bKey) -#endif { int strlength; @@ -182,13 +167,7 @@ clickedOnGraphSelect (int i,int bKey) static void -#ifndef _NO_PROTO drawControlPushButton(int isOn, int index) -#else - drawControlPushButton(isOn,index) - int isOn; - int index; -#endif { GDrawPushButton(dsply, processGC, processGC, processGC, control->controlWindow, @@ -206,12 +185,7 @@ drawControlPushButton(int isOn, int index) void -#ifdef _NO_PROTO -buttonAction (bKey) - int bKey; -#else buttonAction (int bKey) -#endif { int i; @@ -509,11 +483,7 @@ buttonAction (int bKey) /*********************** X Event Processing ***************************/ void -#ifdef _NO_PROTO -processEvents() -#else processEvents(void) -#endif { XEvent *event, @@ -851,7 +821,7 @@ processEvents(void) } /* else - not closing */ } /* if checkButton */ } /* if FD_ISSET(Xcon.... */ - else if FD_ISSET(0,&rd) { + else if (FD_ISSET(0,&rd)) { externalControl=spadAction(); /* returns (-1) if broken ,0 if success */ if (spadDraw && (externalControl==0)) drawViewport(Xoption); } @@ -864,12 +834,7 @@ processEvents(void) void -#ifdef _NO_PROTO -clickedOnGraph (i,bKey) - int i,bKey; -#else clickedOnGraph (int i,int bKey) -#endif { switch (doit) { diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c index 79c11b42..9f267279 100644 --- a/src/graph/view3D/process3d.c +++ b/src/graph/view3D/process3d.c @@ -66,12 +66,7 @@ void -#ifdef _NO_PROTO -buttonAction (bKey) -int bKey; -#else buttonAction (int bKey) -#endif { char *s1, *s2; @@ -855,11 +850,7 @@ buttonAction (int bKey) /************************** X Event Processing *****************************/ void -#ifdef _NO_PROTO -processEvents() -#else processEvents(void) -#endif { XEvent *event, tempEvent; @@ -1594,7 +1585,7 @@ processEvents(void) } /* else - not closing */ } /* if checkButton */ } /* if FD_ISSET(Xcon,.. */ - else if FD_ISSET(0,&rd) { + else if (FD_ISSET(0,&rd)) { externalControl = spadAction(); if (spadDraw && (externalControl==0)) drawViewport(Xoption); } |