Rename systems cl-* -> *

Also adapt to renamed rsb system.

CMakeLists.txt

@@ -130,7 +130,7 @@ endif()
 
 option(WITH_PNG_SUPPORT "Build with support for PNG image payloads." ON)
 if(WITH_PNG_SUPPORT)
-    add_silent_load(cl-rsb-formatting-png)
+    add_silent_load(rsb-formatting-png)
 endif()
 option(WITH_JSON_SUPPORT "Build with support for JSON formatting." ON)
 if(WITH_JSON_SUPPORT)
@@ -179,7 +179,7 @@ endfunction()
 # Project definition (version is grovelled from asd system definition,
 # possibly in combination with version.sexp file written below).
 # C compiler is needed for CLON's stream-width determination feature
-set(SYSTEM_NAME "cl-rsb-tools-logger")
+set(SYSTEM_NAME "rsb-tools-logger")
 project(rsb-tools "C")
 
 # Determine at least major and minor version components.
@@ -216,7 +216,7 @@ message(STATUS "Project is ${CMAKE_PROJECT_NAME} (${VERSION_FROM_LISP})")
 
 # Create binary.
 set(MAIN_NAME        "tools")
-set(MAIN_SYSTEM_NAME "cl-rsb-tools-main")
+set(MAIN_SYSTEM_NAME "rsb-tools-main")
 set(MAIN_EXECUTABLE  "${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
 set(TOOLS            info logger call send introspect web bridge server)
 set(LISP_INIT "${LISP_INIT_BASE} ${LISP_LOAD}")
@@ -248,7 +248,7 @@ function(tools_test COMMAND NAME)
 endfunction()
 
 # Lift-based tests for formatting and stats systems.
-foreach(SYSTEM rsb-tools-common cl-rsb-formatting cl-rsb-stats
+foreach(SYSTEM rsb-tools-common rsb-formatting rsb-stats
                rsb-tools-commands rsb-tools-commands-web)
     set(LISP_INIT "${LISP_INIT_BASE}")
     configure_lisp_redirect("test-${SYSTEM}"

bridge/main.lisp

@@ -1,6 +1,6 @@
 ;;;; main.lisp --- Entry point of the bridge tool.
 ;;;;
-;;;; Copyright (C) 2011-2016 Jan Moringen
+;;;; Copyright (C) 2011-2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
@@ -43,7 +43,7 @@
     (setf *configuration* (options-from-default-sources))
     (process-commandline-options
      :commandline     (list* program-name args)
-     :version         (cl-rsb-tools-bridge-system:version/list :commit? t)
+     :version         (rsb-tools-bridge-system:version/list :commit? t)
      :update-synopsis (curry #'update-synopsis :program-name program-name)
      :return          (lambda () (return-from main)))
     (enable-swank-on-signal))

call/main.lisp

@@ -1,6 +1,6 @@
 ;;;; main.lisp --- Entry point of the call tool.
 ;;;;
-;;;; Copyright (C) 2011-2016 Jan Moringen
+;;;; Copyright (C) 2011-2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
@@ -197,7 +197,7 @@
     (setf *configuration* (options-from-default-sources))
     (process-commandline-options
      :commandline     (list* program-name args)
-     :version         (cl-rsb-tools-call-system:version/list :commit? t)
+     :version         (rsb-tools-call-system:version/list :commit? t)
      :update-synopsis (curry #'update-synopsis :program-name program-name)
      :return          (lambda () (return-from main)))
     (enable-swank-on-signal))

info/main.lisp

@@ -1,6 +1,6 @@
 ;;;; main.lisp --- Entry point of the info tool.
 ;;;;
-;;;; Copyright (C) 2011-2016 Jan Moringen
+;;;; Copyright (C) 2011-2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
@@ -60,7 +60,7 @@
    :commandline     (list* (concatenate
                             'string (namestring program-pathname) " info")
                            args)
-   :version         (cl-rsb-tools-info-system:version/list :commit? t)
+   :version         (rsb-tools-info-system:version/list :commit? t)
    :update-synopsis #'update-synopsis
    :return          (lambda () (return-from main)))
   (enable-swank-on-signal)

introspect/main.lisp

@@ -1,6 +1,6 @@
 ;;;; main.lisp --- Entry point of the introspect tool.
 ;;;;
-;;;; Copyright (C) 2014, 2015, 2016 Jan Moringen
+;;;; Copyright (C) 2014, 2015, 2016, 2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
@@ -101,7 +101,7 @@ In most systems, all replies should arrive within a few milliseconds. However, c
     (setf *configuration* (options-from-default-sources))
     (process-commandline-options
      :commandline     (list* program-name args)
-     :version         (cl-rsb-tools-introspect-system:version/list :commit? t)
+     :version         (rsb-tools-introspect-system:version/list :commit? t)
      :update-synopsis (curry #'update-synopsis :program-name program-name)
      :return          (lambda () (return-from main)))
     (enable-swank-on-signal))

logger/main.lisp

@@ -1,6 +1,6 @@
 ;;;; main.lisp --- Entry point of the logger tool.
 ;;;;
-;;;; Copyright (C) 2011-2016 Jan Moringen
+;;;; Copyright (C) 2011-2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
@@ -60,7 +60,7 @@
     (setf *configuration* (options-from-default-sources))
     (process-commandline-options
      :commandline     (list* program-name args)
-     :version         (cl-rsb-tools-logger-system:version/list :commit? t)
+     :version         (rsb-tools-logger-system:version/list :commit? t)
      :update-synopsis (curry #'update-synopsis :program-name program-name)
      :return          (lambda () (return-from main)))
     (enable-swank-on-signal))

rsb-formatting-and-rsb-common.asd

@@ -1,12 +1,12 @@
 ;;;; rsb-formatting-and-rsb-common.asd --- Commandline options for formatting styles.
 ;;;;
-;;;; Copyright (C) 2013, 2015, 2016 Jan Moringen
+;;;; Copyright (C) 2013, 2015, 2016, 2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
-(load (merge-pathnames "cl-rsb-formatting.asd" *load-pathname*))
+(load (merge-pathnames "rsb-formatting.asd" *load-pathname*))
 
-(cl:in-package #:cl-rsb-formatting-system)
+(cl:in-package #:rsb-formatting-system)
 
 ;;; System definition
 
@@ -17,8 +17,8 @@
   :license     "GPLv3" ; see COPYING file for details.
   :description "This system adds formatting-related handling of
 commandline options."
-  :depends-on  ((:version :cl-rsb-formatting #.(version/string))
-                (:version :rsb-tools-common  #.(version/string)))
+  :depends-on  ((:version :rsb-formatting   #.(version/string))
+                (:version :rsb-tools-common #.(version/string)))
   :encoding    :utf-8
   :components  ((:file       "help"
                  :pathname   "src/formatting/help")))

rsb-formatting-and-rsb-stats.asd

@@ -1,12 +1,12 @@
-;;;; rsb-formatting-and-rsb-stats.asd --- Formatting styles based on cl-rsb-stats.
+;;;; rsb-formatting-and-rsb-stats.asd --- Formatting styles based on rsb-stats.
 ;;;;
-;;;; Copyright (C) 2013, 2014, 2015, 2016 Jan Moringen
+;;;; Copyright (C) 2013-2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
-(load (merge-pathnames "cl-rsb-formatting.asd" *load-pathname*))
+(load (merge-pathnames "rsb-formatting.asd" *load-pathname*))
 
-(cl:in-package #:cl-rsb-formatting-system)
+(cl:in-package #:rsb-formatting-system)
 
 ;;; System definition
 
@@ -16,10 +16,10 @@
   :version     #.(version/string)
   :license     "GPLv3" ; see COPYING file for details.
   :description "This system adds a column-based event formatting
-style, the columns of which are quantities defined in the cl-rsb-stats
+style, the columns of which are quantities defined in the rsb-stats
 system."
-  :depends-on  ((:version :cl-rsb-formatting #.(version/string))
-                (:version :cl-rsb-stats      #.(version/string)))
+  :depends-on  ((:version :rsb-formatting #.(version/string))
+                (:version :rsb-stats      #.(version/string)))
   :encoding    :utf-8
   :components  ((:module     "formatting"
                  :pathname   "src/formatting"

rsb-formatting-json.asd

@@ -1,14 +1,14 @@
 ;;;; rsb-formatting-json.asd --- Formatting support for JSON payloads.
 ;;;;
-;;;; Copyright (C) 2014, 2015, 2016 Jan Moringen
+;;;; Copyright (C) 2014, 2015, 2016, 2018 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
 #.(progn
-    (load (merge-pathnames "cl-rsb-formatting.asd" *load-truename*))
+    (load (merge-pathnames "rsb-formatting.asd" *load-truename*))
     (values))
 
-(cl:in-package #:cl-rsb-formatting-system)
+(cl:in-package #:rsb-formatting-system)
 
 ;;; System definitions
 
@@ -27,7 +27,7 @@
                 (:version :rsb-builder                                     #.(version/string :revision? nil))
                 (:version :rsb-model-builder                               #.(version/string :revision? nil))
 
-                (:version :cl-rsb-formatting                               #.(version/string)))
+                (:version :rsb-formatting                                  #.(version/string)))
   :encoding    :utf-8
   :components  ((:module     "formatting"
                  :pathname   "src/formatting"
@@ -38,4 +38,4 @@
                  :depends-on ("formatting")
                  :components ((:file       "json"))))
 
-  :in-order-to ((test-op (test-op :cl-rsb-formatting/test))))
+  :in-order-to ((test-op (test-op :rsb-formatting/test))))

cl-rsb-formatting-png.asd → rsb-formatting-png.asd

@@ -1,18 +1,18 @@
-;;;; cl-rsb-formatting-png.asd --- Formatting support for PNG payloads.
+;;;; rsb-formatting-png.asd --- Formatting support for PNG payloads.
 ;;;;
 ;;;; Copyright (C) 2013, 2014, 2016 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
 #.(progn
-    (load (merge-pathnames "cl-rsb-formatting.asd" *load-truename*))
+    (load (merge-pathnames "rsb-formatting.asd" *load-truename*))
     (values))
 
-(cl:in-package #:cl-rsb-formatting-system)
+(cl:in-package #:rsb-formatting-system)
 
 ;;; System definition
 
-(defsystem :cl-rsb-formatting-png
+(defsystem :rsb-formatting-png
   :author      "Jan Moringen <[email protected]>"
   :maintainer  "Jan Moringen <[email protected]>"
   :version     #.(version/string)
@@ -24,10 +24,10 @@
 
                 :zpng
 
-                (:version :cl-rsb-formatting #.(version/string :revision? nil)))
+                (:version :rsb-formatting #.(version/string :revision? nil)))
   :encoding    :utf-8
   :components  ((:module     "formatting"
                  :pathname   "src/formatting"
                  :components ((:file       "payload-image-png"))))
 
-  :in-order-to ((test-op (test-op :cl-rsb-formatting/test))))
+  :in-order-to ((test-op (test-op :rsb-formatting/test))))

cl-rsb-formatting.asd → rsb-formatting.asd

@@ -1,10 +1,10 @@
-;;;; cl-rsb-formatting.asd --- Formatting functions for cl-rsb-based utilities.
+;;;; rsb-formatting.asd --- Formatting functions for rsb-based utilities.
 ;;;;
 ;;;; Copyright (C) 2011-2016 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <[email protected]>
 
-(cl:defpackage #:cl-rsb-formatting-system
+(cl:defpackage #:rsb-formatting-system
   (:use
    #:cl
    #:asdf)
@@ -13,7 +13,7 @@
    #:version/list
    #:version/string))
 
-(cl:in-package #:cl-rsb-formatting-system)
+(cl:in-package #:rsb-formatting-system)
 
 ;;; Version stuff
 
@@ -66,7 +66,7 @@ See `version/list' for details on keyword parameters."
 
 ;;; System definition
 
-(defsystem :cl-rsb-formatting
+(defsystem :rsb-formatting
   :author      "Jan Moringen <[email protected]>"
   :maintainer  "Jan Moringen <[email protected]>"
   :version     #.(version/string)
@@ -83,7 +83,7 @@ RSB-related systems."
                 (:version :utilities.binary-dump         "0.1")
                 (:version :utilities.print-tree          "0.1")
 
-                (:version :cl-rsb                        #.(version/string :revision? nil))
+                (:version :rsb                           #.(version/string :revision? nil))
                 (:version :rsb-protocol                  #.(version/string :revision? nil))  ; for payload-collection
                 (:version :rsb-transport-socket          #.(version/string :revision? nil))  ; likewise
                 (:version :rsb-introspection             #.(version/string :revision? nil)))
@@ -145,26 +145,26 @@ RSB-related systems."
                               (:file       "print")
                               (:file       "styles"))))
 
-  :in-order-to ((test-op (test-op :cl-rsb-formatting/test))))
+  :in-order-to ((test-op (test-op :rsb-formatting/test))))
 
-;;; System definition for tests of the cl-rsb-formatting system
+;;; System definition for tests of the rsb-formatting system
 
-(defsystem :cl-rsb-formatting/test
+(defsystem :rsb-formatting/test
   :author      "Jan Moringen <[email protected]>"
   :maintainer  "Jan Moringen <[email protected]>"
   :version     #.(version/string)
   :license     "GPLv3" ; see COPYING file for details.
-  :description "This system contains tests for the cl-rsb-formatting
+  :description "This system contains tests for the rsb-formatting
 system."
   :depends-on  (:cl-ppcre
 
-                (:version :lift                  "1.7.1")
+                (:version :lift                "1.7.1")
 
-                (:version :cl-rsb-formatting     #.(version/string))
-                (:version :cl-rsb-formatting-png #.(version/string))
-                (:version :rsb-formatting-json   #.(version/string))
+                (:version :rsb-formatting      #.(version/string))
+                (:version :rsb-formatting-png  #.(version/string))
+                (:version :rsb-formatting-json #.(version/string))
 
-                (:version :cl-rsb/test           #.(version/string :revision? nil)))
+                (:version :rsb/test            #.(version/string :revision? nil)))
   :encoding    :utf-8
   :components  ((:module     "formatting-early"
                  :pathname   "test/formatting"
@@ -200,7 +200,7 @@ system."
                               (:file       "json")))))
 
 (defmethod perform ((operation test-op)
-                    (component (eql (find-system :cl-rsb-formatting/test))))
+                    (component (eql (find-system :rsb-formatting/test))))
   (funcall (find-symbol "RUN-TESTS" :lift)
            :config (funcall (find-symbol "LIFT-RELATIVE-PATHNAME" :lift)
                             "lift-rsb-formatting.config")))