Skip to content
Snippets Groups Projects
Commit becca865 authored by duane's avatar duane
Browse files

see 4.2.devel.26 changelog entry for Tue Jun 7 23:44:53 1994

parent 2ed1443b
No related branches found
No related tags found
No related merge requests found
(for 4.2.devel.26 merge):
Tue Jun 7 23:44:53 1994 Duane Rettig (duane at clay)
New file:
* Makefile.rs6000: New file for rs6000
Changed files:
* Makefile: Add stubs variable
* Makefile.cobjs: Remove lib dependencies
* Makefile.cobjs-svr4: Generalize; Fix mainxm dependency
* Makefile.generic: Add stub file support for rs6000
* Makefile.sgi4d-svr4: Fix debug lib name; add MOTIFXTRAOS
* Makefile.sun4-svr4: Add MOTIFXTRAOS
* instclimxm.lisp: Use portable lib spec
* clx/pkgdcl.lisp:
* demo/packages.lisp:
* postscript/pkgdcl.lisp:
* utils/clos-patches.lisp:
* utils/packages.lisp:
* tk/make-classes.lisp: Add sgi, rs6000 to foreign-defining code
* utils/lisp-utilities.lisp: Generalize and fix evacuate-list
Tue Jan 11 15:30:15 1994 George Jacob (georgej@lava)
* utils/excl-verification.lisp: Changed version to CLIM2.0
......
# $fiHeader: Makefile,v 1.76 93/04/28 17:18:58 layer Exp $
HOST = sun4
stubs =
include Makefile.$(HOST)
......@@ -3,16 +3,18 @@
# Makefile.cobj for CLIM 2.0, containing non-svr4 C rules
#
clim-motif.o : stub-motif.o stub-xt.o $(MOTIFLIB)
# Removed lib dependencies; these were bogus because the libraries will tend to
# be older anyway. MAKE CLEAN instead.
clim-motif.o : stub-motif.o stub-xt.o
ld -r $(LDFLAGS) -o clim-motif.o stub-motif.o stub-xt.o $(MOTIFXTRAOS) $(MOTIFLIB)
clim-olit.o : stub-olit.o stub-xt.o $(LIBXOL)
clim-olit.o : stub-olit.o stub-xt.o
ld -r $(LDFLAGS) -o clim-olit.o stub-olit.o stub-xt.o $(LIBXOL)
clim-motif_d.o : stub-motif.o stub-xt.o $(MOTIFLIB_d)
clim-motif_d.o : stub-motif.o stub-xt.o
ld -r $(LDFLAGS) -o clim-motif_d.o stub-motif.o stub-xt.o $(MOTIFXTRAOS) $(MOTIFLIB_d)
clim-olit_d.o : stub-olit.o stub-xt.o $(LIBXOL_d)
clim-olit_d.o : stub-olit.o stub-xt.o
ld -r $(LDFLAGS) -o clim-olit_d.o stub-olit.o stub-xt.o $(LIBXOL_d)
xlibsupport.o : xlib/xlibsupport.c
......
......@@ -8,7 +8,7 @@ climol.so: xlibsupport.o xtsupport.o olsupport.o
climxm.so: xlibsupport.o xtsupport.o MyDrawingA.o
(test -f $(setup_LLP) && eval `$(setup_LLP) motif`; \
ld $(SHAREFLAGS) -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \
-lXm -lXt -lX11 -lgen)
-lXm -lXt -lX11 $(MOTIFXTRAOS))
xlibsupport.o : xlib/xlibsupport.c
$(CC) -c $(PICFLAGS) $(CFLAGS) $(XINCLUDES) -o xlibsupport.o \
......@@ -25,11 +25,7 @@ MyDrawingA.o: misc/MyDrawingA.c misc/climgccursor.c
olsupport.o: misc/olsupport.c misc/climgccursor.c
$(CC) -c $(PICFLAGS) $(CFLAGS) $(OLINCLUDES) -o olsupport.o misc/olsupport.c
# not needed for svr4?
# $(MAIN_OBJ): stub-motif.o stub-xt.o stub-x.o
# ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) \
# xlibsupport.o xtsupport.o MyDrawingA.o stub-motif.o stub-xt.o \
# stub-x.o -lXm -lXt -lX11 -lgen
$(MAIN_OBJ):
cp $(ACL_MAIN_OBJ) $(MAIN_OBJ)
$(MAIN_OBJ): stub-motif.o stub-xt.o stub-x.o $(ACL_MAIN_OBJ)
ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) \
xlibsupport.o xtsupport.o MyDrawingA.o stub-motif.o stub-xt.o \
stub-x.o $(MOTIFLIB) $(XTLIB) $(MAINOBJXLIB) $(MOTIFXTRAOS)
......@@ -314,21 +314,26 @@ makeclimobjs: $(CLIMOBJS)
################## Lower level Makefile stuff
echo-xm-ucl-xtras:
@echo $(PWD)/stub-x.o $(PWD)/clim-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(MOTIFLIB) $(XTLIB) $(XLIB) $(XMDCLXTRAS)
@echo $(PWD)/stub-x.o $(PWD)/stub-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(MOTIFLIB) $(XTLIB) $(XLIB) $(XMDCLXTRAS)
ol-dcl : stub-x.o stub-xt.o clim-olit.o xlibsupport.o olsupport.o xtsupport.o $(MALLOCOBJS)
cd $(CL_SRC) ; /bin/mv ucl ucl.climsave ;\
make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-olit.o $(PWD)/xlibsupport.o $(PWD)/olsupport.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MALLOCOBJS) $(OLXLIBS)' dcl ;\
/bin/mv ucl.climsave ucl
xm-dcl : stub-x.o stub-xt.o clim-motif.o xlibsupport.o xtsupport.o MyDrawingA.o $(MALLOCOBJS)
xm-dcl : stub-x.o stub-xt.o stub-motif.o xlibsupport.o xtsupport.o MyDrawingA.o $(MALLOCOBJS)
cd $(CL_SRC) ; /bin/mv ucl ucl.climsave ;\
make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MOTIFLIB) $(MALLOCOBJS) $(XTLIB) $(XLIB) $(XMDCLXTRAS)' dcl ;\
make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) stubs=$(stubs) user_objects='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/stub-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MOTIFLIB) $(MALLOCOBJS) $(XTLIB) $(XLIB) $(XMDCLXTRAS)' dcl ;\
/bin/mv ucl.climsave ucl
ucl.clim: stub-x.o clim-motif.o xlibsupport.o xtsupport.o MyDrawingA.o $(MALLOCOBJS)
# xm-dcl : stub-x.o stub-xt.o stub-motif.o xlibsupport.o xtsupport.o MyDrawingA.o $(MALLOCOBJS)
# cd $(CL_SRC) ; \
# ld -o xm-dcl -bI:/lib/syscalls.exp dcl $(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/stub-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MOTIFLIB) $(MALLOCOBJS) $(XTLIB) $(XLIB) -lm -lld -lbsd
ucl.clim: stub-x.o stub-xt.o stub-motif.o xlibsupport.o xtsupport.o MyDrawingA.o $(MALLOCOBJS)
cd $(CL_SRC) ; /bin/mv ucl ucl.climsave ; /bin/mv dcl dcl.climsave ;\
make ucl_xtras='$(PWD)/stub-x.o $(PWD)/clim-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MOTIFLIB) $(MALLOCOBJS) $(XTLIB) $(XLIB) $(XMDCLXTRAS)' ucl ;\
make stubs=$(stubs) user_objects='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/stub-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(MOTIFLIB) $(MOTIFXTRAOS) $(MALLOCOBJS) $(XTLIB) $(XLIB) $(XMDCLXTRAS)' ucl ;\
/bin/mv ucl ucl.clim ; /bin/mv ucl.climsave ucl ; /bin/mv dcl.climsave dcl
dcl :
......
# $fiHeader: Makefile.hp700,v 1.2 93/05/13 16:22:43 cer Exp $
#
# Makefile.rs6000 for CLIM 2.0
#
include Makefile.defs
Makefile=Makefile.rs6000
CL=/usr/fi/dcl-devel
CFLAGS = -O -D_BSD -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void
#
MOTIFLIB=-lXm
MOTIFLIB_d=-lXm
XTLIB=-lXt
XLIB=-lX11
XINCLUDES= -I/usr/include -I/usr/include/Xm
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)
# To keep make from complaining about syntax:
MAIN_OBJ = mainxm.o
stubs = c2stubs
include Makefile.generic
......@@ -7,7 +7,8 @@ Makefile=Makefile.sgi4d-svr4
MOTIFHOME=
MOTIFLIB=
MOTIFLIB_d=$(MOTIFHOME)/usr/lib/libXm.a
XLIB=$(MOTIFHOME)/usr/lib/libX11$(DEBUGLIB).a
XLIB=$(MOTIFHOME)/usr/lib/libX11$(DEBUGLIB)_s.a
MAINOBJXLIB=
XTLIB=$(MOTIFHOME)/usr/lib/libXt$(DEBUGLIB).a
XINCLUDES=-I$(MOTIFHOME)/usr/include
XMINCLUDES=-I$(MOTIFHOME)/usr/include
......
......@@ -8,10 +8,11 @@ MOTIFHOME=/net/vapor/3rd/motif-1.2.2-sol2/ICS/Motif
MOTIFLIB=$(MOTIFHOME)/usr/lib/libXm$(DEBUGLIB).a
MOTIFLIB_d=$(MOTIFHOME)/usr/lib/libXm.a
XLIB=$(MOTIFHOME)/usr/lib/libX11$(DEBUGLIB).a
MAINOBJXLIB=$(XLIB)
XTLIB=$(MOTIFHOME)/usr/lib/libXt$(DEBUGLIB).a
XINCLUDES=-I$(MOTIFHOME)/usr/include
XMINCLUDES=-I$(MOTIFHOME)/usr/include
MOTIFXTRAOS=
MOTIFXTRAOS=-lgen
XTSUPPORTINCLUDES=-I/net/vapor/x11/R5/src/mit/lib/Xt
......
......@@ -16,7 +16,7 @@
dynamic-extent
#-(or Allegro Lucid) non-dynamic-extent)
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(:shadowing-import-from clim-utils
with-slots))
......@@ -14,7 +14,7 @@
defun
flet labels
defgeneric defmethod
#+(and allegro (or :rs6000 (not (version>= 4 1)))) with-slots
#+(and allegro (not (version>= 4 1))) with-slots
dynamic-extent non-dynamic-extent)
(:export
......@@ -30,7 +30,7 @@
defun
flet labels
defgeneric defmethod
#+(and allegro (or :rs6000 (not (version>= 4 1)))) with-slots
#+(and allegro (not (version>= 4 1))) with-slots
dynamic-extent non-dynamic-extent))
......@@ -43,6 +43,6 @@
defun
flet labels
defgeneric defmethod
#+(and allegro (or :rs6000 (not (version>= 4 1)))) with-slots
#+(and allegro (not (version>= 4 1))) with-slots
dynamic-extent non-dynamic-extent))
;; -*- mode: common-lisp; package: system -*-
;;
;; -[Fri Apr 16 11:55:04 1993 by layer]-
;; -[Sun Jun 5 10:03:07 1994 by duane]-
;;
;; copyright (c) 1991 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -30,8 +30,8 @@
#-svr4
(progn
(defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
(defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a"))
(defvar sys::*libx11-pathname* "c")
(defvar sys::*libxt-pathname* "c"))
(load-application (require :climxm) :devel system::*devel*)
......
......@@ -16,7 +16,7 @@
dynamic-extent
#-(or Allegro Lucid) non-dynamic-extent)
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(:shadowing-import-from clim-utils
with-slots))
......
;; -*- mode: common-lisp; package: tk -*-
;;
;; -[Tue Jul 6 22:42:47 1993 by layer]-
;; -[Sun Jun 5 21:07:00 1994 by duane]-
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved.
......@@ -25,10 +25,10 @@
(in-package :tk)
(defun get-foreign-variable-value (x)
(let ((ep #+hpprism (ff:get-extern-data-address x)
#-hpprism (ff:get-entry-point
(let ((ep #-svr4 (ff:get-extern-data-address x)
#+svr4 (ff:get-entry-point
x
#+svr4 :note-shared-library-references #+svr4 nil)))
:note-shared-library-references nil)))
(unless ep (error "Entry point ~S not found" x))
(class-array ep 0)))
......@@ -220,7 +220,8 @@
(defun define-toolkit-classes (&rest classes)
(make-classes
(mapcar #'ff:convert-to-lang
(mapcar #-rs6000 #'ff:convert-to-lang
#+rs6000 #'identity
(remove-duplicates
(apply #'append classes)
:test #'string=))))
......
......@@ -86,7 +86,7 @@
;;; Go through this rigamarole because WITH-SLOTS doesn't accept declarations
;;; on old versions of Lucid and Franz Allegro
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(lisp:defun slot-value-alist (body)
(declare (values real-body alist))
(let ((alist nil))
......@@ -102,19 +102,19 @@
(dolist (var vars)
(push (cons var type) alist)))))))
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(defparameter *with-slots*
#+PCL 'pcl::with-slots
#+(and Allegro (or :rs6000 (not (version>= 4 1)))) 'clos::with-slots
#-(or (and Allegro (or :rs6000 (not (version>= 4 1)))) PCL) 'clos:with-slots)
#+(and Allegro (not (version>= 4 1))) 'clos::with-slots
#-(or (and Allegro (not (version>= 4 1))) PCL) 'clos:with-slots)
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(defparameter *slot-value*
#+PCL 'pcl::slot-value
#+(and Allegro (or :rs6000 (not (version>= 4 1)))) 'clos::slot-value
#-(or (and Allegro (or :rs6000 (not (version>= 4 1)))) PCL) 'clos:slot-value)
#+(and Allegro (not (version>= 4 1))) 'clos::slot-value
#-(or (and Allegro (not (version>= 4 1))) PCL) 'clos:slot-value)
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(defmacro with-slots (slot-entries instance-form &body body &environment environment)
(multiple-value-bind (real-body alist) (slot-value-alist body)
(let ((expansion (macroexpand `(,*with-slots* ,slot-entries ,instance-form
......
......@@ -583,7 +583,7 @@
(copy-list list)
list))
#+(and (target-class r t) (version>= 4 1))
#+(and (target-class r) (version>= 4 1))
(defun-inline evacuate-list (list)
(if (comp::ll :<u (comp::ll :register :stack-pointer) list)
(copy-list list)
......@@ -595,10 +595,11 @@
#+(version>= 4 2 7)
(defun-inline evacuate-list (list)
;; the HP's stack grows toward higher memory
(if (excl::stack-allocated-p list)
(copy-list list)
list))
;; the HP's stack grows toward higher memory
(if (and (consp list)
(excl::stack-allocated-p list))
(copy-list list)
list))
) ;#+Allegro
......@@ -1021,7 +1022,7 @@
(setf (gethash symbol table) value))
value)
#-(or Genera (and ansi-90 (not (and Allegro (or :rs6000 (not (version>= 4 1)))))))
#-(or Genera (and ansi-90 (not (and Allegro (not (version>= 4 1))))))
(defmacro define-compiler-macro (name lambda-list &body body &environment env)
env
#+Allegro `(excl::defcmacro ,name ,lambda-list ,@body)
......
......@@ -3067,10 +3067,10 @@
;; Older versions of Lucid and Allegro don't hack declarations properly
;; for WITH-SLOTS
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(:shadow
with-slots)
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(:export
with-slots)
......@@ -3374,7 +3374,7 @@
dynamic-extent
#-(or Allegro Lucid) non-dynamic-extent)
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(:shadowing-import-from clim-utils
with-slots)
......@@ -3623,7 +3623,7 @@
dynamic-extent
#-(or Allegro Lucid) non-dynamic-extent)
#+(and Allegro (or :rs6000 (not (version>= 4 1))))
#+(and Allegro (not (version>= 4 1)))
(:shadowing-import-from clim-utils
with-slots))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment