Commit 52d09d3e authored by Pascal J. Bourguignon's avatar Pascal J. Bourguignon

Added #+asdf3 when using uiop.

parent 39e06b09
......@@ -136,25 +136,25 @@ License:
")
(:use "COMMON-LISP"
"COM.INFORMATIMAGO.COMMON-LISP.CESARUM.UTILITY")
(:shadowing-import-from "COM.INFORMATIMAGO.MOCL.KLUDGES.MISSING"
"*TRACE-OUTPUT*"
"*LOAD-VERBOSE*"
"*LOAD-PRINT*"
"ARRAY-DISPLACEMENT"
"CHANGE-CLASS"
"COMPILE"
"COMPLEX"
"ENSURE-DIRECTORIES-EXIST"
"FILE-WRITE-DATE"
"INVOKE-DEBUGGER" "*DEBUGGER-HOOK*"
"LOAD"
"LOGICAL-PATHNAME-TRANSLATIONS"
"MACHINE-INSTANCE"
"MACHINE-VERSION"
"NSET-DIFFERENCE"
"RENAME-FILE"
"SUBSTITUTE-IF"
"TRANSLATE-LOGICAL-PATHNAME")
#+mocl (:shadowing-import-from "COM.INFORMATIMAGO.MOCL.KLUDGES.MISSING"
"*TRACE-OUTPUT*"
"*LOAD-VERBOSE*"
"*LOAD-PRINT*"
"ARRAY-DISPLACEMENT"
"CHANGE-CLASS"
"COMPILE"
"COMPLEX"
"ENSURE-DIRECTORIES-EXIST"
"FILE-WRITE-DATE"
"INVOKE-DEBUGGER" "*DEBUGGER-HOOK*"
"LOAD"
"LOGICAL-PATHNAME-TRANSLATIONS"
"MACHINE-INSTANCE"
"MACHINE-VERSION"
"NSET-DIFFERENCE"
"RENAME-FILE"
"SUBSTITUTE-IF"
"TRANSLATE-LOGICAL-PATHNAME")
(:export "PACKAGE-EXPORTS" ;; missing from CL or not?
"*PACKAGES*" "PACKAGE-PATHNAME" "LOAD-PACKAGE"
"PACKAGE-SYSTEM-DEFINITION"
......
......@@ -58,7 +58,8 @@
(cl:defpackage "COM.INFORMATIMAGO.COMMON-LISP.LISP-READER.PACKAGE"
(:use "COMMON-LISP")
(:nicknames "ZPACK")
(:shadow "SIMPLE-TYPE-ERROR")
(:shadow "SIMPLE-TYPE-ERROR"
"PRINT-NOT-READABLE" "PRINT-NOT-READABLE-OBJECT")
(:shadow . #1=("SYMBOL"
"SYMBOLP" "MAKE-SYMBOL" "SYMBOL-NAME" "SYMBOL-PACKAGE"
"SYMBOL-VALUE" "SYMBOL-FUNCTION" "SYMBOL-PLIST"
......
......@@ -74,11 +74,11 @@
(defun screen-editor (&key log)
(cond
((string= "xterm" (uiop/os:getenv "TERM"))
((string= "xterm" (getenv "TERM"))
(setf custom:*terminal-encoding* (ext:make-encoding
:charset charset:iso-8859-1
:line-terminator :unix)))
((string= "kterm" (uiop/os:getenv "TERM"))
((string= "kterm" (getenv "TERM"))
(setf custom:*terminal-encoding* (ext:make-encoding
:charset charset:utf-8
:line-terminator :unix))))
......@@ -140,8 +140,8 @@
(*query-io* (make-synonym-stream '*terminal-io*))
;; (*debug-io* (make-synonym-stream '*terminal-io*))
;; (*trace-output* (make-synonym-stream '*terminal-io*))
(old-term (uiop/os:getenv "TERM")))
(setf (uiop/os:getenv "TERM") "xterm")
(old-term (getenv "TERM")))
(setf (getenv "TERM") "xterm")
(unwind-protect
(progn (format *query-io* "~&Hello!~%")
(format *query-io* "~&X = ")
......@@ -151,7 +151,7 @@
(y-or-n-p "Happy?"))
(setf *terminal-io* old-terminal-io)
(close xterm-io)
(setf (uiop/os:getenv "TERM") old-term))))
(setf (getenv "TERM") old-term))))
;;;; THE END ;;;;
......
......@@ -2041,10 +2041,6 @@ These commands include C-@ and M-x start-kbd-macro."
(defun getenv (var)
#-asdf3 (ASDF:GETENV var)
#+asdf3 (uiop/os:getenv var))
(defun screen-editor (&key log (screen-class 'charms-screen))
(with-open-stream (*log* (typecase log
......
......@@ -32,8 +32,7 @@ to language names (as keyword).")
#+clisp (intern (string custom:*current-language*) "KEYWORD")
;; Otherwise if we have ASDF, we try to get the environment variable LANG:
#+(and (not clisp) asdf)
(let* ((lang #-asdf3 (ASDF:GETENV "LANG")
#+asdf3 (uiop/os:getenv "LANG"))
(let* ((lang (getenv "LANG"))
(entry (assoc lang *languages* :test (function string-equal))))
(if entry
(cdr entry)
......
......@@ -80,4 +80,14 @@
"Whether the function FUNCDESC is INTERACTIVE."
(gethash fundesc *interactive-decls*))
(defun getenv (var)
#+asdf3 (uiop/os:getenv var)
#-asdf3 (asdf:getenv var))
(defun (setf getenv) (new-val var)
#+asdf3 (setf (uiop/os:getenv var) new-val)
#-asdf3 (setf (asdf:getenv var) new-val))
;;;; THE END ;;;;
......@@ -35,8 +35,10 @@
;;;;**************************************************************************
(eval-when (:compile-toplevel :load-toplevel :execute)
(unless (find-package :asdf)
(defpackage :asdf (:use :cl) (:export "DEFSYSTEM"))))
(unless (find-package "ASDF")
(defpackage "ASDF" (:use "COMMON-LISP") (:export "DEFSYSTEM")))
(unless (find-package "UIOP")
(defpackage "UIOP" (:use "COMMON-LISP") (:export "SYMBOL-CALL"))))
(defpackage "COM.INFORMATIMAGO.TOOLS.ASDF-FILE"
......
......@@ -13,6 +13,9 @@
;;;;MODIFICATIONS
;;;; 2013-03-25 <PJB> Created.
;;;;BUGS
;;;;
;;;; - remove dependency on script (use uiop instead).
;;;;
;;;;LEGAL
;;;; AGPL3
;;;;
......
......@@ -39,7 +39,7 @@
:maintainer "Pascal J. Bourguignon <pjb@informatimago.com>"
:licence "AGPL3"
;; component attributes:
:version "1.0.2"
:version "1.0.3"
:properties ((#:author-email . "pjb@informatimago.com")
(#:date . "Spring 2014")
((#:albert #:output-dir) . "/tmp/documentation/com.informatimago.tools/")
......@@ -48,15 +48,15 @@
((#:albert #:docbook #:bgcolor) . "white")
((#:albert #:docbook #:textcolor) . "black"))
#+asdf-unicode :encoding #+asdf-unicode :utf-8
:depends-on #-mocl ("com.informatimago.tools.check-asdf"
:depends-on #-mocl ("com.informatimago.tools.pathname"
"com.informatimago.tools.manifest"
"com.informatimago.tools.pathname"
"com.informatimago.tools.symbol"
"com.informatimago.tools.source"
"com.informatimago.tools.summary"
"com.informatimago.tools.quicklisp"
"com.informatimago.tools.make-depends"
"com.informatimago.tools.symbol"
"com.informatimago.tools.script"
"com.informatimago.tools.quicklisp")
"com.informatimago.tools.check-asdf")
#+mocl ("com.informatimago.tools.manifest"
"com.informatimago.tools.pathname"
"com.informatimago.tools.symbol")
......
......@@ -33,17 +33,14 @@
;;;;**************************************************************************
(asdf:defsystem "com.informatimago.tools.check-asdf"
:description "Checks ASD Files and reports circular dependencies."
:author "Pascal J. Bourguignon"
:version "1.1.0"
:license "AGPL3"
:depends-on ("com.informatimago.common-lisp.cesarum"
"com.informatimago.clext"
"com.informatimago.tools.script")
:components ((:file "dependency-cycles")
(:file "check-asdf" :depends-on ("dependency-cycles"))))
(:file "asdf-file" :depends-on ("dependency-cycles" "script"))
#-abcl (:file "script")
(:file "check-asdf" :depends-on ("dependency-cycles" "asdf-file"))))
:description "Checks ASD Files and reports circular dependencies."
:author "Pascal J. Bourguignon"
:version "1.1.1"
:license "AGPL3"
:depends-on ("com.informatimago.common-lisp.cesarum"
"com.informatimago.clext"
"com.informatimago.tools.source"
#-abcl "com.informatimago.tools.script")
:components (#-abcl (:file "check-asdf" :depends-on ("script"))))
;;;; THE END ;;;;
......@@ -55,10 +55,10 @@ This system would use closer-mop which is not available on MOCL.
:depends-on ("com.informatimago.common-lisp.cesarum"
"com.informatimago.common-lisp.picture"
"com.informatimago.clext"
"com.informatimago.tools.check-asdf"
"closer-mop")
:components ((:file "source")
(:file "asdf-file" :depends-on ("source"))
(:file "dependency-cycles")
(:file "asdf-file" :depends-on ("dependency-cycles" "source"))
#-(and) (:file "analyse-patchwork")))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment