From e647e2a6976c5ee2ba422b657783bfc7af6b6840 Mon Sep 17 00:00:00 2001
From: layer <layer>
Date: Tue, 31 Aug 1993 04:55:19 +0000
Subject: [PATCH] see changelog entry for Thu Aug 12 12:01:08 1993

---
 ChangeLog.n           | 34 +++++++++++++++++++++++++++++++
 Makefile.cobjs-svr4   |  6 ++----
 Makefile.defs         |  9 ++++++---
 Makefile.generic      | 27 ++++++++++++++++++++++++-
 Makefile.sun4-svr4    | 47 +++++++++++++++++++++++++++++++++++++++++++
 misc/dev-load-1.lisp  | 17 ++++++++--------
 misc/train.lisp       | 34 ++++++++++++++++++++++---------
 test/test-driver.lisp | 11 +++++++---
 tk-silica/pkg.lisp    |  9 +++++----
 tk/event.lisp         |  4 ++--
 tk/pkg.lisp           |  3 ++-
 utils/processes.lisp  |  7 ++++++-
 xlib/pkg.lisp         |  3 ++-
 13 files changed, 173 insertions(+), 38 deletions(-)
 create mode 100644 Makefile.sun4-svr4

diff --git a/ChangeLog.n b/ChangeLog.n
index d6a09473..462412e5 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -1,3 +1,37 @@
+Thu Aug 12 12:01:08 1993  Kevin Layer  (layer@sole)
+
+	* Makefile.cobjs-svr4: make sure setup_LLP exists before using it.
+
+	* Makefile.defs: add TRAIN_PROFILEP, TMP=/usr/tmp
+
+	* Makefile.generic: new rules (used by make-dist) train-xm and
+	train-ol
+
+	* Makefile.sun-sun4: renamed from Makefile.svr4
+
+	* misc/devl-load-1.lisp: load-it now takes a keyword argument:
+	load-composer (used by make-dist); fix name of clos preload file
+	to be the same as the one make-dist creates (so if the training is
+	run, then make-dist will use the `better' one).
+
+	* misc/train.lisp: compile test/test-suite only if needed, and do
+	it with :print nil and :vervose t (instead of both t); don't do
+	generate-coverate-report unless fboundp.  Remove clos-preload files
+	before starting.
+
+	* test/test-driver.lisp: print test report to *error-output* so
+	make-dist can segregate it from the rest of the test output
+
+	* tk/pkg.lisp: add in-package (so don't get a compiler warning)
+
+	* tk-silica/pkg.lisp: fix defpackage (use keywords instead of
+	symbols in whatever package is current); add in-package
+
+	* xlib/pkg.lisp: add in-package
+
+	* utils/processes.lisp: require :mdproc and :process
+
+*******************************************************************************
 Mon Aug 16 15:15:00 1993  Steven Haflich
 
 	* clim/ptypes1.lisp:
diff --git a/Makefile.cobjs-svr4 b/Makefile.cobjs-svr4
index 283f879d..9471bdf3 100644
--- a/Makefile.cobjs-svr4
+++ b/Makefile.cobjs-svr4
@@ -1,14 +1,12 @@
 # $fiHeader: Makefile.cobjs-svr4,v 1.1 93/04/16 09:26:11 layer Exp $
 
 climol.so:	xlibsupport.o xtsupport.o olsupport.o
-	(eval `$(setup_LLP) openlook`; \
-	 echo LD_LIBRARY_PATH is $$LD_LIBRARY_PATH; \
+	(test -f $(setup_LLP) && eval `$(setup_LLP) openlook`; \
 	 ld -G -o climol.so xlibsupport.o xtsupport.o olsupport.o \
 		-lXol -lXt -lX11)
 
 climxm.so:	xlibsupport.o xtsupport.o MyDrawingA.o
-	(eval `$(setup_LLP) motif`; \
-	 echo LD_LIBRARY_PATH is $$LD_LIBRARY_PATH; \
+	(test -f $(setup_LLP) && eval `$(setup_LLP) motif`; \
 	 ld -G -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \
 		-lXm -lXt -lX11 -lgen)
 
diff --git a/Makefile.defs b/Makefile.defs
index 922d1f65..a969f056 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -14,7 +14,9 @@ RM	= /bin/rm
 CAT	= /bin/cat
 ECHO	= /bin/echo
 TAGS	= /usr/fi/lib/emacs/etc/etags
-TMP	= /tmp
+# /tmp is either on /usr (in which case it points to /usr/tmp) or is on the
+# root filesystem, which is probably really small.  So, use /usr/tmp.
+TMP	= /usr/tmp
 MV	= /usr/fi/mv-nfs
 
 # If you try and execute this as the -f argument to `make', then you forgot
@@ -29,18 +31,19 @@ TRAIN_TIMES=1
 PSVIEW=:file
 HPGLVIEW=:file
 TRAIN_COMPILE=t
+TRAIN_PROFILEP=t
 
 FRAME_TESTS=t
 
 TRAIN_LISP= \
 	(load \"misc/train.lisp\") \
 	(train-clim :frame-tests $(FRAME_TESTS) :train-times $(TRAIN_TIMES)\
-		:compile $(TRAIN_COMPILE) :psview $(PSVIEW) :hpglview $(HPGLVIEW)) \
-	(exit 0)
+		:profilep $(TRAIN_PROFILEP) :compile $(TRAIN_COMPILE) :psview $(PSVIEW) :hpglview $(HPGLVIEW))
 
 TRAIN_TEXT = \
 	$(ECHO) "\
 	$(TRAIN_LISP) \
+	(exit 0) \
 " | $(CLIM) $(CLOPTS) -batch \
 	; echo CLIM trained!!!!	
 
diff --git a/Makefile.generic b/Makefile.generic
index 2eae96b3..3ffc2672 100644
--- a/Makefile.generic
+++ b/Makefile.generic
@@ -190,6 +190,31 @@ clim-small:	FORCE
 train	:	FORCE
 	$(TRAIN_TEXT)
 
+# the following two rules are used by make-dist so that we don't have 
+# to build a slim image to run the test suite
+
+train-xm:	FORCE
+	$(ECHO) " \
+	(setq sys::*libxt-pathname* \"$(XTLIB)\") \
+	(setq sys::*libx11-pathname* \"$(XLIB)\") \
+        (setq sys::*clim-motif-pathname* \"clim-motif$(DEBUGLIB).o\") \
+	(load \"misc/dev-load-1.lisp\") \
+	(load-it 'motif-clim :load-composer nil) \
+	$(TRAIN_LISP) \
+	(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
+	   $(CL) $(CLOPTS) -batch
+
+train-ol:	FORCE
+	$(ECHO) " \
+	(setq sys::*libxt-pathname* \"$(OLXTLIB)\") \
+	(setq sys::*libx11-pathname* \"$(OLXLIB)\") \
+        (setq sys::*clim-olit-pathname* \"clim-olit$(DEBUGLIB).o\") \
+	(load \"misc/dev-load-1.lisp\") \
+	(load-it 'openlook-clim :load-composer nil) \
+	$(TRAIN_LISP) \
+	(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
+	   $(CL) $(CLOPTS) -batch
+
 generate_test_report:
 	@$(ECHO) "\
 	(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\") \
@@ -213,7 +238,7 @@ testps :
 "  | $(CLIM) $(CLOPTS) -batch
 
 echo-train:
-	-$(ECHO) "$(TRAIN_LISP)"
+	-$(ECHO) "$(TRAIN_LISP)(exit 0)"
 
 # Misc
 
diff --git a/Makefile.sun4-svr4 b/Makefile.sun4-svr4
new file mode 100644
index 00000000..edf34b86
--- /dev/null
+++ b/Makefile.sun4-svr4
@@ -0,0 +1,47 @@
+# $fiHeader: Makefile.svr4,v 1.3 1993/05/13 16:22:49 cer Exp $
+
+include Makefile.defs
+
+Makefile=Makefile.sun4-svr4
+
+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 
+XTLIB=$(MOTIFHOME)/usr/lib/libXt$(DEBUGLIB).a
+XINCLUDES=-I$(MOTIFHOME)/usr/include
+XMINCLUDES=-I$(MOTIFHOME)/usr/include
+MOTIFXTRAOS=
+
+XTSUPPORTINCLUDES=-I/net/vapor/x11/R5/src/mit/lib/Xt
+
+OPENLOOKHOME=/usr/openwin
+OLXLIB= $(OPENLOOKHOME)/lib/libX11.a
+OLXTLIB=$(OPENLOOKHOME)/lib/libXt.a
+OLINCLUDES=-I$(OPENLOOKHOME)/include
+
+###############################################################################
+setup_LLP = /net/vapor/scm/bin/setup_LLP
+
+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)
+
+PWD = .
+###############################################################################
+
+include Makefile.generic
diff --git a/misc/dev-load-1.lisp b/misc/dev-load-1.lisp
index 5b89daa4..f6692ef0 100644
--- a/misc/dev-load-1.lisp
+++ b/misc/dev-load-1.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: user -*-
 ;;
-;;				-[Mon Jul 26 16:54:26 1993 by colin]-
+;;				-[Thu Aug 12 11:35:05 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.
@@ -35,7 +35,7 @@
        (load "sys/defsystem"))
      (load "sys/sysdcl")))
 
-(defun load-it (sys)
+(defun load-it (sys &key (load-composer t))
   (let ((*load-source-file-info* t)
 	(*record-source-file-info* t)
 	(*load-xref-info* nil)
@@ -62,10 +62,11 @@
 
      (load "postscript/sysdcl")
      (load "demo/sysdcl")
-     
-     (ignore-errors 
-       (tenuring 
-	(require :composer)))
+
+     (when load-composer
+       (ignore-errors 
+	(tenuring 
+	 (require :composer))))
 
      (progn
        (load "test/testdcl")
@@ -84,6 +85,6 @@
      
      (ignore-errors
       (load (case sys
-	      (motif-clim "misc/clos-preloadxm.fasl")
-	      (openlook-clim "misc/clos-preloadol"))
+	      (motif-clim "climxm-preload.fasl")
+	      (openlook-clim "climol-preload.fasl"))
 	    :if-does-not-exist nil)))))
diff --git a/misc/train.lisp b/misc/train.lisp
index d4897dcc..ae8df173 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]-
+;;				-[Fri Aug 20 07:36:40 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.
@@ -37,7 +37,8 @@
 					     "test-suite-reportxm.lisp"
 					   "test-suite-reportol.lisp"))
     (when compile
-      (load (compile-file "test/test-suite")))
+      (compile-file-if-needed "test/test-suite" :print nil :verbose t))
+    (load "test/test-suite.fasl")
     (clim-user::train-clim-2 train-times) 
     (when frame-tests
       (clim-user::do-frame-tests errorp))
@@ -51,11 +52,12 @@
       (load "test/hpgl-tests.lisp")
       (clim-user::run-hpgl-tests :output hpglview)))
   
-  (with-open-file (*standard-output* (if (excl::featurep :clim-motif) 
-					     "coverage-reportxm.lisp"
-					   "coverage-reportol.lisp")
-		   :if-exists :supersede :direction :output)
-    (generate-coverage-report :files (known-clim2-files)))
+  (when (fboundp 'generate-coverage-report)
+    (with-open-file (*standard-output* (if (excl::featurep :clim-motif) 
+					   "coverage-reportxm.lisp"
+					 "coverage-reportol.lisp")
+		     :if-exists :supersede :direction :output)
+      (generate-coverage-report :files (known-clim2-files))))
 
   ;; We have to do this here because profiling clears the call counts.
   
@@ -65,12 +67,24 @@
 
   (when benchmarkp 
     (clim-user::benchmark-clim))
-  
+
+  ;; delete the preload fasls for the type of clim we are testing, so that
+  ;; make-dist cat use the one we will make.
+  (let ((xx (if* (excl::featurep :clim-motif) 
+	       then "xm"
+	       else "ol")))
+    (dolist (file-format '("clim~a-preload.fasl"
+			   "clim~a-preload.fasl.Z"
+			   "clim~a-preload.fasl.z"
+			   "clim~a-preload.fasl.gz"))
+      (handler-case (delete-file (format nil file-format xx))
+	(error () nil))))
+
   (compile-file "misc/clos-preload.cl" 
 		:output-file 
 		(if (excl::featurep :clim-motif) 
-		    "misc/clos-preloadxm.fasl" 
-		  "misc/clos-preloadol.fasl")))
+		    "climxm-preload.fasl" 
+		  "climol-preload.fasl")))
 
 
 
diff --git a/test/test-driver.lisp b/test/test-driver.lisp
index 88fb796c..702c826d 100644
--- a/test/test-driver.lisp
+++ b/test/test-driver.lisp
@@ -366,15 +366,20 @@
 	       (set-difference failures expected-failures))
 	      (unexpected-successes 
 	       (intersection successes expected-failures)))
-	  (format t "~D CLIM 2.0 tests succeeded~%~D CLIM 2.0 tests failed~%"
+	  ;; use *error-output* so it goes to stderr and is seen even
+	  ;; though make-dist redirects stdout to a file
+	  (format *error-output*
+		  "~D CLIM 2.0 tests succeeded~%~D CLIM 2.0 tests failed~%"
 		  (length successes) (length failures))
 	  (when unexpected-failures
-	    (format t "~D CLIM 2.0 tests failed unexpectedly:~{~20t~A~%~}~%"
+	    (format *error-output*
+		    "~D CLIM 2.0 tests failed unexpectedly:~{~20t~A~%~}~%"
 		    (length unexpected-failures)
 		    unexpected-failures))
 	
 	  (when unexpected-successes
-	    (format t "~D tests succeeded unexpectedly: ~{~20t~A~%~}~%"
+	    (format *error-output*
+		    "~D tests succeeded unexpectedly: ~{~20t~A~%~}~%"
 		    (length unexpected-successes)
 		    unexpected-successes)))))))
 
diff --git a/tk-silica/pkg.lisp b/tk-silica/pkg.lisp
index b4cb470a..5831fd9d 100644
--- a/tk-silica/pkg.lisp
+++ b/tk-silica/pkg.lisp
@@ -20,10 +20,10 @@
 ;;
 ;; $fiHeader: pkg.lisp,v 1.9 93/04/02 18:41:09 cer Exp $
 
-(defpackage tk-silica
-  (:nicknames xm-silica xt-silica)
-  (:use clim-lisp clim-utils clim silica tk)
-  (:import-from excl #:if*)
+(defpackage :tk-silica
+  (:nicknames :xm-silica :xt-silica)
+  (:use :clim-lisp :clim-utils :clim :silica :tk)
+  (:import-from :excl #:if*)
   (:export
    ;; Motif 
  
@@ -59,3 +59,4 @@
    
    ))
 
+(in-package :tk-silica)
diff --git a/tk/event.lisp b/tk/event.lisp
index 6ffa673c..34be364f 100644
--- a/tk/event.lisp
+++ b/tk/event.lisp
@@ -1,6 +1,6 @@
- ;; -*- mode: common-lisp; package: tk -*-
+;; -*- mode: common-lisp; package: tk -*-
 ;;
-;;				-[]-
+;;				-[Fri Aug 20 18:53:50 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.
diff --git a/tk/pkg.lisp b/tk/pkg.lisp
index c89540cc..929ed165 100644
--- a/tk/pkg.lisp
+++ b/tk/pkg.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: cl-user -*-
 ;;
-;;				-[]-
+;;				-[Thu Aug 12 09:55:10 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.
@@ -50,3 +50,4 @@
    #:window-property-list
    ))
 
+(in-package :tk)
diff --git a/utils/processes.lisp b/utils/processes.lisp
index 98c99a2d..22f5ddef 100644
--- a/utils/processes.lisp
+++ b/utils/processes.lisp
@@ -6,7 +6,12 @@
 
 "Copyright (c) 1990, 1991, 1992 Symbolics, Inc.  All rights reserved.
  Portions copyright (c) 1988, 1989, 1990 International Lisp Associates.
- Portions copyright (c) 1992 Franz, Inc."
+ Portions copyright (c) 1992, 1993 Franz, Inc."
+
+#+allegro
+(eval-when (compile load eval)
+  (require :mdproc)
+  (require :process))
 
 ;;; Locks
 
diff --git a/xlib/pkg.lisp b/xlib/pkg.lisp
index 0a2da901..e0bdfab4 100644
--- a/xlib/pkg.lisp
+++ b/xlib/pkg.lisp
@@ -627,5 +627,6 @@
 	   #:xwmhints-window-group #:xwritebitmapfile #:xybitmap #:xypixmap
 	   #:ysorted #:yxbanded #:yxsorted #:zoomstate #:zpixmap
 	   #:xiconifywindow)
-      )
+  )
 
+(in-package :x11)
-- 
GitLab