diff --git a/ChangeLog.n b/ChangeLog.n index 7da733a6b221a3719d3ddfa8bb7c649e10321cd6..ff837d543204203d0750249e8f02c3022f3a1e26 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -10,6 +10,22 @@ Tests for new features: <`no new features', `no tests for new features', or <standard changelog date stamp> * <changes go here...> +******************************************************************************* +2.2.1.4 + +Documentation changes: none +Tests for new features: no new features + +Tue Dec 23 14:40:23 1997 duane@beta + + * Makefile.cobjs: Remove hp-specific targets + * Makefile.hpprism: Fix for hpux 10.20 + * misc/climgccursor.c: Ansify + * tk/load-xm.lisp: Fix for 5.0 unix + * tk/make-classes.lisp: Fix for 5.0 unix + * tk/xm-init.lisp: Fix for 5.0 unix + * utils/packages.lisp: incf version + ******************************************************************************* 2.2.1.3 diff --git a/Makefile.cobjs b/Makefile.cobjs index 091d011a1e0491d4b6d37dba7f85aa5ac9852918..992d29bcc08d169f71b23941389b32b41c882e9c 100644 --- a/Makefile.cobjs +++ b/Makefile.cobjs @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.cobjs,v 1.17 1997/10/13 20:29:32 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.cobjs,v 1.18 1997/12/23 22:44:50 duane Exp $ # # Makefile.cobj for CLIM 2.0 # @@ -58,11 +58,11 @@ climxm.$(SHARED_EXT): xlibsupport.o xtsupport.o xmsupport.o xlibsupport.o xtsupport.o xmsupport.o \ $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS)) -climxm.sl: xlibsupport.o xtsupport.o xmsupport.o - (eval '$(SET_LIBRARY_PATH)' ; \ - $(MAKE_SHARED) $(SHAREFLAGS) -o climxm.sl \ - xlibsupport.o xtsupport.o xmsupport.o \ - $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS)) +# climxm.sl: xlibsupport.o xtsupport.o xmsupport.o +# (eval '$(SET_LIBRARY_PATH)' ; \ +# $(MAKE_SHARED) $(SHAREFLAGS) -o climxm.sl \ +# xlibsupport.o xtsupport.o xmsupport.o \ +# $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS)) climol.$(SHARED_EXT): xlibsupport.o xtsupport.o olsupport.o (eval '$(SET_LIBRARY_PATH)' ; \ @@ -70,11 +70,11 @@ climol.$(SHARED_EXT): xlibsupport.o xtsupport.o olsupport.o xlibsupport.o xtsupport.o olsupport.o \ $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB)) -climol.sl: xlibsupport.o xtsupport.o olsupport.o - (eval '$(SET_LIBRARY_PATH)' ; \ - $(MAKE_SHARED) $(SHAREFLAGS) -o climol.sl \ - xlibsupport.o xtsupport.o olsupport.o \ - $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB)) +# climol.sl: xlibsupport.o xtsupport.o olsupport.o +# (eval '$(SET_LIBRARY_PATH)' ; \ +# $(MAKE_SHARED) $(SHAREFLAGS) -o climol.sl \ +# xlibsupport.o xtsupport.o olsupport.o \ +# $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB)) # mainxm.o contains foreign code from the libraries X11,Xt and Xm # required by Motif version of CLIM statically linked diff --git a/Makefile.hpprism b/Makefile.hpprism index 8e4ebde1bfadfaa79d1424bca7b9711c7e91f69e..e460e539115ab83b4ea31d9deedccbff3b373ccd 100644 --- a/Makefile.hpprism +++ b/Makefile.hpprism @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.hpprism,v 1.14 1997/10/20 23:10:57 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.hpprism,v 1.15 1997/12/23 22:44:50 duane Exp $ # # Makefile.hpprism for CLIM 2.0 # @@ -13,7 +13,7 @@ SHARED-OL-OBJS= climol.sl Makefile=Makefile.hpprism SET_LIBRARY_PATH = \ - LPATH=/usr/lib/X11R5:/lib/pa1.1:/lib:/usr/lib:/usr/lib/Motif1.2:$(LPATH); export LPATH + LPATH=/lib/pa1.1:/lib:/usr/lib:$(LPATH); export LPATH #CL=../src/xm-dcl @@ -24,7 +24,7 @@ TKLIB=-lXm XTLIB=-lXt XLIB=-lX11 -XINCLUDES= -I/usr/include/Motif1.2 -I/usr/include/X11R5 +XINCLUDES= CFLAGS= -O -Ae +DA1.1 MOTIFXTRAS=-lc diff --git a/misc/climgccursor.c b/misc/climgccursor.c index f2b7b3f4a412871a342478cd680aa895214033a9..c567a0ed97cd2dca62fba04c5d76af3a6cfaab69 100644 --- a/misc/climgccursor.c +++ b/misc/climgccursor.c @@ -35,7 +35,7 @@ int cursor; if (XFindContext(display, root, context, &font_cursor)) { font_cursor = XCreateFontCursor(display, cursor); - XSaveContext(display, root, context, font_cursor); + XSaveContext(display, root, context, (char*)font_cursor); } return (font_cursor); } @@ -81,7 +81,7 @@ int *call_data; } init_clim_gc_cursor_stuff(vec) - int *vec; + int (*vec[])(); { if (vec) { vec[0] = clim_starting_gc; diff --git a/tk/load-xm.lisp b/tk/load-xm.lisp index 8663075db2aebda44677294f053f46883490eab1..5e7aef00733a3085726a615f2f17a835a38a35fe 100644 --- a/tk/load-xm.lisp +++ b/tk/load-xm.lisp @@ -17,7 +17,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Header: /repo/cvs.copy/clim2/tk/load-xm.lisp,v 1.41 1997/10/13 20:29:38 layer Exp $ +;; $Header: /repo/cvs.copy/clim2/tk/load-xm.lisp,v 1.42 1997/12/23 22:44:53 duane Exp $ (in-package :user) @@ -26,7 +26,8 @@ #+(version>= 5 0) (unless (ff:get-entry-point (ff:convert-to-lang "XmCreateMyDrawingArea")) - (let ((excl::*dlopen-mode* (excl:ics-target-case + (let (#+(and dlfcn (not sunos4)) + (excl::*dlopen-mode* (excl:ics-target-case (:+ics #x102) (:-ics excl::*dlopen-mode*)))) (load (merge-pathnames (make-pathname diff --git a/tk/make-classes.lisp b/tk/make-classes.lisp index 262a21d0998cdc88f38d2b4ef0bfe8f1a64428a0..049ac4943e54a419c1cb5e73cd762e484a008b7f 100644 --- a/tk/make-classes.lisp +++ b/tk/make-classes.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: tk -*- ;; -;; -[Mon May 5 15:33:02 1997 by layer]- +;; -[Fri Dec 5 15:13:12 1997 by duane]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. @@ -19,7 +19,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Header: /repo/cvs.copy/clim2/tk/make-classes.lisp,v 1.45 1997/05/05 22:35:17 layer Exp $ +;; $Header: /repo/cvs.copy/clim2/tk/make-classes.lisp,v 1.46 1997/12/23 22:44:53 duane Exp $ (in-package :tk) @@ -355,7 +355,27 @@ (clrhash cached-constraint-resources))) class)) -#+dlfcn +#+(version>= 5 0) +(defun fixup-class-entry-points () + (let ((root (find-class 'xt-root-class))) + (clos::map-over-subclasses #'tk::unregister-address root) + (clos::map-over-subclasses + #'(lambda (class) + (let* ((old-addr (and (typep class 'xt-class) + (ff::foreign-pointer-address class))) + (entry-point (and (typep class 'xt-class) + (slot-boundp class 'entry-point) + (slot-value class 'entry-point))) + (new-addr (and entry-point + (get-foreign-variable-value entry-point)))) + (when entry-point + (unless (equal old-addr new-addr) + (setf (ff::foreign-pointer-address class) new-addr)) + (register-address class )))) + root))) + + +#+(and (not (version>= 5 0)) dlfcn) (defun fixup-class-entry-points () (let ((root (find-class 'xt-root-class))) (clos::map-over-subclasses #'tk::unregister-address root) diff --git a/tk/xm-init.lisp b/tk/xm-init.lisp index 0e75cd5c3b453a48fdf0670157138238a9a326bb..99f8a506b5b3ff9faa71d55bf49232cbc82f1aea 100644 --- a/tk/xm-init.lisp +++ b/tk/xm-init.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: tk -*- ;; -;; -[Fri Nov 19 00:56:06 1993 by duane]- +;; -[Fri Dec 5 15:13:14 1997 by duane]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. @@ -19,7 +19,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Header: /repo/cvs.copy/clim2/tk/xm-init.lisp,v 1.18 1997/02/05 01:53:22 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/tk/xm-init.lisp,v 1.19 1997/12/23 22:44:53 duane Exp $ (in-package :tk) @@ -38,18 +38,35 @@ ;; finding this out. Experience would indicate that the default is ;; to always link in the shared libraries except on rs6k (cim 3/14/96) -#+dlfcn + +#+(version>= 5 0) (defparameter *toolkit-static* #+rs6000 t #-rs6000 nil) -#+dlfcn + +#+(and (not (version>= 5 0)) dlfcn) +(defparameter *toolkit-static* + #+rs6000 t + #-rs6000 nil) + +#+(version>= 5 0) +(defun reinitialize-toolkit () + (unless *toolkit-static* + (xt_toolkit_initialize) + (setup-error-handlers) + (fixup-class-entry-points))) + +#+(and (not (version>= 5 0)) dlfcn) (defun reinitialize-toolkit () (unless *toolkit-static* (xt_toolkit_initialize) (setup-error-handlers) (fixup-class-entry-points))) -#+dlfcn +#+(version>= 5 0) +(push 'reinitialize-toolkit excl::*restart-actions*) + +#+(and (not (version>= 5 0)) dlfcn) (push 'reinitialize-toolkit excl::*restart-actions*) diff --git a/utils/packages.lisp b/utils/packages.lisp index a079765ffffe7e4236ab6592f8a8921f11e934ee..a6e6542921fbb0f7ea311f9d8b675ef03fd72d08 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*- -;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.75 1997/10/30 20:21:55 smh Exp $ +;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.76 1997/12/23 22:44:54 duane Exp $ (in-package :common-lisp-user) @@ -3301,7 +3301,7 @@ (cl:defvar *clim-major-version* 2) (cl:defvar *clim-minor-version* 2) (cl:defvar *clim-generation-version* 1) -(cl:defvar *clim-build-version* 3) +(cl:defvar *clim-build-version* 4) (cl:defparameter *clim-version* (cl:format () "CLIM ~d.~d.~d.~d" @@ -3309,4 +3309,4 @@ *clim-generation-version* *clim-build-version*)) #-aclpc -(si::rcsnote *clim-version* "$Id: packages.lisp,v 1.75 1997/10/30 20:21:55 smh Exp $") +(si::rcsnote *clim-version* "$Id: packages.lisp,v 1.76 1997/12/23 22:44:54 duane Exp $")