Skip to content

Commit 233db3a

Browse files
committed
Remove external leiningen dependency by installing it locally
Signed-off-by: Greg Haskins <greg@manetu.com>
1 parent 3ee061f commit 233db3a

File tree

3 files changed

+467
-14
lines changed

3 files changed

+467
-14
lines changed

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ NAME=manetu-sparql-loadtest
44
BINDIR ?= /usr/local/bin
55
OUTPUT=target/$(NAME)
66
SHELL=/bin/bash -o pipefail
7+
LEIN ?= ./lein
78

89
SRCS += $(shell find src -type f)
910

@@ -15,17 +16,17 @@ all: scan bin
1516
bin: $(OUTPUT)
1617

1718
scan:
18-
lein cljfmt check
19-
lein bikeshed -m 120 -n false
20-
#lein kibit
21-
lein eastwood
19+
$(LEIN) cljfmt check
20+
$(LEIN) bikeshed -m 120 -n false
21+
#$(LEIN) kibit
22+
$(LEIN) eastwood
2223

2324
.PHONY: test
2425
test:
25-
lein cloverage --fail-threshold $(COVERAGE_THRESHOLD) $(patsubst %,-e %, $(COVERAGE_EXCLUSION)) | perl -pe 's/\e\[?.*?[\@-~]//g'
26+
$(LEIN) cloverage --fail-threshold $(COVERAGE_THRESHOLD) $(patsubst %,-e %, $(COVERAGE_EXCLUSION)) | perl -pe 's/\e\[?.*?[\@-~]//g'
2627

2728
$(OUTPUT): $(SRCS) Makefile project.clj
28-
@lein bin
29+
@$(LEIN) bin
2930

3031
$(PREFIX)$(BINDIR):
3132
mkdir -p $@
@@ -35,7 +36,7 @@ install: $(OUTPUT) $(PREFIX)$(BINDIR)
3536

3637
clean:
3738
@echo "Cleaning up.."
38-
@lein clean
39+
@$(LEIN) clean
3940
-@rm -rf target
4041
-@rm -f *~
4142

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@ This utility helps measure your cluster's overall query performance and helps op
1313

1414
## Building
1515

16-
### Prerequisites
17-
18-
In addition to the requirements for installation, you will also need:
19-
20-
- Leiningen
21-
2216
```
2317
$ make
2418
```
19+
2520
## Usage
2621

2722
```shell
@@ -104,4 +99,3 @@ If successful, the test should display something similar to the following:
10499
|-------------+----------------+-------+--------+--------+--------+--------+--------+--------+--------|
105100
Total Duration: 20403.423232msecs
106101
```
107-

0 commit comments

Comments
 (0)