www

commit d82d917979c6a962296378ba7e873bc4e9ceaf97
parent 4c0267fe5987e929604fb34762ab292d81587f21
Author: Matthew Flatt <mflatt@racket-lang.org>
Date:   Mon,  2 Jun 2014 15:30:32 +0100

make site: use relative paths in the pkg catalog for a site

original commit: dc97b85d4464f64e336db1e0379ac2f868bb1c8a

Diffstat:
M
pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt
 | 
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt b/pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt
@@ -18,6 +18,7 @@
 (define installers-dir (build-path "installers"))
 (define pkgs-dir (build-path "pkgs"))
 (define catalog-dir (build-path "catalog"))
+(define from-catalog-dir-to-pkgs-dir (build-path 'up))
 (define doc-dir (build-path "doc"))
 (define pdf-doc-dir (build-path "pdf-doc"))
 (define log-dir (build-path "log"))
@@ -70,17 +71,14 @@
   (let ([c-dir (build-path built-dir catalog-dir "pkg")]
         [d-dir (build-path dest-dir catalog-dir "pkg")])
     (make-directory* d-dir)
-    (define base-url (string->url (hash-ref config '#:dist-base-url)))
     (for ([f (in-list (directory-list c-dir))])
       (define ht (call-with-input-file* (build-path c-dir f) read))
       (define new-ht
-        (hash-set ht 'source (url->string
-                              (combine-url/relative
-                               base-url
-                               (path->string 
-                                (build-path
-                                 pkgs-dir
-                                 (path-add-suffix f #".zip")))))))
+        (hash-set ht 'source (relative-path->relative-url-string
+                              (build-path
+                               from-catalog-dir-to-pkgs-dir
+                               pkgs-dir
+                               (path-add-suffix f #".zip")))))
       (call-with-output-file* 
        (build-path d-dir f)
        (lambda (o)