diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2018-11-30 19:11:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-30 19:11:38 -0500 |
| commit | 36f2e4ca2bc9495d1c724afa1c8a07ed9051300e (patch) | |
| tree | d412f7b39a30781d96df948e55ca045e803189d8 | |
| parent | b131fd0558089ffbe18f40e988e33928d1cf8355 (diff) | |
| parent | 510f267406a81365831c9aa65247b2c5391a12a4 (diff) | |
| download | couchdb-no-dev-data-dir.tar.gz | |
Merge branch 'master' into no-dev-data-dirno-dev-data-dir
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.win | 5 |
2 files changed, 3 insertions, 5 deletions
@@ -172,8 +172,7 @@ soak-eunit: couch while [ $$? -eq 0 ] ; do $(REBAR) -r eunit $(EUNIT_OPTS) ; done .PHONY: elixir -elixir: elixir-check-formatted - @rm -rf dev/lib +elixir: elixir-check-formatted devclean @dev/run -a adm:pass --no-eval test/elixir/run .PHONY: elixir-check-formatted diff --git a/Makefile.win b/Makefile.win index e57763b72..eedf99b2f 100644 --- a/Makefile.win +++ b/Makefile.win @@ -144,8 +144,7 @@ just-eunit: .PHONY: elixir -elixir: elixir-check-formatted - @del /s/q dev\lib 2> nul +elixir: elixir-check-formatted devclean @dev\run -a adm:pass --no-eval test\elixir\run.cmd .PHONY: elixir-check-formatted @@ -326,7 +325,7 @@ clean: -@del /f/q/s src\*.dll -@del /f/q src\couch\priv\*.exe -@del /f/q share\server\main.js share\server\main-coffee.js - -@rmdir /s/q tmp + -@rmdir /s/q tmp -@rmdir /s/q dev\data -@rmdir /s/q dev\lib -@rmdir /s/q dev\logs |