From 41f3f8f2b4bb8e5edceb2b0cd90d687754ebc3a9 Mon Sep 17 00:00:00 2001 From: layer <layer> Date: Thu, 29 Jul 1993 20:52:08 +0000 Subject: [PATCH] see changelog for Thu Jul 29 13:44:54 1993 --- ChangeLog.n | 28 +++++++++++++++++++++++ Makefile.cobjs-svr4 | 24 ++++++++++++-------- Makefile.dec3100 | 2 ++ Makefile.defs | 7 +++++- Makefile.generic | 16 ++++++------- Makefile.hp700 | 27 ---------------------- Makefile.sun4 | 5 +++- Makefile.sun4.motif-1.1.4 | 2 ++ Makefile.svr4 | 48 --------------------------------------- misc/train.lisp | 4 ++-- test/test-driver.lisp | 5 ++-- tk/load-ol.lisp | 7 +++--- tk/load-xm.lisp | 7 +++--- tk/make-classes.lisp | 4 ++-- tk/resources.lisp | 26 ++++++++++++++++++++- tk/xt-funs.lisp | 6 ++--- xlib/load-xlib.lisp | 8 +++---- 17 files changed, 108 insertions(+), 118 deletions(-) delete mode 100644 Makefile.hp700 delete mode 100644 Makefile.svr4 diff --git a/ChangeLog.n b/ChangeLog.n index 752b7928..a65ee645 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -1,3 +1,31 @@ +Thu Jul 29 13:44:54 1993 Kevin Layer (layer at sole) + +* Makefile.cobjs-svr4: make sure LD_LIBRARY_PATH is setup properly + +* Makefile.dec3100: set `Makefile' variable +* Makefile.defs: ditto +* Makefile.hp700: ditto +* Makefile.sun4.motif-1.1.4: ditto +* Makefile.svr4: ditto + +* Makefile.generic: fix clean; add install_obj used by make-dist + +* misc/train.lisp: don't (setq *global-gc-behavior* nil) +* test/test-driver.lisp: ditto + +* tk/load-ol.lisp: +* tk/load-xm.lisp: +* tk/make-classes.lisp: +* xlib/load-xlib.lisp: + :note-shared-library-references nil on get-entry-point + +* tk/resources.lisp: solaris 2.2 hacking from cer + +* tk/xt-funs.lisp: fix argument types (string -> simple-string) so +call-direct is done + +------------------------------------------------------------------------------- + from colin: Tue Jul 27 15:26:56 PDT 1993 test/test-suite.lisp diff --git a/Makefile.cobjs-svr4 b/Makefile.cobjs-svr4 index 81d14059..283f879d 100644 --- a/Makefile.cobjs-svr4 +++ b/Makefile.cobjs-svr4 @@ -1,24 +1,28 @@ # $fiHeader: Makefile.cobjs-svr4,v 1.1 93/04/16 09:26:11 layer Exp $ climol.so: xlibsupport.o xtsupport.o olsupport.o - @echo LD_LIBRARY_PATH is $$LD_LIBRARY_PATH - ld -G -o climol.so xlibsupport.o xtsupport.o olsupport.o \ - -L/usr/openwin/lib -lXol -lXt -lX11 + (eval `$(setup_LLP) openlook`; \ + echo LD_LIBRARY_PATH is $$LD_LIBRARY_PATH; \ + ld -G -o climol.so xlibsupport.o xtsupport.o olsupport.o \ + -lXol -lXt -lX11) climxm.so: xlibsupport.o xtsupport.o MyDrawingA.o - @echo LD_LIBRARY_PATH is $$LD_LIBRARY_PATH - ld -G -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \ - -lXm -lXt -lX11 -lgen + (eval `$(setup_LLP) motif`; \ + echo LD_LIBRARY_PATH is $$LD_LIBRARY_PATH; \ + ld -G -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \ + -lXm -lXt -lX11 -lgen) xlibsupport.o : xlib/xlibsupport.c - $(CC) -c -K pic $(CFLAGS) $(XINCLUDES) -o xlibsupport.o xlib/xlibsupport.c + $(CC) -c -K pic $(CFLAGS) $(XINCLUDES) -o xlibsupport.o \ + xlib/xlibsupport.c xtsupport.o: misc/xtsupport.c - $(CC) -c -K pic $(CFLAGS) $(XINCLUDES) $(XTSUPPORTINCLUDES) -o xtsupport.o \ - misc/xtsupport.c + $(CC) -c -K pic $(CFLAGS) $(XINCLUDES) $(XTSUPPORTINCLUDES)\ + -o xtsupport.o misc/xtsupport.c MyDrawingA.o: misc/MyDrawingA.c misc/climgccursor.c - $(CC) -c -K pic $(CFLAGS) $(XMINCLUDES) -o MyDrawingA.o misc/MyDrawingA.c + $(CC) -c -K pic $(CFLAGS) $(XMINCLUDES) -o MyDrawingA.o \ + misc/MyDrawingA.c olsupport.o: misc/olsupport.c misc/climgccursor.c $(CC) -c -K pic $(CFLAGS) $(OLINCLUDES) -o olsupport.o misc/olsupport.c diff --git a/Makefile.dec3100 b/Makefile.dec3100 index 0abdef4b..3c725289 100644 --- a/Makefile.dec3100 +++ b/Makefile.dec3100 @@ -5,6 +5,8 @@ include Makefile.defs +Makefile=Makefile.dec3100 + MOTIFLIB=/usr/lib/DXM/lib/Xm/libXm.a MOTIFLIB_d=/usr/lib/DXM/lib/Xm/libXm.a XTLIB=/usr/lib/DXM/lib/Xt/libXt.a diff --git a/Makefile.defs b/Makefile.defs index bcfb03f5..24813e04 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -17,6 +17,11 @@ TAGS = /usr/fi/lib/emacs/etc/etags TMP = /tmp MV = /usr/fi/mv-nfs +# If you try and execute this as the -f argument to `make', then you forgot +# to put a `Makefile' variable definition in your machine specific +# Makefile (ie, Makefile.sun4). +Makefile = Makefile.bogus + # Training TRAIN_TIMES=1 @@ -517,7 +522,7 @@ make = make SPEED=${SPEED} SAFETY=${SAFETY} DEBUG=${DEBUG} \ LOAD_XREF_INFO=${LOAD_XREF_INFO} \ RECORD_XREF_INFO=${RECORD_XREF_INFO} CL=${CL} \ CLIM=${CLIM} CLIMOL=${CLIMOL} CLIMXM=${CLIMXM} DUMP-CLIM=${DUMP-CLIM} \ - COMPILE_PRINT=${COMPILE_PRINT} TMP=${TMP} + COMPILE_PRINT=${COMPILE_PRINT} TMP=${TMP} -f ${Makefile} CLIM1COMPAT= compatibility/packages.fasl compatibility/clim1-compatibility.fasl diff --git a/Makefile.generic b/Makefile.generic index 6370c48b..1c6e284a 100644 --- a/Makefile.generic +++ b/Makefile.generic @@ -210,12 +210,11 @@ echo-train: # Misc - cleanobjs: - rm -f $(CLIMOBJS) stub-motif.o stub-olit.o + rm -f $(CLIMOBJS) *.o clean: - find $(DIRS) -name '*.fasl' -print | xargs rm -f + find . -name '*.fasl' -print | xargs rm -f rm -f $(CLIMFASLS) $(CLIMOBJS) *.o \ stub-motif.c stub-olit.c stub-xt.c stub-x.c slim slim-small rm -f *.z *.Z *.gz *.ilt @@ -258,10 +257,11 @@ makeclimfasls : $(CLIM_FASLS_TO_MAKE) makeclimxmfasls : compile-xm cat-xm makeclimolfasls : compile-ol cat-ol - -install_clim : - cp $(CLIMFASLS) $(DEST) +install_obj: cp $(INSTALLED_CLIMOBJS) $(DEST) + +install_clim: install_obj + cp $(CLIMFASLS) $(DEST) # Link in the libraries & distribution object files with standard names # @@ -276,8 +276,8 @@ link-motif-libraries: link-objects echo_src_files: @ls $(SRC_FILES) | cat - -makeclimobjs : $(CLIMOBJS) + +makeclimobjs: $(CLIMOBJS) ################## Lower level Makefile stuff diff --git a/Makefile.hp700 b/Makefile.hp700 deleted file mode 100644 index 14639c73..00000000 --- a/Makefile.hp700 +++ /dev/null @@ -1,27 +0,0 @@ -# $fiHeader: Makefile.hp700,v 1.2 93/05/13 16:22:43 cer Exp $ -# -# Makefile.hp700 for CLIM 2.0 -# - -include Makefile.defs - -CL=/usr/fi/dcl-devel - -# - -MOTIFLIB=/usr/lib/Motif1.2/libXm.a -MOTIFLIB_d=/usr/lib/Motif1.2/libXm.a -XTLIB=/usr/lib/X11R5/libXt.a -XLIB=/usr/lib/X11R5/libX11.a -XINCLUDES= -I/usr/include/Motif1.2 -I/usr/include/X11R5 -XMINCLUDES=$(XINCLUDES) - -# Make motif only. This is like the dec. -# Perhaps this should be included. - -CLIM_FASLS_TO_MAKE = makeclimxmfasls -CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS) -CLIMFASLS= $(CLIM_XM_FASLS) $(CLIM_GENERIC_FASLS) -INSTALLED_CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS) - -include Makefile.generic diff --git a/Makefile.sun4 b/Makefile.sun4 index dd9f9494..1d57761b 100644 --- a/Makefile.sun4 +++ b/Makefile.sun4 @@ -5,6 +5,8 @@ include Makefile.defs +Makefile=Makefile.sun4 + MOTIFHOME=/net/vapor/3rd/motif-1.2.2 MOTIFLIB=$(MOTIFHOME)/usr/lib/libXm$(DEBUGLIB).a #MOTIFLIB_d=$(MOTIFHOME)/usr/lib/libXm_d.a @@ -14,7 +16,6 @@ XTLIB=$(MOTIFHOME)/usr/lib/libXt$(DEBUGLIB).a XINCLUDES=-I$(MOTIFHOME)/usr/include XMINCLUDES=-I$(MOTIFHOME)/usr/include -OLINCLUDES=-I/usr/openwin/include XTSUPPORTINCLUDES=-I/net/vapor/x11/R5/src/mit/lib/Xt # Do we really need this. Why is it referenced? @@ -23,5 +24,7 @@ MOTIFXTRAOS=$(MOTIFHOME)/usr/lib/Motif/Sun/dlsym.o OPENLOOKHOME=/net/vapor/x11/olit-3.0 OLXLIB= $(OPENLOOKHOME)/lib/libX11.a OLXTLIB=$(OPENLOOKHOME)/lib/libXt.a +# don't use OPENLOOKHOME because there are no include files there +OLINCLUDES=-I/usr/openwin/include include Makefile.generic diff --git a/Makefile.sun4.motif-1.1.4 b/Makefile.sun4.motif-1.1.4 index 412ec91f..aec0ab1b 100644 --- a/Makefile.sun4.motif-1.1.4 +++ b/Makefile.sun4.motif-1.1.4 @@ -5,6 +5,8 @@ include Makefile.defs +Makefile=Makefile.sun4.motif-1.1.4 + MOTIFLIB=/x11/R4/sun4-lib/libXm$(DEBUGLIB).a MOTIFLIB_d=/x11/R4/sun4-lib/libXm_d.a XLIB= /x11/R4/sun4-lib/libX11$(DEBUGLIB).a diff --git a/Makefile.svr4 b/Makefile.svr4 deleted file mode 100644 index 5544b9b7..00000000 --- a/Makefile.svr4 +++ /dev/null @@ -1,48 +0,0 @@ -# $fiHeader: Makefile.svr4,v 1.3 1993/05/13 16:22:49 cer Exp $ - -include Makefile.defs - -C_OBJECT_MAKEFILE = Makefile.cobjs-svr4 - -XLIB-CLIM-OBJS = xlib/pkg.fasl - -GENERIC_PUBLIC_OBJS = -XM_PUBLIC_OBJS = -OL_PUBLIC_OBJS = -PUBLIC_OBJS = -OL_LICENSED_OBJS = -XM_LICENSED_OBJS = -MOTIF_OBJS = climxm.so -OPENLOOK_OBJS = climol.so -CLIMOBJS= climxm.so climol.so -INSTALLED_CLIMXMOBJS = MyDrawingA.o climxm.so -INSTALLED_CLIMOLOBJS = olsupport.o climol.so -INSTALLED_CLIMOBJS= xlibsupport.o xtsupport.o \ - $(INSTALLED_CLIMOLOBJS) $(INSTALLED_CLIMXMOBJS) - -MOTIFLIB=/usr/lib/libXm$(DEBUGLIB).a -MOTIFLIB_d=/usr/lib/libXm.a -XLIB= /usr/lib/libX11$(DEBUGLIB).a -XTLIB=/usr/lib/libXt$(DEBUGLIB).a - -XINCLUDES=-I/usr/include -XMINCLUDES=-I/usr/include -OLINCLUDES=-I/usr/openwin/include - -XTSUPPORTINCLUDES=-I/net/vapor/x11/R5/src/mit/lib/Xt -MOTIFXTRAOS= - -OLXLIB= /usr/lib/libX11.a -OLXTLIB=/usr/lib/libXt.a - -############ overrides of things defined in Makefile.defs -OPENWINHOME = /usr/openwin -CL_SRC = xxxxxxxxxxxxxxxxxxxxx -OLCOPYLIB=not-used-xxxxx -OLXLIBS=/usr/openwin/lib/libXt.a /usr/openwin/lib/libX11.a -LIBXOL=/usr/openwin/lib/libXol.a -LIBXOL_d=$(LIBXOL) -CL = /scm3/4.2.beta2.0-sunos5/src/dcl -PWD = . - -include Makefile.generic diff --git a/misc/train.lisp b/misc/train.lisp index fd6f4a0c..54e61058 100644 --- a/misc/train.lisp +++ b/misc/train.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: user -*- ;; -;; -[]- +;; -[Tue Jul 20 08:58:43 1993 by layer]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved. @@ -31,7 +31,7 @@ (profilep t) (benchmarkp t)) - (setq *global-gc-behavior* nil) + ;;(setq *global-gc-behavior* nil) (load "test/test.lisp") (clim-user::with-test-reporting (:file (if (excl::featurep :clim-motif) "test-suite-reportxm.lisp" diff --git a/test/test-driver.lisp b/test/test-driver.lisp index 71ef7c0e..2d19473c 100644 --- a/test/test-driver.lisp +++ b/test/test-driver.lisp @@ -798,5 +798,6 @@ ;; This stops warnings happening asynchronously and causing confusion. -(setq excl:*global-gc-behavior* nil) - +;;The warnings go to the initial terminal io, anyway. With the following +;;uncommented, the full tests can't complete in 100mb of swap space. +;;(setq excl:*global-gc-behavior* nil) diff --git a/tk/load-ol.lisp b/tk/load-ol.lisp index e440ef25..59946af3 100644 --- a/tk/load-ol.lisp +++ b/tk/load-ol.lisp @@ -1,9 +1,7 @@ ;; -*- mode: common-lisp; package: user -*- ;; -;; -[Tue Jul 6 17:18:39 1993 by colin]- -;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. -;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. +;; copyright (c) 1986-1993 Franz Inc, Berkeley, CA All rights reserved. ;; ;; The software, data and information contained herein are proprietary ;; to, and comprise valuable trade secrets of, Franz, Inc. They are @@ -28,7 +26,8 @@ (require :climg) #+svr4 -(unless (ff:get-entry-point (ff:convert-to-lang "ol_appl_add_item")) +(unless (ff:get-entry-point (ff:convert-to-lang "ol_appl_add_item") + :note-shared-library-references nil) (load "climol.so")) #-svr4 diff --git a/tk/load-xm.lisp b/tk/load-xm.lisp index af8f1f47..b0fd49cc 100644 --- a/tk/load-xm.lisp +++ b/tk/load-xm.lisp @@ -1,9 +1,7 @@ ;; -*- mode: common-lisp; package: user -*- ;; -;; -[Tue Jul 6 15:06:38 1993 by colin]- -;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. -;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. +;; copyright (c) 1986-1993 Franz Inc, Berkeley, CA All rights reserved. ;; ;; The software, data and information contained herein are proprietary ;; to, and comprise valuable trade secrets of, Franz, Inc. They are @@ -28,7 +26,8 @@ (require :climg) #+svr4 -(unless (ff:get-entry-point (ff:convert-to-lang "XmCreateMyDrawingArea")) +(unless (ff:get-entry-point (ff:convert-to-lang "XmCreateMyDrawingArea") + :note-shared-library-references nil) (load "climxm.so")) #-svr4 diff --git a/tk/make-classes.lisp b/tk/make-classes.lisp index a42ece3d..ac3829bf 100644 --- a/tk/make-classes.lisp +++ b/tk/make-classes.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: tk -*- ;; -;; -[Fri May 21 08:43:00 1993 by layer]- +;; -[Tue Jul 6 22:42:47 1993 by layer]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. @@ -28,7 +28,7 @@ (let ((ep #+hpprism (ff:get-extern-data-address x) #-hpprism (ff:get-entry-point x - #+svr4 :note-shared-library-references #+svr4 nil))) + #+svr4 :note-shared-library-references #+svr4 nil))) (unless ep (error "Entry point ~S not found" x)) (class-array ep 0))) diff --git a/tk/resources.lisp b/tk/resources.lisp index 0476784c..43057ab1 100644 --- a/tk/resources.lisp +++ b/tk/resources.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: tk -*- ;; -;; -[Fri Apr 16 09:24:22 1993 by layer]- +;; -[Thu Jul 8 15:33:25 1993 by layer]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. @@ -711,3 +711,27 @@ (etypecase value (string value) (null "")))) + +;; solaris 2.2 stuff + +(defmethod convert-resource-out ((parent t) (type (eql 'ol-str)) value) + (string-to-char* value)) + +(defmethod convert-resource-in ((parent t) (type (eql 'ol-str)) value) + (unless (zerop value) + (char*-to-string value))) + + +(defmethod convert-resource-out ((parent t) (type (eql 'ol-font)) value) + (etypecase value + (string + (make-instance 'font + :display (widget-display parent) + :name value)) + (font value))) + + +(defmethod convert-resource-in ((parent t) (typep (eql 'ol-font)) value) + (make-instance 'font + :display (widget-display parent) + :foreign-address value)) diff --git a/tk/xt-funs.lisp b/tk/xt-funs.lisp index 615d6cf9..a94ca3ce 100644 --- a/tk/xt-funs.lisp +++ b/tk/xt-funs.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: xt -*- ;; -;; -[]- +;; -[Thu Jul 8 11:51:27 1993 by layer]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved. @@ -409,14 +409,14 @@ (ff:defforeign 'xt_parse_translation_table :call-direct t - :arguments '(string) + :arguments '(simple-string) :arg-checking nil :entry-point (ff:convert-to-lang "XtParseTranslationTable") :return-type :unsigned-integer) (ff:defforeign 'xt_parse_accelerator_table :call-direct t - :arguments '(string) + :arguments '(simple-string) :arg-checking nil :entry-point (ff:convert-to-lang "XtParseAcceleratorTable") :return-type :unsigned-integer) diff --git a/xlib/load-xlib.lisp b/xlib/load-xlib.lisp index 6de4d63f..df358719 100644 --- a/xlib/load-xlib.lisp +++ b/xlib/load-xlib.lisp @@ -1,9 +1,7 @@ ;; -*- mode: common-lisp; package: x11 -*- ;; -;; -[Tue Jul 6 17:18:09 1993 by colin]- -;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. -;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved. +;; copyright (c) 1986-1993 Franz Inc, Berkeley, CA All rights reserved. ;; ;; The software, data and information contained herein are proprietary ;; to, and comprise valuable trade secrets of, Franz, Inc. They are @@ -51,7 +49,8 @@ (defvar sys::*libx11-pathname* "-lX11") -(unless (ff:get-entry-point (ff:convert-to-lang "lisp_XDrawString")) +(unless (ff:get-entry-point (ff:convert-to-lang "lisp_XDrawString") + :note-shared-library-references nil) (load "xlibsupport.o" :system-libraries (list sys::*libx11-pathname*) :print t)) @@ -59,4 +58,3 @@ "stub-x.o" (x11::symbols-from-file "misc/undefinedsymbols") (list sys::*libx11-pathname*)) - -- GitLab