From c6bac6f4989f042360d640f63bb47ec7575cba54 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 25 Apr 2006 18:40:58 +0000 Subject: [PATCH] Fix a few things regarding plthome and dll location svn: r2781 --- collects/setup/info.ss | 2 +- collects/setup/winstall.ss | 9 --------- collects/setup/winvers.ss | 4 ++-- teachpack/htdc/Docs/mkdocs | 4 ++-- 4 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 collects/setup/winstall.ss diff --git a/collects/setup/info.ss b/collects/setup/info.ss index 44faf600a5..21b472d24b 100644 --- a/collects/setup/info.ss +++ b/collects/setup/info.ss @@ -3,7 +3,7 @@ (define doc.txt "doc.txt") (define compile-omit-files - (list "setup.ss" "winstall.ss")) + (list "setup.ss")) (define mzscheme-launcher-libraries (list "setup.ss")) (define mzscheme-launcher-names (list "Setup PLT")) diff --git a/collects/setup/winstall.ss b/collects/setup/winstall.ss deleted file mode 100644 index 92f62003b3..0000000000 --- a/collects/setup/winstall.ss +++ /dev/null @@ -1,9 +0,0 @@ -;; sets directories for Windows installation - -(let ([plthome (build-path - (current-load-relative-directory) - 'up 'up)]) - (putenv "PLTHOME" plthome) - (current-library-collection-paths - (list (build-path plthome "collects")))) - diff --git a/collects/setup/winvers.ss b/collects/setup/winvers.ss index b0b063337f..072d4661a6 100644 --- a/collects/setup/winvers.ss +++ b/collects/setup/winvers.ss @@ -10,8 +10,8 @@ (for-each (lambda (p) (let ([dest (build-path vers p)]) (when (file-exists? dest) (delete-file dest)) - (copy-file (build-path plthome p) dest))) - '("mzscheme.exe" "libmzgcxxxxxxx.dll" "libmzschxxxxxxx.dll")) + (copy-directory/files (build-path plthome p) dest))) + '("mzscheme.exe" "lib")) (build-path vers "mzscheme.exe"))) (define (patch-files) diff --git a/teachpack/htdc/Docs/mkdocs b/teachpack/htdc/Docs/mkdocs index 30a69d7fb5..220bbd05c5 100755 --- a/teachpack/htdc/Docs/mkdocs +++ b/teachpack/htdc/Docs/mkdocs @@ -7,7 +7,7 @@ else fi |# -(require (lib "etc.ss") (lib "plthome.ss" "setup")) +(require (lib "etc.ss")) (current-directory (this-expression-source-directory)) ; for john? @@ -18,7 +18,7 @@ fi #"An Imperative Drawing Library (HtDC)" )) -(define dest-dir (build-path plthome "collects" "doc" "teachpack-htdc")) +(define dest-dir (build-path (collection-path "doc") "teachpack-htdc")) (printf "writing docs to ~s\n" (path->string dest-dir)) (require (lib "list.ss"))