Changeset 15008


Ignore:
Timestamp:
05/16/17 20:08:44 (5 months ago)
Author:
mevenson
Message:

Normalize ASDF definitions to follow best practices

c.f. <https://gitlab.common-lisp.net/asdf/asdf/blob/master/doc/best_practices.md>

Location:
trunk/abcl
Files:
2 added
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.asd

    r14994 r15008  
    11;;; -*- Mode: LISP; Syntax: COMMON-LISP -*-
    2 
    3 (require :asdf)
    4 (in-package :asdf)
    5 
    62(defsystem abcl
    73  :version "1.5.0"
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf-tests.asd

    r14975 r15008  
    11;;;; -*- Mode: LISP -*-
    2 (in-package :cl-user)
    32
    4 (asdf:defsystem :abcl-asdf-tests
     3(defsystem abcl-asdf-tests
    54  :author "Mark Evenson"
    65  :long-description "<urn:abcl.org/release/1.5.0/contrib/abcl-asdf/test#>"
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

    r14973 r15008  
    11;;;; -*- Mode: LISP -*-
    2 (in-package :cl-user)
    3 
    4 (asdf:defsystem :abcl-asdf
     2(defsystem abcl-asdf
    53  :author "Mark Evenson"
    64  :description "Extensions to ASDF for handling Java binary artifacts."
     
    108  :components
    119  ((:module package :pathname ""
    12             :components
    13             ((:file "package")))
     10            :components ((:file "package")))
    1411   (:module base :pathname ""
    15             :components
    16             ((:file "abcl-asdf")
    17              (:file "asdf-jar"
    18                     :depends-on ("abcl-asdf"))
    19              (:file "maven-embedder"
    20                     :depends-on ("abcl-asdf" "asdf-jar")))
     12            :components ((:file "abcl-asdf")
     13                         (:file "asdf-jar"
     14                                :depends-on ("abcl-asdf"))
     15                         (:file "maven-embedder"
     16                                :depends-on ("abcl-asdf" "asdf-jar")))
    2117            :depends-on (package)))
    22   :in-order-to ((asdf:test-op (asdf:test-op abcl-asdf-tests))))
     18  :in-order-to ((test-op (test-op abcl-asdf-tests))))
    2319
  • trunk/abcl/contrib/abcl-asdf/asdf-jar.lisp

    r14967 r15008  
    5555  t)
    5656
    57 (defclass jar-file (static-file) ())
    58 
    59 (defmethod source-file-type ((c jar-file) (s module)) "jar")
     57(defclass jar-file (static-file)
     58  ((type :initform "jar")))
    6059
    6160(defmethod perform ((operation compile-op) (c jar-file))
  • trunk/abcl/contrib/abcl-introspect/abcl-introspect.asd

    r14975 r15008  
    11;;;; -*- Mode: LISP -*-
    2 (in-package :cl-user)
    3 
    4 (asdf:defsystem :abcl-introspect
     2(defsystem abcl-introspect
    53  :author "Alan Ruttenberg"
    64  :description "Introspection on compiled function to aid source location and other debugging functions."
  • trunk/abcl/contrib/asdf-jar/asdf-jar.asd

    r14975 r15008  
    11;;;; -*- Mode: LISP -*-
    2 (in-package :asdf)                     
    3 
    4 (defsystem :asdf-jar
     2(defsystem asdf-jar
    53  :author "Mark Evenson"
    64  :description "Packaging ASDF systems into jar files"
    75  :long-description "<urn:abcl.org/release/1.5.0/contrib/asdf-jar#>"
    86  :version "0.3.2"
    9   :components
    10   ((:module base :pathname "" :components
    11       ((:file "asdf-jar")
    12              (:static-file "README.markdown")))))
     7  :components ((:module base
     8                        :pathname ""
     9                        :components ((:file "asdf-jar")
     10                                     (:static-file "README.markdown")))))
  • trunk/abcl/contrib/jfli/jfli.asd

    r14975 r15008  
    1 (require :asdf)
    2 
    3 (asdf:defsystem jfli
     1;;;; -*- Mode: LISP -*-
     2(defsystem jfli
    43  :long-description "<urn:abcl.org/release/1.5.0/contrib/jfli#>"
    54  :version "0.2.0"
     
    76
    87;;; Requires integration with IntelliJ IDEA editor (free download)
    9 (asdf:defsystem jfli/intellij-tests
     8(defsystem jfli/intellij-tests
    109  :version "0.2.0"
    1110  :depends-on (jfli)
    1211  :components ((:module test
    13                        :components ((:file "yanking")))))
     12                        :components ((:file "yanking")))))
  • trunk/abcl/contrib/jss/jss-tests.asd

    r15005 r15008  
    1 (require :asdf)
    2 (in-package :cl-user)
    3 
    4 (asdf:defsystem jss-tests
     1;;;; -*- Mode: LISP -*-
     2(defsystem jss-tests
    53  :defsystem-depends-on (quicklisp-abcl
    64                         prove-asdf)
  • trunk/abcl/contrib/jss/jss.asd

    r15005 r15008  
    1 (require :asdf)
    2 (in-package :cl-user)
    3 
    4 (asdf:defsystem jss
     1;;;; -*- Mode: LISP -*-
     2(defsystem jss
    53  :author "Alan Ruttenberg, Mark Evenson"
    64  :long-description "<urn:abcl.org/release/1.5.0/contrib/jss#>"
  • trunk/abcl/contrib/mvn/jna.asd

    r14975 r15008  
    11;;;; -*- Mode: LISP -*-
    22
    3 (require :asdf)
    4 (in-package :cl-user)
    5 
    63;;;; Need to have jna.jar present for CFFI to work.
    7 (asdf:defsystem :jna
     4(defsystem jna
    85  :long-description  "<urn:abcl.org/release/1.5.0/contrib/jna#4.2.2>"
    96  :version "4.2.2"
    107  :defsystem-depends-on (jss abcl-asdf)
    118  :components ((:mvn "net.java.dev.jna/jna/4.2.2"
    12                      :alternate-uri "http://repo1.maven.org/maven2/net/java/dev/jna/jna/4.2.2/jna-4.2.2.jar"
    13                      :classname "com.sun.jna.Native")))
    14 
    15 (defmethod asdf:perform :after ((o asdf:load-op) (c (eql (asdf:find-system :jna))))
    16   (when (jss:find-java-class "com.sun.jna.Native")
    17     (provide :jna)))
     9                :alternate-uri "http://repo1.maven.org/maven2/net/java/dev/jna/jna/4.2.2/jna-4.2.2.jar"
     10                :classname "com.sun.jna.Native")))
    1811
    1912                         
  • trunk/abcl/contrib/mvn/log4j.asd

    r14975 r15008  
    11;;;; -*- Mode: LISP -*-
    2 (require :asdf)
    3 (in-package :cl-user)
    4 
    5 (asdf:defsystem :log4j
     2(defsystem log4j
    63  :defsystem-depends-on (abcl-asdf)
    74  :components ((:module log4j.jar
  • trunk/abcl/contrib/quicklisp/quicklisp-abcl.asd

    r14972 r15008  
    11;;;; -*- Mode: LISP -*-
    2 (require :asdf)
    3 
    4 (in-package :cl-user)
    5 
    6 (asdf:defsystem quicklisp-abcl
     2(defsystem quicklisp-abcl
    73  :description "Load Quicklisp from the network if it isn't already installed."
    84  :long-name "<urn:abcl.org/release/1.5.0/contrib/quicklisp-abcl#>"
    95  :version "0.5.1"
    10   :components nil)
     6  :components ((:file "quicklisp-abcl")))
    117
    12 (defvar cl-user::*quicklisp-parent-dir* (user-homedir-pathname)
    13   "Pathname reference to the parent directory of the local Quicklisp installation")
    14  
    15 (defmethod asdf:perform ((o asdf:load-op) (c (eql (asdf:find-system :quicklisp-abcl))))
    16   (let* ((setup-base (merge-pathnames "quicklisp/setup"
    17                                       cl-user::*quicklisp-parent-dir*))
    18          (setup-source (probe-file (make-pathname :defaults setup-base
    19                                                   :type "lisp")))
    20          (setup-fasl (probe-file (make-pathname :defaults setup-base
    21                                                   :type "abcl"))))
    22       (if setup-source
    23            ;;; First try loading the Quicklisp setup as compiled fasl if it exists
    24           (if setup-fasl
    25                 (handler-case
    26                     (load setup-fasl)
    27                   ;; Sometimes the fasl is invalid; if so, load source, and recompile
    28                   (error (e)
    29                     (when setup-source
    30                       (load setup-source)
    31                       (compile-file setup-source))))
    32                 ;; compilation only succeeds after QUICKLISP has been loaded fully
    33                 (when setup-source
    34                   (load setup-source)
    35                   (compile-file setup-source)))
    36           ;;; Otherwise execute the quicklisp startup sequence
    37           (progn
    38             (handler-case
    39                 (load "https://beta.quicklisp.org/quicklisp.lisp")
    40               (error (e)
    41                 (warn "Using insecure transport for remote installation of Quicklisp:~&~A~&." e)
    42                 (load "http://beta.quicklisp.org/quicklisp.lisp")))))
    43       (unless (find-package :quicklisp)
    44         (uiop:symbol-call :quicklisp-quickstart '#:install
    45                           :path (merge-pathnames "quicklisp/" cl-user::*quicklisp-parent-dir*)))))
    468
    479
  • trunk/abcl/tools/abcl-tools.asd

    r13330 r15008  
    11;;; -*- Mode: LISP; Syntax: COMMON-LISP -*-
    2 (require 'asdf)
    3 (in-package :asdf)
    4 
    5 (defsystem :abcl-tools :version "0.1.0" :components
    6            ((:module src :pathname "" :components
    7                      ((:file "digest")
    8                       (:file "code-grapher")))))
     2(defsystem abcl-tools
     3  :version "0.1.0"
     4  :components ((:module src
     5                        :pathname ""
     6                        :components ((:file "digest")
     7                                     (:file "code-grapher")))))
    98                     
Note: See TracChangeset for help on using the changeset viewer.