Commit 99f6534f authored by Raymond Toy's avatar Raymond Toy
Browse files

Merge branch 'rtoy-issue-80-asdfify-contribs' into 'master'

Fix #80: Convert contribs to use ASDF to load

Closes #80

See merge request !47
parents b219722a 338d8606
Pipeline #1271 passed with stage
in 10 minutes and 35 seconds
......@@ -163,19 +163,5 @@
(defmodule "asdf"
"modules:asdf/asdf")
;; Lisp-unit
(defmodule :lisp-unit
"modules:load-lisp-unit")
(defmodule "lisp-unit"
"modules:load-lisp-unit")
;; Allow user to specify "cmu-contribs" or :cmu-contribs.
(defmodule "cmu-contribs"
"modules:contrib")
(defmodule :cmu-contribs
"modules:contrib")
(defmodule :unix
"modules:load-unix")
......@@ -7,41 +7,9 @@
(ext:file-comment
"$Header: src/contrib/contrib.lisp $")
;;; Define the various contrib modules. We use defmodule for now
;;; because it's easy for the contribs.
;;; Empty for backward compatibility for users who require'd
;;; cmu-contribs to get the CMU contribs. The contribs all use asdf
;;; now, so we don't need this file to do anything.
(in-package "EXT")
(defmodule "contrib-demos"
"modules:demos/demos" "modules:demos/menu")
(defmodule "contrib-follow-mouse"
"modules:follow-mouse/follow-mouse")
(defmodule "contrib-games-feebs"
"modules:games/feebs/feebs")
(defmodule "contrib-hist"
"modules:hist/hist")
(defmodule "contrib-psgraph"
"modules:psgraph/psgraph")
;; This actually consists of several files, but compile-ops will
;; compile and load them all, so this module appears to have just the
;; one file.
(defmodule "contrib-ops"
"modules:ops/compile-ops")
(defmodule "contrib-embedded-c"
"modules:embedded-c/embedded-c")
;; Sprof really needs to be compiled, so make this module compile sprof.
(defmodule "contrib-sprof"
"modules:sprof/compile-sprof")
;; packed sse2 needs to be compiled to work.
(defmodule "contrib-packed-sse2"
"modules:packed-sse2/compile-packed-sse2")
(provide "cmu-contribs")
......@@ -7,7 +7,7 @@
(require :clx)
(defsystem :demos
(defsystem :contrib-demos
:name "demos"
:maintainer "CMU Common Lisp Group"
:licence "Public Domain"
......
......@@ -2,7 +2,7 @@
(in-package :asdf)
(defsystem :embedded-c
(defsystem :contrib-embedded-c
:name "embedded-c"
:author "Helmut Eller"
:license "Public Domain"
......
......@@ -2,12 +2,12 @@
(in-package :asdf)
(defsystem :follows-mouse
(defsystem :contrib-follows-mouse
:name "follows-mouse"
:maintainer "Todd Kaufman"
:licence "Public Domain"
:long-description "This Hemlock customization causes Hemlock's current window to be set to
whatever Hemlock window the mouse enters, except the echo area."
whatever Hemlock window the mouse enters, except the echo area.
of the X Window System."
:components
((:file "follow-mouse")))
......
......@@ -9,8 +9,10 @@
;;; feebs.
;;;
(in-package "SAMPLE-BRAINS" :use '("LISP" "FEEBS"))
(defpackage "SAMPLE-BRAINS"
(:use "LISP" "FEEBS"))
(in-package "SAMPLE-BRAINS")
;;; Experimental brain. Like the built-in conservative brain, but without the
;;; range limitation.
......
......@@ -2,9 +2,9 @@
(in-package :asdf)
(defsystem :feebs
(defsystem :contrib-games-feebs
:name "feebs"
:description "Planet of the Feebs. A somewhat educational simulation game."
:components
((:file "feebs")
(:file "brains")))
\ No newline at end of file
(:file "brains" :depends-on ("feebs"))))
......@@ -2,7 +2,7 @@
(in-package :asdf)
(defsystem :hist
(defsystem :contrib-hist
:name "hist"
:maintainer "Scott E. Fahlman"
:licence "Public Domain"
......
......@@ -23,6 +23,9 @@
;;; Dependencies: Depends only on standard Common Lisp facilities.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defpackage "HIST"
(:use "COMMON-LISP")
(in-package "HIST")
(export '(hist hist-record))
......
......@@ -2,7 +2,7 @@
(in-package :asdf)
(defsystem :ops
(defsystem :contrib-ops
:name "ops"
:licence "Public Domain"
:description "MIT Regression Tester"
......
......@@ -20,7 +20,8 @@
;;;; modules. This must be loaded first so commonlisp systems that
;;;; expand macros early have them available.
(unless (find-package "OPS") (make-package "OPS"))
(defpackage "OPS"
(:use "COMMON-LISP"))
(in-package "OPS")
......
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
(in-package :asdf)
(defsystem :contrib-packed-sse2
:name "cmu-packed-sse2"
:maintainer "Cmucl project"
:licence "Public Domain"
:long-description "Functions to work with packed SSE2 objects"
:components
((:file "packed-sse2")))
......@@ -2,7 +2,7 @@
(in-package :asdf)
(defsystem :psgraph
(defsystem :contrib-psgraph
:name "PSGrapher"
:author "Joseph Bates et al."
:licence "Public Domain"
......
......@@ -2,7 +2,7 @@
(in-package :asdf)
(defsystem :sprof
(defsystem :contrib-sprof
:name "demos"
:author "Gerd Moellmann"
:license "BSD-like"
......
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
(in-package :asdf)
(defsystem :unix
:name "cmu-unix"
:maintainer "Cmucl project"
:licence "Public Domain"
:long-description "Interface to other Unix functions"
:components
((:file
#-linux "unix"
#+linux "unix-glibc2")))
......@@ -39,6 +39,7 @@
(in-package :cmucl-test-runner)
(require :asdf)
(require :lisp-unit)
;; Be rather verbose in printing the tests
......
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