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

cs: repairs relevant to running `racket/gui/ programs on Unix

Browse Source
This commit is contained in:
Matthew Flatt 2018-10-26 14:05:33 -06:00
parent 3b9bc21304
commit 23648ba165
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
racket/src/cs/c/Makefile.in
View File

@ -243,6 +243,7 @@ unix-install:
rm -f "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)"
$(ICP) gracketcs "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)"
$(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
$(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
RKTFWDEST = @FRAMEWORK_INSTALL_DIR@/Racket.framework
FRAMEWORK_REL_PREFIX = "@executable_path/../$(libpltdir_rel)/"

30
racket/src/cs/main.sps
View File

@ -207,6 +207,13 @@
(when (equal? what "")
(error 'racket "empty ~a after ~a switch" what (or within-flag flag))))
(define (raise-bad-switch arg within-arg)
(raise-user-error 'racket "bad switch: ~a~a"
arg
(if within-arg
(format " within: ~a" within-arg)
"")))
(define-syntax string-case
;; Assumes that `arg` is a variable
(syntax-rules ()
@ -326,6 +333,7 @@
(flags-loop (cdr args) (see saw 'non-config))]
[("-v" "--version")
(set! version? #t)
(no-init! saw)
(flags-loop (cdr args) (see saw 'non-config))]
[("-c" "--no-compiled")
(set! compiled-file-paths '())
@ -378,6 +386,22 @@
(let-values ([(name rest-args) (next-arg "name" arg within-arg args)])
(set-run-file! (string->path name))
(loop rest-args))]
[("-J")
(cond
[gracket?
(let-values ([(wm-class rest-args) (next-arg "WM_CLASS string" arg within-arg args)])
(unsafe-register-process-global (string->bytes/utf-8 "Racket-GUI-wm-class")
(string->bytes/utf-8 wm-class))
(loop rest-args))]
[else
(raise-bad-switch arg within-arg)])]
[("-K")
(cond
[gracket?
(unsafe-register-process-global (string->bytes/utf-8 "Racket-GUI-no-front") #vu8(1))
(loop (cdr args))]
[else
(raise-bad-switch arg within-arg)])]
[("--")
(cond
[(or (null? (cdr args)) (not (pair? (cadr args))))
@ -396,11 +420,7 @@
(cdr (string->list arg)))
(cdr args)))]
[else
(raise-user-error 'racket "bad switch: ~a~a"
arg
(if within-arg
(format " within: ~a" within-arg)
""))])]
(raise-bad-switch arg within-arg)])]
[else
;; Non-flag argument
(finish args saw)])])))))