suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix launcher creation for gracket[-text] on Mac OS

Browse Source 
The repair in 71a43f34c8 fixed the creation of some launchers, but it
broke GUI launchers with a relative reference on Mac OS.
This commit is contained in:
Matthew Flatt 2017-04-16 15:46:51 -06:00
parent 47a2d4a879
commit 803d8ff0d5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
racket/collects/launcher/launcher.rkt
View File

@ -425,9 +425,10 @@
(if (eq? kind 'mred) (if (eq? kind 'mred)
(find-gui-bin-dir) (find-gui-bin-dir)
(find-console-bin-dir)))] (find-console-bin-dir)))]
[as-relative? (let ([a (assq 'relative? aux)])
(and a (cdr a)))]
[dir-finder [dir-finder
(if (let ([a (assq 'relative? aux)]) (if as-relative?
(and a (cdr a)))
(make-relative-path-header dest bindir use-librktdir?) (make-relative-path-header dest bindir use-librktdir?)
(make-absolute-path-header bindir))] (make-absolute-path-header bindir))]
[exec (format [exec (format
@ -470,7 +471,11 @@
(when use-librktdir? (when use-librktdir?
(display "# {{{ librktdir\n") (display "# {{{ librktdir\n")
(display "librktdir=\"$bindir/") (display "librktdir=\"$bindir/")
(display (find-relative-path bindir (display (find-relative-path (if as-relative?
(simplify-path
(let-values ([(base name dir?) (split-path (path->complete-path dest))])
base))
bindir)
(simplify-path (simplify-path
(find-lib-dir)))) (find-lib-dir))))
(display "\"\n") (display "\"\n")