branch: elpa/popup
commit 8719cd925a95a1f465d1c3392a130e729ced47b2
Merge: d70cff9 a73a3b1
Author: Syohei YOSHIDA <syo...@gmail.com>
Commit: Syohei YOSHIDA <syo...@gmail.com>
Merge pull request #71 from auto-complete/use-cask
Use cask
---
.gitignore | 2 +-
.gitmodules | 3 ---
.travis.yml | 24 ++++++++++++++----------
Cask | 7 +++++++
Makefile | 25 ++++++++++++++-----------
lib/ert | 1 -
tests/run-test.el | 14 ++------------
7 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/.gitignore b/.gitignore
index 44f8384..64b1053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/tests/ert.el
+/.cask/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e31e75c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "lib/ert"]
- path = lib/ert
- url = git://github.com/ohler/ert.git
diff --git a/.travis.yml b/.travis.yml
index 1a07d7c..abed12f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
language: emacs-lisp
+env:
+ matrix:
+ - EMACS=emacs24
+ - EMACS=emacs-snapshot
+ global:
+ - CASK=$HOME/.cask/bin/cask
before_install:
- - git submodule update --init
- - make tests/cl-lib.el
+ - sudo add-apt-repository -y ppa:cassou/emacs
+ - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq $EMACS
- if [ "$EMACS" = 'emacs-snapshot' ]; then
- sudo add-apt-repository -y ppa:cassou/emacs &&
- sudo apt-get update -qq &&
- sudo apt-get install -qq
- emacs-snapshot-el emacs-snapshot-gtk emacs-snapshot;
+ sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-nox;
fi
-env:
- - EMACS=emacs
- - EMACS=emacs-snapshot
+ - curl -fsSkL --max-time 10 --retry 10 --retry-delay 10
+ https://raw.github.com/cask/cask/master/go | python
script:
- make travis-ci EMACS=$EMACS
+ make travis-ci
diff --git a/Cask b/Cask
new file mode 100644
index 0000000..c7b2ddb
--- /dev/null
+++ b/Cask
@@ -0,0 +1,7 @@
+(source gnu)
+(source melpa)
+
+(package-file "popup.el")
+
+(development
+ (depends-on "ert"))
diff --git a/Makefile b/Makefile
index 4fea1d4..6c7c3bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,28 @@
-EMACS=emacs
+EMACS ?= emacs
+CASK ?= cask
EMACS23=emacs23
+ELPA_DIR = \
+ .cask/$(shell $(EMACS) -Q --batch --eval '(princ emacs-version)')/elpa
+
.PHONY: test test-nw test-emacs23 test-emacs23-nw travis-ci
test:
- ${EMACS} -Q -L . -l tests/run-test.el
+ $(CASK) exec $(EMACS) -Q -L . -l tests/run-test.el
test-nw:
- ${EMACS} -Q -nw -L . -l tests/run-test.el
+ $(CASK) exec $(EMACS) -Q -nw -L . -l tests/run-test.el
test-emacs23: tests/ert.el
${EMACS23} -Q -L . -l test/ert.el -l tests/run-test.el
test-emacs23-nw: tests/ert.el
- ${EMACS23} -Q -nw -L . -l test/ert.el -l tests/run-test.el
-
-travis-ci:
- ${EMACS} -batch -Q -l tests/run-test.el
+ $(EMACS23) -Q -nw -L . -l test/ert.el -l tests/run-test.el
-tests/ert.el:
- wget
"http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el"; -O $@
+travis-ci: elpa
+ $(CASK) exec $(EMACS) -batch -Q -l tests/run-test.el
-tests/cl-lib.el:
- wget "http://elpa.gnu.org/packages/cl-lib-0.3.el"; -O $@
+elpa: $(ELPA_DIR)
+$(ELPA_DIR): Cask
+ $(CASK) install
+ touch $@
diff --git a/lib/ert b/lib/ert
deleted file mode 160000
index 00aef6e..0000000
--- a/lib/ert
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00aef6e43d44c6f25323d1a7bdfdc929a3b4ce04
diff --git a/tests/run-test.el b/tests/run-test.el
index 4cb8022..fce1fe2 100644
--- a/tests/run-test.el
+++ b/tests/run-test.el
@@ -1,7 +1,7 @@
;; Usage:
;;
-;; emacs -Q -l tests/run-test.el # interactive mode
-;; emacs -batch -Q -l tests/run-test.el # batch mode
+;; cask exec emacs -Q -l tests/run-test.el # interactive mode
+;; cask exec emacs -batch -Q -l tests/run-test.el # batch mode
;; Utils
@@ -22,16 +22,6 @@
(list popup-test-dir
popup-root-dir))
-
-;; Use ERT from github when this Emacs does not have it
-(unless (locate-library "ert")
- (add-to-list
- 'load-path
- (popup-test-join-path popup-root-dir "lib" "ert" "lisp" "emacs-lisp"))
- (require 'ert-batch)
- (require 'ert-ui))
-
-
;; Load tests
(load "popup-test")
