Skip to content

Commit b15eac6

Browse files
committed
Fix Makefile for boot/base having switched from maven to lein
1 parent d437f6f commit b15eac6

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Makefile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ aetheruber = aether.uber.jar
1414
workerjar = boot/worker/target/worker-$(version).jar
1515
corejar = boot/core/target/core-$(version).jar
1616
basejar = boot/base/target/base-$(version).jar
17-
baseuber = boot/base/target/base-$(version)-jar-with-dependencies.jar
17+
baseuber = boot/base/target/base-$(version)-standalone.jar
1818
alljars = $(podjar) $(aetherjar) $(workerjar) $(corejar) $(baseuber) $(bootjar)
1919
java_version = $(shell java -version 2>&1 | awk -F '"' '/version/ {print $$2}' |awk -F. '{print $$1 "." $$2}')
2020

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

2525
clean:
26-
(cd boot/base && mvn -q clean && rm -f src/main/resources/$(aetheruber))
26+
(cd boot/base && lein clean && rm -f src/main/resources/$(aetheruber))
2727
(cd boot/core && lein clean)
2828
(cd boot/aether && lein clean)
2929
(cd boot/pod && lein clean)
@@ -44,11 +44,8 @@ bin/boot: mkdirs
4444

4545
deps: bin/lein bin/boot
4646

47-
boot/base/pom.xml: $(verfile) boot/base/pom.in.xml
48-
(cd boot/base && cat pom.in.xml |sed 's/__VERSION__/$(version)/' > pom.xml)
49-
50-
$(basejar): boot/base/pom.xml $(shell find boot/base/src/main/java)
51-
(cd boot/base && mvn -q install)
47+
$(basejar): $(verfile) boot/base/project.clj $(shell find boot/base/src/main/java)
48+
(cd boot/base && lein install)
5249

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

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

7067
$(bootjar): $(verfile) boot/boot/project.clj
7168
(cd boot/boot && lein install)

0 commit comments

Comments
 (0)