Skip to content

Fix support for :boot-jvm-options #4

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix support for :boot-jvm-options #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b15ed52
Reuse let variable
jeroenvandijk May 21, 2019
a4e7e41
Take `:boot-jvm-options` into account
jeroenvandijk May 21, 2019
902eaf5
Add simple makefile to manage compilation
jeroenvandijk May 21, 2019
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: 18 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
BINARY_LOC := $(shell which boot || which boot.bak | sed "s/.bak//")

echo:
echo ${BINARY_LOC}

bin/boot.sh:
boot build standalone
cat src/head.sh target/bootstrap.uber.jar > bin/boot.sh
chmod +x bin/boot.sh

install-boot-bin: bin/boot.sh
mv bin/boot.sh ${BINARY_LOC}

backup-boot-bin:
mv ${BINARY_LOC} ${BINARY_LOC}.bak

restore-boot-bin:
mv ${BINARY_LOC}.bak ${BINARY_LOC}
12 changes: 9 additions & 3 deletions src/bootstrap.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,22 @@

(defn- pin-version [version]
(let [props (io/file (conf/work-dir) "boot.properties")]
(when (and (.exists ^File (io/file (conf/work-dir) "boot.properties"))
(when (and (.exists ^File props)
(not= version (:boot-version (conf/project))))
(println (format "Pinning BOOT_VERSION to %s..." version))
(-> (props/load-properties props)
(props/store-properties props {"BOOT_VERSION" version})))))

(defn- launch-version [version args]
(let [jar (.getAbsolutePath ^File (version-jar version))
command (:boot-java-command (conf/config) "java")
^List args (into [command "-jar" jar] args)]
conf (conf/config)
command (:boot-java-command conf "java")
jvm-options (some-> (get conf :boot-jvm-options) vector)
^List args (into [command]
(concat
jvm-options
["-jar" jar]
args))]
(.waitFor (.start (.inheritIO (ProcessBuilder. args))))))

(defn- print-version [config]
Expand Down