diff --git a/main-helper.rkt b/main-helper.rkt index aa2f4a8..19e3e23 100644 --- a/main-helper.rkt +++ b/main-helper.rkt @@ -3,8 +3,8 @@ ;; use full planet paths because this file is evaluated from source directory, ;; not module directory -(require (for-syntax racket/rerequire (planet mb/pollen/tools) (planet mb/pollen/world))) -(require (planet mb/pollen/tools) (planet mb/pollen/world)) +(require (for-syntax racket/rerequire pollen/tools pollen/world)) +(require pollen/tools pollen/world) (provide (all-defined-out)) diff --git a/server.rkt b/server.rkt index 8ad7b20..78f1610 100755 --- a/server.rkt +++ b/server.rkt @@ -48,7 +48,6 @@ #:servlet-regexp #rx"" ; respond to top level #:command-line? #t #:extra-files-paths (list - ;; todo: use a function to determine directory - (build-path "/Users/mb/git/pollen/" "pollen-server-extras") - ;; for serving static files out of project directory + ;; todo: files in this directory are wrongly reported in log as missing + (build-path MODULE_ROOT "pollen-server-extras") (build-path PROJECT_ROOT))) \ No newline at end of file diff --git a/world.rkt b/world.rkt index b77741b..3021836 100644 --- a/world.rkt +++ b/world.rkt @@ -48,5 +48,8 @@ (define PROJECT_ROOT (current-directory)) +;; use current-contract-region to calculate containing directory of module +(define MODULE_ROOT (apply build-path (drop-right (explode-path (current-contract-region)) 1))) + (define DASHBOARD_NAME "poldash.html") \ No newline at end of file