From 0535adf573f980376bff01760c26ce4473fac270 Mon Sep 17 00:00:00 2001 From: Eric Avdey Date: Fri, 30 Nov 2018 11:23:33 -0400 Subject: [PATCH 1/3] Use devclean on elixir target for consistency of Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c258b16f0d3..5cd852c031a 100644 --- a/Makefile +++ b/Makefile @@ -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 From 5024d334d0709dda6022556168cf0a9277f0acd3 Mon Sep 17 00:00:00 2001 From: Eric Avdey Date: Fri, 30 Nov 2018 13:56:35 -0400 Subject: [PATCH 2/3] Remove an empty space at line-end --- Makefile.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.win b/Makefile.win index e57763b720d..a95e0ec0304 100644 --- a/Makefile.win +++ b/Makefile.win @@ -326,7 +326,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 From ad22735250af8b4975bffae2fdec4beb0b193af6 Mon Sep 17 00:00:00 2001 From: Eric Avdey Date: Fri, 30 Nov 2018 13:57:31 -0400 Subject: [PATCH 3/3] Use devclean on elixir target in Makefile.win --- Makefile.win | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.win b/Makefile.win index a95e0ec0304..eedf99b2fa5 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