From 3a0c7e81e5526268fc437dc3ca9010b76bb7a356 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 22 May 2006 04:05:06 +0000 Subject: [PATCH] always use -L instead of absolute paths in launchers (when possible) svn: r3004 --- collects/setup/doc.txt | 6 +++--- collects/setup/setup-unit.ss | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/collects/setup/doc.txt b/collects/setup/doc.txt index 532b4978fe..922e635623 100644 --- a/collects/setup/doc.txt +++ b/collects/setup/doc.txt @@ -70,12 +70,12 @@ Additional "info.ss" fields trigger additional setup actions: must be provided by `mzscheme-launcher-libraries' or `mzscheme-launcher-flags' (see below). For each name, a launching executable is set up using the launcher collection's - `make-mzscheme-launcher'. The arguments are "-mve-" and + `make-mzscheme-launcher'. The arguments are "-qmvL-" and - (format "~s" `(require (lib ...))) + "" "/..." where lib is the file named by `mzscheme-launcher-libraries' - and ... are the collections (and subcollections) + and "/..." are the collections (and subcollections) of the info.ss file. In addition, (build-aux-from-path diff --git a/collects/setup/setup-unit.ss b/collects/setup/setup-unit.ss index 944838b731..87d2ac9718 100644 --- a/collects/setup/setup-unit.ss +++ b/collects/setup/setup-unit.ss @@ -773,12 +773,9 @@ (path->string p)) (make-launcher (or mzlf - (if (and (cc-collection cc) - (= 1 (length (cc-collection cc)))) - ;; Common case (simpler parsing for Windows to - ;; avoid cygwin bug): - (list "-qmvL-" mzll (path->string (car (cc-collection cc)))) - (list "-qmvt-" (format "~a" (path->string (build-path (cc-path cc) mzll)))))) + (if (cc-collection cc) + (list "-qmvL-" mzll (path->string (apply build-path (cc-collection cc)))) + (list "-qmvt-" (format "~a" (path->string (build-path (cc-path cc) mzll)))))) p aux)))) mzlns