make raco exe -l cooperate with tethered-executable builds

The configuration of an addon-tethered directory is treated as a sign
that access to collections in the "user" space should be accessible by
default in a launcher, as well as propagating the addon-directory
setting to the launched program.
This commit is contained in:
Matthew Flatt 2016-04-14 08:07:44 -06:00
parent a1ba579666
commit f2b76a675a
2 changed files with 13 additions and 2 deletions

View File

@ -3,7 +3,8 @@
raco/command-name raco/command-name
compiler/private/embed compiler/private/embed
launcher/launcher launcher/launcher
dynext/file) dynext/file
setup/dirs)
(define verbose (make-parameter #f)) (define verbose (make-parameter #f))
(define very-verbose (make-parameter #f)) (define very-verbose (make-parameter #f))
@ -29,6 +30,16 @@
[("--gui") "Generate GUI executable" [("--gui") "Generate GUI executable"
(gui #t)] (gui #t)]
[("-l" "--launcher") "Generate a launcher" [("-l" "--launcher") "Generate a launcher"
(when (or (find-addon-tethered-gui-bin-dir)
(find-addon-tethered-console-bin-dir))
;; When an addon-executable directory is configured, treat the
;; addon directory more like an installation directory, instead
;; of a user-specific directory: record it, and remove the -U
;; flag (if any)
(exe-embedded-flags
(append
(list "-A" (path->string (find-system-path 'addon-dir)))
(remove "-U" (exe-embedded-flags)))))
(launcher #t)] (launcher #t)]
[("--config-path") path "Set <path> as configuration directory for executable" [("--config-path") path "Set <path> as configuration directory for executable"
(exe-embedded-config-path path)] (exe-embedded-config-path path)]

View File

@ -2,7 +2,7 @@
(define collection 'multi) (define collection 'multi)
(define deps '(["base" #:version "6.2.900.10"] (define deps '(["base" #:version "6.5.0.2"]
"scheme-lib" "scheme-lib"
"rackunit-lib" "rackunit-lib"
"zo-lib")) "zo-lib"))