Merge pull request #1046 from abo-abo/cl-lib

Replace dash with cl-lib

Makefile

@@ -1,39 +1,18 @@
-EMACS ?= emacs
-EMACSFLAGS =
-CASK = cask
+emacs ?= emacs
+bemacs = $(emacs) -batch -l test/elpa.el
 
-OBJECTS = projectile.elc
+elpa: update compile test
 
-elpa:
-	$(CASK) install
-	$(CASK) update
-	touch $@
+update:
+	$(emacs) -batch -l test/make-update.el
 
-.PHONY: build
-build : elpa $(OBJECTS)
+compile:
+	$(bemacs) -l test/make-compile.el
 
-.PHONY: byte-compile-strict
-byte-compile-strict : elpa
-	$(CASK) exec $(EMACS) --no-site-file --no-site-lisp --batch \
-		--directory "."                          \
-		$(EMACSFLAGS)                            \
-		--eval "(progn                           \
-			(setq byte-compile-error-on-warn t)  \
-			(batch-byte-compile))" projectile.el
+test:
+	$(bemacs) -l test/run-tests
 
-.PHONY: test
-test : byte-compile-strict
-	$(CASK) exec $(EMACS) --no-site-file --no-site-lisp --batch \
-		$(EMACSFLAGS) \
-		-l test/run-tests
+clean:
+	rm -f *.elc
 
-.PHONY: clean
-clean :
-	rm -f $(OBJECTS)
-	rm -f elpa
-	rm -rf .cask # Clean packages installed for development
-
-%.elc : %.el
-	$(CASK) exec $(EMACS) --no-site-file --no-site-lisp --batch \
-		$(EMACSFLAGS) \
-		-f batch-byte-compile $<
+.PHONY: all update compile test clean

doc/contributing.md

@@ -63,12 +63,11 @@ You can support the development of Projectile via
 
 ## Running the tests in batch mode
 
-Install [cask](https://github.com/cask/cask) if you haven't
-already, then:
-
 ```
 $ cd /path/to/projectile
-$ cask
+$ make update
+$ make compile
+$ make test
 ```
 
 Run all tests with:
@@ -77,5 +76,4 @@ Run all tests with:
 $ make test
 ```
 
-(Note: tests may not run correctly inside Emacs' `shell-mode` buffers. Running
-them in a terminal is recommended.)
+Tests should run fine in `shell-mode` or `term-mode`. It's also possible to use <kbd>M-x</kbd> `compile` (or `helm-make`).