Skip to content

build-app: run the user entry's main submodule (packaged apps were no-ops) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
turinglambdaai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build-app: run the user entry's main submodule (packaged apps were no-ops) #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion glaze/build.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,13 @@ NSI
;; executable's own directory first, then falls back to the original CWD if
;; that directory does not contain a public/ (covering launchers that report
;; a wrapper path).
;;
;; Running the user program must mirror `racket main.rkt`: instantiate the
;; (module+ main) submodule when the user entry declares one, otherwise the
;; module body itself. A static (require "main.rkt") here loads the module
;; as a plain library — its main submodule would never run and the packaged
;; app would exit 0 without executing anything (the entry wrapper itself has
;; no main submodule either).
(define (entry-module-source user-entry)
(define entry-filename
(let ([p (if (complete-path? user-entry)
Expand All @@ -416,7 +423,16 @@ NSI
" (and c (directory-exists? (build-path c \"public\")) c))])\n"
" (when (and pick (not (directory-exists? (build-path (current-directory) \"public\"))))\n"
" (current-directory pick)))\n"
(format "(require \"~a\")\n" entry-filename)))
;; Static require: embeds the user module and its full dependency closure
;; (raco exe cannot see dynamic-requires), and runs top-level code once.
(format "(require \"~a\")\n" entry-filename)
";; Run the user entry the way `racket main.rkt` would: the (module+ main)\n"
";; submodule when declared, else the module body. The static require above\n"
";; embeds the full dependency closure and runs top-level code once; the\n"
";; main submodule itself is only instantiated for the program's top module,\n"
";; which is this wrapper — so run it explicitly here.\n"
"(when (module-declared? '(submod \"" entry-filename "\" main) #t)\n"
" (dynamic-require '(submod \"" entry-filename "\" main) 0))\n"))

;; Assemble a canonical macOS .app bundle from whatever `raco distribute`
;; produced. Current versions lay out <dist>/bin/<name> + <dist>/lib/; older
Expand Down
Loading