rename library names

Makefile

@@ -14,11 +14,8 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-PACKAGE = chez-srfi
-VERSION = 1.0
-
 CHEZ = chez-scheme
-INSTALL = install -D
+INSTALL = install -D -m644
 
 PREFIX = /usr/local
 EXEC_PREFIX = ${PREFIX}
@@ -29,14 +26,11 @@ DATAROOTDIR = ${PREFIX}/share
 DATADIR = ${DATAROOTDIR}
 MANDIR = ${DATAROOTDIR}/man
 INFODIR = ${DATAROOTDIR}/info
-DOCDIR = ${DATAROOTDIR}/doc/${PACKAGE}-${VERSION}
 
 chezversion ::= $(shell echo '(call-with-values scheme-version-number (lambda (a b c) (format #t "~d.~d.~d" a b c)))' | ${CHEZ} -q)
 schemedir = ${LIBDIR}/csv${chezversion}-site
 
 build:
-	(cd srfi/%3a2 && ln -sf and-let%2a.sls and-let\*.sls)
-	(cd srfi && $(CHEZ) --program link-dirs.chezscheme.sps)
 	(cd srfi && $(CHEZ) --program compile-all.chezscheme.ss)
 
 clean:
@@ -45,19 +39,18 @@ clean:
 
 install:
 	find srfi -type f -regex ".*.so" -exec sh -c '${INSTALL} -t ${schemedir}/$$(dirname $$1) $$1' _ {} \;
-	${INSTALL} -t ${DOCDIR} srfi/README
-	cp -P srfi/:[0-9] ${schemedir}/srfi
-	cp -P srfi/:[0-9][0-9] ${schemedir}/srfi
-	cp -P srfi/:[0-9]*.so ${schemedir}/srfi
+	cp -rP srfi/:[0-9] ${schemedir}/srfi
+	cp -rP srfi/:[0-9][0-9] ${schemedir}/srfi
+	cp -rP srfi/:[0-9]*.so ${schemedir}/srfi
 
 install-src:
 	find srfi -type f -regex ".*.s\(ls\|cm\)" -exec sh -c '${INSTALL} -t ${schemedir}/$$(dirname $$1) $$1' _ {} \;
-	cp -P srfi/:[0-9] ${schemedir}/srfi
-	cp -P srfi/:[0-9][0-9] ${schemedir}/srfi
-	cp -P srfi/:[0-9]*.sls ${schemedir}/srfi
+	cp -rP srfi/:[0-9] ${schemedir}/srfi
+	cp -rP srfi/:[0-9][0-9] ${schemedir}/srfi
+	cp -rP srfi/:[0-9]*.sls ${schemedir}/srfi
 
 test:
-	$(CHEZ) --program srfi/tests/and-let%2a.sps
+	$(CHEZ) --program srfi/tests/and-let*.sps
 	$(CHEZ) --program srfi/tests/lists.sps
 	$(CHEZ) --program srfi/tests/cut.sps
 	$(CHEZ) --program srfi/tests/intermediate-format-strings.sps

srfi/:1/lists.sls

@@ -72,5 +72,5 @@
 
   (let-syntax ((define (vanish-define define (cons*))))
     (SRFI-23-error->R6RS "(library (srfi :1 lists))"
-     (include/resolve ("srfi" "%3a1") "srfi-1-reference.scm")))
+     (include/resolve ("srfi" ":1") "srfi-1-reference.scm")))
 )

srfi/:13/strings.sls

@@ -67,5 +67,5 @@
     (char-upper-case? (char-upcase c)))
 
   (SRFI-23-error->R6RS "(library (srfi :13 strings))"
-   (include/resolve ("srfi" "%3a13") "srfi-13.scm"))
+   (include/resolve ("srfi" ":13") "srfi-13.scm"))
 )

srfi/:14/char-sets.sls

@@ -56,5 +56,5 @@
     (char->integer c))
 
   (SRFI-23-error->R6RS "(library (srfi :14 char-sets))"
-   (include/resolve ("srfi" "%3a14") "srfi-14.scm"))
+   (include/resolve ("srfi" ":14") "srfi-14.scm"))
 )

srfi/:19/time.sls

@@ -175,5 +175,5 @@
                                               set-date-year!
                                               set-date-zone-offset!
                                               tm:local-tz-offset))))
-    (include/resolve ("srfi" "%3a19") "srfi-19.scm"))
+    (include/resolve ("srfi" ":19") "srfi-19.scm"))
 )

srfi/:25/multi-dimensional-arrays/all.sls

@@ -86,7 +86,7 @@
             (immutable shp array:shape)))
 
   (SRFI-23-error->R6RS "(library (srfi :25 multi-dimensional-arrays))"
-   (include/resolve ("srfi" "%3a25") "ix-ctor.scm")
-   (include/resolve ("srfi" "%3a25") "op-ctor.scm")
-   (include/resolve ("srfi" "%3a25") "array.scm"))
+   (include/resolve ("srfi" ":25") "ix-ctor.scm")
+   (include/resolve ("srfi" ":25") "op-ctor.scm")
+   (include/resolve ("srfi" ":25") "array.scm"))
 )

srfi/:25/multi-dimensional-arrays/arlib.sls

@@ -33,5 +33,5 @@
     (srfi private include))
 
   (SRFI-23-error->R6RS "(library (srfi :25 multi-dimensional-arrays arlib))"
-   (include/resolve ("srfi" "%3a25") "arlib.scm"))
+   (include/resolve ("srfi" ":25") "arlib.scm"))
 )

srfi/:26/cut.sls

@@ -10,5 +10,5 @@
 
   (define-auxiliary-keywords <> <...>)
 
-  (include/resolve ("srfi" "%3a26") "cut.scm")  
+  (include/resolve ("srfi" ":26") "cut.scm")  
 )

srfi/:27/random-bits.sls

@@ -34,6 +34,6 @@
     (time-nanosecond (current-time)))
 
   (SRFI-23-error->R6RS "(library (srfi :27 random-bits))"
-   (include/resolve ("srfi" "%3a27") "mrg32k3a-a.scm")
-   (include/resolve ("srfi" "%3a27") "mrg32k3a.scm"))
+   (include/resolve ("srfi" ":27") "mrg32k3a-a.scm")
+   (include/resolve ("srfi" ":27") "mrg32k3a.scm"))
 )

srfi/:37/args-fold.sls

@@ -38,6 +38,6 @@
 
   (define args-fold
     (let ((option make-option))
-      (include/resolve ("srfi" "%3a37") "srfi-37-reference.scm")
+      (include/resolve ("srfi" ":37") "srfi-37-reference.scm")
       args-fold))
 )

srfi/:38/with-shared-structure.larceny.sls

@@ -1,6 +1,6 @@
 ;;; SRFI 38: External Representation of Data With Shared Structure
 ;;;
-;;; $Id: %3a38.sls 6149 2009-03-19 02:41:56Z will $
+;;; $Id: :38.sls 6149 2009-03-19 02:41:56Z will $
 ;;;
 ;;; See <http://srfi.schemers.org/srfi-38/srfi-38.html> for the full document.
 ;;;

srfi/:42/eager-comprehensions.sls

@@ -31,10 +31,10 @@
 
   ;; (let-syntax ((define (vanish-define define (:-dispatch))))
   ;;   (SRFI-23-error->R6RS "(library (srfi :42 eager-comprehensions))"
-  ;;    (include/resolve ("srfi" "%3a42") "ec.scm")))
+  ;;    (include/resolve ("srfi" ":42") "ec.scm")))
 
   (let-syntax ((define (vanish-define define (:-dispatch))))
-    (include/resolve ("srfi" "%3a42") "ec.scm"))
+    (include/resolve ("srfi" ":42") "ec.scm"))
 
   (define :-dispatch-param (make-parameter (make-initial-:-dispatch)))
 

srfi/:43/vectors.sls

@@ -66,5 +66,5 @@
         (vanish-define define-syntax
          (receive))))
     (SRFI-23-error->R6RS "(library (srfi :43 vectors))"
-     (include/resolve ("srfi" "%3a43") "vector-lib.scm")))
+     (include/resolve ("srfi" ":43") "vector-lib.scm")))
 )

srfi/:64/testing.sls

@@ -67,7 +67,7 @@
       ((val) (set! test-log-to-file val))))
 
   (SRFI-23-error->R6RS "(library (srfi :64 testing))"
-   (include/resolve ("srfi" "%3a64") "testing.scm"))
+   (include/resolve ("srfi" ":64") "testing.scm"))
 
   (set! test-log-to-file #F)
 )

srfi/:67/compare-procedures.sls

@@ -31,8 +31,8 @@
   ;; pass all provided tests! (FBE)
 
   ;; (SRFI-23-error->R6RS "(library (srfi :67 compare-procedures))"
-  ;;  (include/resolve ("srfi" "%3a67") "compare.scm"))
+  ;;  (include/resolve ("srfi" ":67") "compare.scm"))
 
-  (include/resolve ("srfi" "%3a67") "compare.scm")
+  (include/resolve ("srfi" ":67") "compare.scm")
 
 )

srfi/:78/lightweight-testing.sls

@@ -28,5 +28,5 @@
 
   (let-syntax ((define (vanish-define define (check:write check:mode))))
     (SRFI-23-error->R6RS "(library (srfi :78 lightweight-testing))"
-     (include/resolve ("srfi" "%3a78") "check.scm")))
+     (include/resolve ("srfi" ":78") "check.scm")))
 )

srfi/compile-all.chezscheme.ss

@@ -23,20 +23,11 @@
               (and (file-regular? file)
                    (not (file-symbolic-link? file))
                    (< 3 str-length)
-                   (string=? (substring file 0 3) "%3a")
+                   (string=? (substring file 0 1) ":")
                    (string=? (substring file (- str-length 4) str-length) ".sls"))))
           (directory-list root)))
 
-(define (compile-and-link-file file)
-  (let* ((file-no-ext (path-last (path-root file)))
-         (target (string-append file-no-ext ".so"))
-         (link (string-append "%3a"
-                              (substring file 3 (string-length file-no-ext))
-                              ".so")))
-    (compile-library file)
-    (system (format "ln -sf '~a' '~a'" target link))))
-
 (parameterize ((library-directories '((".." . "..")))
                (source-directories '(".."))
                (compile-imported-libraries #t))
-  (map compile-and-link-file (libraries-to-compile ".")))
+  (map compile-library (libraries-to-compile ".")))

srfi/private/make-aliased-libraries.sps

@@ -41,7 +41,7 @@
           (exports (list-sort symbol<?
                               (environment-symbols (environment lib-name))))
           (alias-name `(srfi ,(string->symbol (format ":~d" srfi-num))))
-          (out-file (format "%3a~d.sls" srfi-num)))
+          (out-file (format ":~d.sls" srfi-num)))
      (cond
        ((file-exists? out-file)
         (printf "Skipping ~a because it already exists.\n" out-file))

srfi/tests/compare-procedures.sps

@@ -11,4 +11,4 @@
   (srfi private include)
   (srfi :67 compare-procedures))
 
-(include/resolve ("srfi" "%3a67") "examples.scm")
+(include/resolve ("srfi" ":67") "examples.scm")

srfi/tests/cut.sps

@@ -18,7 +18,7 @@
                         (begin))
                        ((_ (check-all) (for-each check '((equal? expr val) ...)))
                         (begin (check expr => val) ...)))))
-  (include/resolve ("srfi" "%3a26") "check.scm"))
+  (include/resolve ("srfi" ":26") "check.scm"))
 
 ;;;; free-identifier=? of <> and <...>
 

srfi/tests/eager-comprehensions.sps

@@ -18,4 +18,4 @@
 (define (my-call-with-input-file filename thunk)
   (call-with-input-file filename thunk))
 
-(include/resolve ("srfi" "%3a42") "examples.scm")
+(include/resolve ("srfi" ":42") "examples.scm")

srfi/tests/lightweight-testing.sps

@@ -9,4 +9,4 @@
   (srfi private include)
   (srfi :78 lightweight-testing))
 
-(include/resolve ("srfi" "%3a78") "examples.scm")
+(include/resolve ("srfi" ":78") "examples.scm")