Skip to content
Browse files

MIT R5.0, ACL #4

  • Loading branch information...
1 parent 27931a0 commit 690bbc252c90ca1efe9b1548efeeda4b7f50e506 layer committed Oct 20, 1997
Showing with 93 additions and 32 deletions.
  1. +17 −0 ChangeLog
  2. +53 −28 Makefile
  3. +1 −1 clx.cl
  4. +2 −0 depdefs.cl
  5. +14 −1 dependent.cl
  6. +4 −0 excldep.cl
  7. +2 −2 text.cl
View
17 ChangeLog
@@ -1,3 +1,20 @@
+*******************************************************************************
+<version for this commit> (incf the #n in clx.cl each commit)
+
+<standard changelog date stamp>
+ * <changes go here...>
+
+*******************************************************************************
+MIT R5.0, ACL #4
+
+Mon Oct 20 12:51:01 1997 Kevin Layer <layer@ultra>
+
+ * Makefile: local names variables; distribution prep stuff
+ * depdefs.cl: get rid of compile time warning
+ * dependent.cl: fix host-address to use socket package
+ * excldep.cl: get rid of compile time warnings
+ * text.cl: get rid of compile time warnings
+
Wed Oct 01 17:56:10 1997 Tom McClure <tomj@falcon>
* new file makeclx.cl to build on NT
View
81 Makefile
@@ -1,22 +1,31 @@
-#
+# $Id: Makefile,v 1.13 1997/10/20 22:51:39 layer Exp $
# Makefile for CLX
-# (X11 R4.4 release, Franz Allegro Common Lisp version)
-#
+
+# For versions prior to ACL 5.0 (and 4.3.2 on Windows), comment out the
+# following line:
+SAVEIMG = yes
# *************************************************************************
# * Change the next line to point to where you have Common Lisp installed *
# * (make sure the Lisp doesn't already have CLX loaded in) *
# *************************************************************************
-CL = ../src/lisp -I ../src/dcl.dxl
+ifdef SAVEIMG
+CL = ../src/lisp -I ../src/dcl.dxl
+# Name of dumped lisp
+CLX = clx.dxl
+DUMPLISP_ARGS =
+else
+CL = ../src/dcl
+# Name of dumped lisp
+CLX = clx
+DUMPLISP_ARGS = :checkpoint nil
+endif
SHELL = /bin/sh
ECHO = /bin/echo
MV = /usr/fi/mv-nfs -c
TAGS = /usr/local/lib/emacs/etc/etags
-# Name of dumped lisp
-CLX = clx.dxl
-
CLOPTS = -qq
# Use this one for Silicon Graphics & Mips Inc MIPS based machines
@@ -28,14 +37,20 @@ CLOPTS = -qq
CFLAGS = -O -DUNIXCONN $(XCFLAGS)
-# Lisp optimization for compiling
-SPEED = 3
-SAFETY = 0
-DEBUG = 1
-RECORD_XREF_INFO = nil
-RECORD_SOURCE_FILE_INFO = nil
-LOAD_XREF_INFO = nil
-LOAD_SOURCE_FILE_INFO = nil
+# compile options:
+SPEED = 3
+SAFETY = 0
+DEBUG = 1
+RECORD_XREF_INFO = nil
+RECORD_SOURCE_FILE_INFO = nil
+SAVE_LOCAL_NAMES = nil
+LOAD_XREF_INFO = nil
+LOAD_SOURCE_FILE_INFO = nil
+LOAD_LOCAL_NAMES_INFO = nil
+gc_print = nil
+compile_verbose = t
+compile_print = nil
+redef_warning = t
C_SRC = excldep.c socket.c
C_OBJS = excldep.o socket.o
@@ -60,8 +75,8 @@ L_SRC = defsystem.cl package.cl excldep.cl depdefs.cl clx.cl \
manager.cl image.cl resource.cl
PICFLAGS = -K pic
-SHAREFLAGS = -G
-MAKE_SHARED = ld
+SHAREFLAGS =
+MAKE_SHARED = ld -G
IMPORTS =
# default and aliases
@@ -131,30 +146,37 @@ compile-no-clos-CLX: $(C_OBJS)
(debug $(DEBUG)))) \
(let ((*record-source-file-info* $(RECORD_SOURCE_FILE_INFO)) \
(*load-source-file-info* $(LOAD_SOURCE_FILE_INFO)) \
+ (*load-local-names-info* $(LOAD_LOCAL_NAMES_INFO)) \
(*record-xref-info* $(RECORD_XREF_INFO)) \
(*load-xref-info* $(LOAD_XREF_INFO)) \
- (*compile-verbose* t) \
- (*compile-print* nil)) \
+ (comp::save-local-names-switch $(SAVE_LOCAL_NAMES)) \
+ (*compile-print* $(compile_print)) \
+ (*compile-verbose* $(compile_verbose))) \
+ (setf (sys:gsgc-switch :print) $(gc_print)) \
(compile-system :clx) \
(compile-system :clx-debug))" | $(CL) $(CLOPTS) -batch
compile-partial-clos-CLX: $(C_OBJS)
- $(ECHO) "(ff:get-entry-point (ff:convert-to-lang \"fd_wait_for_input\")) \
+ $(ECHO) "#-mswindows (ff:get-entry-point (ff:convert-to-lang \"fd_wait_for_input\")) \
(pushnew :clx-ansi-common-lisp *features*) \
(load-logical-pathname-translations \"clx\") \
(load \"defsystem\") \
(load \"package\") \
- (setq xlib::*def-clx-class-use-defclass* '(xlib:window xlib:pixmap xlib:drawable)) \
+ (setq xlib::*def-clx-class-use-defclass* \
+ '(xlib:window xlib:pixmap xlib:drawable)) \
(proclaim '(optimize \
(safety $(SAFETY)) \
(speed $(SPEED)) \
(debug $(DEBUG)))) \
(let ((*record-source-file-info* $(RECORD_SOURCE_FILE_INFO)) \
(*load-source-file-info* $(LOAD_SOURCE_FILE_INFO)) \
+ (*load-local-names-info* $(LOAD_LOCAL_NAMES_INFO)) \
(*record-xref-info* $(RECORD_XREF_INFO)) \
(*load-xref-info* $(LOAD_XREF_INFO)) \
- (*compile-verbose* t) \
- (*compile-print* nil)) \
+ (comp::save-local-names-switch $(SAVE_LOCAL_NAMES)) \
+ (*compile-verbose* $(compile_verbose)) \
+ (*compile-print* $(compile_print))) \
+ (setf (sys:gsgc-switch :print) $(gc_print)) \
(compile-system :clx) \
(compile-system :clx-debug))" | $(CL) $(CLOPTS) -batch -backtrace-on-error
@@ -170,23 +192,26 @@ compile-full-clos-CLX: $(C_OBJS)
(debug $(DEBUG)))) \
(let ((*record-source-file-info* $(RECORD_SOURCE_FILE_INFO)) \
(*load-source-file-info* $(LOAD_SOURCE_FILE_INFO)) \
+ (*load-local-names-info* $(LOAD_LOCAL_NAMES_INFO)) \
(*record-xref-info* $(RECORD_XREF_INFO)) \
(*load-xref-info* $(LOAD_XREF_INFO)) \
- (*compile-verbose* t) \
- (*compile-print* nil)) \
+ (comp::save-local-names-switch $(SAVE_LOCAL_NAMES)) \
+ (*compile-print* $(compile_print)) \
+ (*compile-verbose* $(compile_verbose))) \
+ (setf (sys:gsgc-switch :print) $(gc_print)) \
(compile-system :clx) \
(compile-system :clx-debug))" | $(CL) $(CLOPTS) -batch
cat:
- -cat $(L_NOMACROS_OBJS) > CLX.fasl
+ -cat $(L_NOMACROS_OBJS) > bigclx.fasl
load-CLX:
$(ECHO) "\
(load-logical-pathname-translations \"clx\") \
(load-application \
(progn (load \"defsystem\") (load-system :clx)) \
:global-gc t :devel nil)" \
- '(dumplisp :name "$(CLX)" :checkpoint nil)' \
+ '(dumplisp :name "$(CLX)" $(DUMPLISP_ARGS))' \
"(exit)" | $(CL) $(CLOPTS)
clean_OS:
@@ -205,7 +230,7 @@ install_OS:
fi
install: install_OS
- $(MV) CLX.fasl $(DEST)/clx.fasl
+ $(MV) bigclx.fasl $(DEST)/clx.fasl
tags:
$(TAGS) $(L_SRC) $(C_SRC)
View
2 clx.cl
@@ -83,7 +83,7 @@
(pushnew :clx *features*)
(pushnew :xlib *features*)
-(defparameter *version* "MIT R5.0 (Franz ACL4.2 (CLX #3))")
+(defparameter *version* "MIT R5.0, ACL #4")
(pushnew :clx-mit-r4 *features*)
(pushnew :clx-mit-r5 *features*)
View
2 depdefs.cl
@@ -180,7 +180,9 @@
(deftype overlap32 () '(unsigned-byte 32))
)
+(eval-when (compile eval load)
(deftype buffer-bytes () `(simple-array (unsigned-byte 8) (*)))
+)
#+clx-overlapping-arrays
(progn
View
15 dependent.cl
@@ -2198,7 +2198,7 @@
;; HOST hacking
;;-----------------------------------------------------------------------------
-#-(or explorer Genera Minima)
+#-(or explorer Genera Minima (and allegro (version>= 5 0)))
(defun host-address (host &optional (family :internet))
;; Return a list whose car is the family keyword (:internet :DECnet :Chaos)
;; and cdr is a list of network address bytes.
@@ -2208,6 +2208,19 @@
host family
(error "HOST-ADDRESS not implemented yet."))
+#+(and allegro (version>= 5 0))
+(eval-when (compile eval load) (require :socket))
+
+#+(and allegro (version>= 5 0))
+(defun host-address (host &optional (family :internet))
+ (ecase family
+ (:internet
+ (values-list
+ (cons :internet
+ (multiple-value-list
+ (socket::ipaddr-to-dotted (socket::lookup-hostname host)
+ :values t)))))))
+
#+explorer
(defun host-address (host &optional (family :internet))
;; Return a list whose car is the family keyword (:internet :DECnet :Chaos)
View
4 excldep.cl
@@ -132,3 +132,7 @@
:callback nil
:allow-other-keys t
:arguments (fixnum fixnum))))
+
+(eval-when (compile)
+ (declaim (declaration buffer-bytes))
+ )
View
4 text.cl
@@ -31,8 +31,8 @@
;; returned.
(deftype translation-function ()
- #+explorer t
- #-explorer
+ #+(or allegro explorer) t
+ #-(or allegro explorer)
'(function (sequence array-index array-index (or null font) vector array-index)
(values array-index (or null int16 font) (or null int32))))

0 comments on commit 690bbc2

Please sign in to comment.
Something went wrong with that request. Please try again.