Commit ee4dfd431ab4ca15a75b344094b48fc9f6ebeed8

Thomas de Grivel 2015-04-08T15:40:30

Rename RoL packages.

diff --git a/asset.lisp b/asset.lisp
index 89f0b0f..9a68cb1 100644
--- a/asset.lisp
+++ b/asset.lisp
@@ -18,7 +18,7 @@
 
 ;;  FIXME: bug on renamed or deleted asset file still in cache
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Asset class
 
diff --git a/coffeescript.lisp b/coffeescript.lisp
index f50b8c8..e8ccd79 100644
--- a/coffeescript.lisp
+++ b/coffeescript.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Coffeescript -> JS
 
diff --git a/config.lisp b/config.lisp
index 67bc246..ab10273 100644
--- a/config.lisp
+++ b/config.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Config
 
diff --git a/css.lisp b/css.lisp
index da20a33..93c12ee 100644
--- a/css.lisp
+++ b/css.lisp
@@ -18,7 +18,7 @@
 
 ;;  FIXME bug on bare .css files ?
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  CSS
 
diff --git a/extensions.lisp b/extensions.lisp
index fc28dbb..f24d721 100644
--- a/extensions.lisp
+++ b/extensions.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Extensions package
 
@@ -24,13 +24,14 @@
   (let ((sym (intern (string-upcase (if (char= #\. (char name 0))
 					name
 					(concatenate 'string "." name)))
-		     :L>ext)))
-    (export sym :L>ext)
+		     :RoL-extensions)))
+    (export sym :RoL-extensions)
     sym))
 
 (defun extension-p (thing)
   (and (symbolp thing)
-       (eq #.(find-package :L>ext) (symbol-package thing))))
+       (eq #.(find-package :RoL-extensions)
+           (symbol-package thing))))
 
 (deftype extension ()
   `(and symbol (satisfies extension-p)))
diff --git a/find.lisp b/find.lisp
index 115b932..03c443e 100644
--- a/find.lisp
+++ b/find.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Finding assets
 
diff --git a/font.lisp b/font.lisp
index f207a65..eba8181 100644
--- a/font.lisp
+++ b/font.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Font
 
diff --git a/generate.lisp b/generate.lisp
index fd1bebb..79b4842 100644
--- a/generate.lisp
+++ b/generate.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Asset generators
 
diff --git a/html.lisp b/html.lisp
index 6d7e515..3ad67f5 100644
--- a/html.lisp
+++ b/html.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 (defstruct (entity-table (:constructor make-entity-table (chars entities)))
   chars
diff --git a/image.lisp b/image.lisp
index 44cb4fd..4846b6e 100644
--- a/image.lisp
+++ b/image.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;    Image
 
diff --git a/js.lisp b/js.lisp
index 0dffd0f..5e5291b 100644
--- a/js.lisp
+++ b/js.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;    JS
 
diff --git a/json.lisp b/json.lisp
index fd46d58..14af679 100644
--- a/json.lisp
+++ b/json.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;    JSON
 
diff --git a/less.lisp b/less.lisp
index 0dbccac..fb3ff21 100644
--- a/less.lisp
+++ b/less.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Compile
 
diff --git a/lib.lisp b/lib.lisp
index 8724091..56448f6 100644
--- a/lib.lisp
+++ b/lib.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Misc
 
diff --git a/lowh.triangle.assets.asd b/lowh.triangle.assets.asd
deleted file mode 100644
index 7da5590..0000000
--- a/lowh.triangle.assets.asd
+++ /dev/null
@@ -1,52 +0,0 @@
-;;
-;;  LowH Triangle Assets  -  Asset pipeline
-;;
-;;  Copyright 2012 Thomas de Grivel <thomas@lowh.net>
-;;
-;;  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-;;  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-;;  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-;;  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-;;  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-;;  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-;;
-
-(defpackage :lowh.triangle.assets.system
-  (:use :cl :asdf))
-
-(in-package :lowh.triangle.assets.system)
-
-(asdf:defsystem :lowh.triangle.assets
-  :name "lowh.triangle.assets"
-  :author "Thomas de Grivel <thomas@lowh.net>"
-  :version "0.1"
-  :description "Asset pipeline"
-  :depends-on ("alexandria"
-               "cfg"
-	       "cl-debug"
-	       "cl-fad"
-	       "closer-mop"
-	       "cl-json"
-	       "exec-js"
-	       "lowh.triangle.files"
-	       "lowh.triangle.uri"
-	       "str")
-  :components
-  ((:file "package")
-   (:file "config"     :depends-on ("package"))
-   (:file "extensions" :depends-on ("package"))
-   (:file "html"       :depends-on ("package"))
-   (:file "lib"        :depends-on ("package"))
-   (:file "mime-types" :depends-on ("extensions"))
-   (:file "generate"   :depends-on ("lib"))
-   (:file "asset"      :depends-on ("config" "mime-types" "lib"))
-   (:file "find"       :depends-on ("asset"))
-   (:file "font"       :depends-on ("asset"))
-   (:file "json"       :depends-on ("asset"))
-   (:file "precompile" :depends-on ("find"))
-   (:file "preprocess" :depends-on ("find"))
-   (:file "image"      :depends-on ("asset" "html"))
-   (:file "css"        :depends-on ("preprocess" "html"))
-   (:file "less"       :depends-on ("css"))
-   (:file "js"         :depends-on ("preprocess" "html"))))
diff --git a/mime-types.lisp b/mime-types.lisp
index c391a99..52ebb52 100644
--- a/mime-types.lisp
+++ b/mime-types.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 (defgeneric mime-type (object))
 
diff --git a/package.lisp b/package.lisp
index 39b2a54..cced3da 100644
--- a/package.lisp
+++ b/package.lisp
@@ -18,17 +18,17 @@
 
 (in-package :cl-user)
 
-(defpackage :lowh.triangle.extensions
-  (:nicknames :L>ext)
+(defpackage :RoL-extensions
+  (:nicknames :RoL-ext :L>ext :lowh.triangle.extensions)
   #.(let (symbols)
-      (when (find-package :L>ext)
-	(do-external-symbols (s :L>ext)
+      (when (find-package :RoL-ext)
+	(do-external-symbols (s :RoL-ext)
 	  (push s symbols)))
       `(:export ,@symbols)))
 
-(defpackage :lowh.triangle.assets
-  (:nicknames :L>assets)
-  (:use :cl :debug :alexandria :L>ext :L>files :L>uri :str)
+(defpackage :RoL-assets
+  (:nicknames :L>assets :lowh.triangle.assets)
+  (:use :cl :debug :alexandria :RoL-ext :RoL-files :RoL-uri :str)
   (:export
    ;;  Config
    #:*assets-url-template*
diff --git a/precompile.lisp b/precompile.lisp
index 87df0b7..3e0c6c9 100644
--- a/precompile.lisp
+++ b/precompile.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Precompile
 
diff --git a/preprocess.lisp b/preprocess.lisp
index 677aeab..8784fa4 100644
--- a/preprocess.lisp
+++ b/preprocess.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :lowh.triangle.assets)
+(in-package :RoL-assets)
 
 ;;  Preprocessed assets
 
diff --git a/rol-assets.asd b/rol-assets.asd
new file mode 100644
index 0000000..1e3e775
--- /dev/null
+++ b/rol-assets.asd
@@ -0,0 +1,58 @@
+;;
+;;  RoL-assets  -  Asset pipeline
+;;
+;;  Copyright 2012-2015 Thomas de Grivel <thomas@lowh.net>
+;;
+;;  Permission to use, copy, modify, and distribute this software for any
+;;  purpose with or without fee is hereby granted, provided that the above
+;;  copyright notice and this permission notice appear in all copies.
+;;
+;;  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+;;  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+;;  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+;;  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+;;  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+;;  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+;;
+
+(in-package #:cl-user)
+
+(defpackage #:RoL-assets.system
+  (:use #:cl #:asdf))
+
+(in-package #:RoL-assets.system)
+
+(asdf:defsystem :RoL-assets
+  :name "RoL-assets"
+  :author "Thomas de Grivel <thomas@lowh.net>"
+  :version "0.1"
+  :description "Asset pipeline"
+  :depends-on ("alexandria"
+               "cfg"
+	       "cl-debug"
+	       "cl-fad"
+	       "closer-mop"
+	       "cl-json"
+	       "exec-js"
+	       "rol-files"
+	       "rol-uri"
+	       "str")
+  :components
+  ((:file "package")
+   (:file "config"     :depends-on ("package"))
+   (:file "extensions" :depends-on ("package"))
+   (:file "html"       :depends-on ("package"))
+   (:file "lib"        :depends-on ("package"))
+   (:file "mime-types" :depends-on ("extensions"))
+   (:file "generate"   :depends-on ("lib"))
+   (:file "asset"      :depends-on ("config" "mime-types" "lib"))
+   (:file "find"       :depends-on ("asset"))
+   (:file "font"       :depends-on ("asset"))
+   (:file "json"       :depends-on ("asset"))
+   (:file "precompile" :depends-on ("find"))
+   (:file "preprocess" :depends-on ("find"))
+   (:file "image"      :depends-on ("asset" "html"))
+   (:file "css"        :depends-on ("preprocess" "html"))
+   (:file "less"       :depends-on ("css"))
+   (:file "js"         :depends-on ("preprocess" "html"))))