Skip to content

Fix Makefile for boot/base having switched from maven to lein #754

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

Merged
merged 1 commit into from
Apr 22, 2021
Merged

Fix Makefile for boot/base having switched from maven to lein #754

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
15 changes: 6 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ aetheruber = aether.uber.jar
workerjar = boot/worker/target/worker-$(version).jar
corejar = boot/core/target/core-$(version).jar
basejar = boot/base/target/base-$(version).jar
baseuber = boot/base/target/base-$(version)-jar-with-dependencies.jar
baseuber = boot/base/target/base-$(version)-standalone.jar
alljars = $(podjar) $(aetherjar) $(workerjar) $(corejar) $(baseuber) $(bootjar)
java_version = $(shell java -version 2>&1 | awk -F '"' '/version/ {print $$2}' |awk -F. '{print $$1 "." $$2}')

Expand All @@ -23,7 +23,7 @@ help:
@echo "Usage: make {help|deps|install|deploy|test|clean}" 1>&2 && false

clean:
(cd boot/base && mvn -q clean && rm -f src/main/resources/$(aetheruber))
(cd boot/base && lein clean && rm -f src/main/resources/$(aetheruber))
(cd boot/core && lein clean)
(cd boot/aether && lein clean)
(cd boot/pod && lein clean)
Expand All @@ -44,11 +44,8 @@ bin/boot: mkdirs

deps: bin/lein bin/boot

boot/base/pom.xml: $(verfile) boot/base/pom.in.xml
(cd boot/base && cat pom.in.xml |sed 's/__VERSION__/$(version)/' > pom.xml)

$(basejar): boot/base/pom.xml $(shell find boot/base/src/main/java)
(cd boot/base && mvn -q install)
$(basejar): $(verfile) boot/base/project.clj $(shell find boot/base/src/main/java)
(cd boot/base && lein install)

$(podjar): $(verfile) boot/pod/project.clj $(shell find boot/pod/src)
(cd boot/pod && lein install)
Expand All @@ -64,8 +61,8 @@ $(workerjar): $(verfile) boot/worker/project.clj $(shell find boot/worker/src)
$(corejar): $(verfile) boot/core/project.clj $(shell find boot/core/src)
(cd boot/core && lein install)

$(baseuber): boot/base/pom.xml $(shell find boot/base/src/main)
(cd boot/base && mvn -q assembly:assembly -DdescriptorId=jar-with-dependencies)
$(baseuber): boot/base/project.clj $(shell find boot/base/src/main)
(cd boot/base && lein uberjar)

$(bootjar): $(verfile) boot/boot/project.clj
(cd boot/boot && lein install)
Expand Down