Skip to content
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.

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

change default install of bin files to be soft links to lib files #777

Merged
merged 2 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ if [ "$help" = "yes" ]; then
echo " --installschemename=<schemename> install scheme as ($installschemename)"
echo " --installpetitename=<petitename> install petite as ($installpetitename)"
echo " --installscriptname=<scriptname> install scheme-script as ($installscriptname)"
echo " --installabsolute disable relative boot-file search"
echo " --installabsolute disable relative boot-file search, bin links"
echo " --toolprefix=<prefix> prefix tool (compiler, linker, ...) names"
echo " --boot=<machine type>-<tag> build from prepared variant (e.g., pbchunk)"
echo " --emboot=\"<file> ...\" additional boot <file>s with emscripten"
Expand Down
23 changes: 20 additions & 3 deletions makefiles/install.zuo
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@
(shell/wait* "rm" "-rf" d))
(define (ln-f from to)
(shell/wait* "ln" "-f" from to))
(define (ln-s from to)
(shell/wait* "ln" "-s" from to))

(when (or (not uninstall?) script-to)
(when script-to (out "\ninstall:"))
Expand All @@ -181,9 +183,24 @@
(rm-f SchemePath)
(rm-f PetitePath)
(rm-f SchemeScriptPath)
(I "-m" "555" Scheme SchemePath)
(ln-f SchemePath PetitePath)
(ln-f SchemePath SchemeScriptPath)
(cond
[(equal? (hash-ref config 'relativeBootFiles #f) "yes")
(define SchemeLibPath (build-path LibBin InstallSchemeName))
(define PetiteLibPath (build-path LibBin InstallPetiteName))
(define ScriptLibPath (build-path LibBin InstallScriptName))
(define (ln-s/rel from to)
(define to-dir (car (split-path to)))
(ln-s (find-relative-path to-dir from) to))
(I "-m" "555" Scheme SchemeLibPath)
(ln-f SchemeLibPath PetiteLibPath)
(ln-f SchemeLibPath ScriptLibPath)
(ln-s/rel SchemeLibPath SchemePath)
(ln-s/rel PetiteLibPath PetitePath)
(ln-s/rel ScriptLibPath SchemeScriptPath)]
[else
(I "-m" "555" Scheme SchemePath)
(ln-f SchemePath PetitePath)
(ln-f SchemePath SchemeScriptPath)])

;; lib
(I "-m" "444" PetiteBoot (build-path* LibBin "petite.boot"))
Expand Down
2 changes: 1 addition & 1 deletion zuo