From 558d34708b4b8db7aea84ea8dc0c353892fbf13c Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Sun, 9 Nov 2014 11:08:39 -0500 Subject: Add 24.4 support Also tests rejeep/evm#48 --- .travis.yml | 1 + Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63f0cb6..ae882b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - EVM_EMACS=emacs-24.1-bin - EVM_EMACS=emacs-24.2-bin - EVM_EMACS=emacs-24.3-bin + - EVM_EMACS=emacs-24.4-bin before_install: - sudo mkdir /usr/local/evm diff --git a/Makefile b/Makefile index e812d5b..b322342 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,9 @@ # make all # -all: 24.1 24.2 24.3 +all: 24.1 24.2 24.3 24.4 -%: +.DEFAULT: evm install emacs-$@-bin || true emacs --version emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit -- cgit v1.2.3 From 54cfa773584fe0d9828a58d9d09a19959515e21b Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Sun, 9 Nov 2014 11:24:19 -0500 Subject: Avoid .DEFAULT rule in Makefile Instead, use a proper 'group' rule using the `VERSIONS' variable. Also, the use of `::' signals that the order doesn't matter at all; the recipes will be executed in the order they appear in the Makefile. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b322342..1ca10c0 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,11 @@ # make all # -all: 24.1 24.2 24.3 24.4 +VERSIONS = 24.1 24.2 24.3 24.4 -.DEFAULT: +all :: $(VERSIONS) + +$(VERSIONS) :: evm install emacs-$@-bin || true emacs --version emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit -- cgit v1.2.3 From 3a1645bd1f446ff6cfef4eb901d05138ea9232bf Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Sun, 9 Nov 2014 15:44:27 -0500 Subject: Compress Makefile usage Instead of using `make 24.1', use `make 1'. Also, skip install if it is present already. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1ca10c0..d24eccd 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # # To test Emacs 24.1, for example, use # -# make 24.1 +# make 1 # # To test on all versions, of course, simply use # @@ -16,11 +16,11 @@ # make all # -VERSIONS = 24.1 24.2 24.3 24.4 +VERSIONS = 1 2 3 4 all :: $(VERSIONS) $(VERSIONS) :: - evm install emacs-$@-bin || true + evm install emacs-24.$@-bin --skip || true emacs --version emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit -- cgit v1.2.3 From e771f785e6f411d0444e896d79b83faf293ca714 Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Sun, 9 Nov 2014 15:45:42 -0500 Subject: Ensure correct version is being tested The `--use' option for `evm' seems to be ineffective on my machine. This usage is (or should be) functionally equivalent; it links `emacs' to the correct version in EVM. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d24eccd..7e46ced 100644 --- a/Makefile +++ b/Makefile @@ -22,5 +22,6 @@ all :: $(VERSIONS) $(VERSIONS) :: evm install emacs-24.$@-bin --skip || true + evm use emacs-24.$@-bin emacs --version emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit -- cgit v1.2.3 From d66ad8cf0b375d21cc3aaf783906bfeaf66b9e11 Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Sun, 9 Nov 2014 15:46:55 -0500 Subject: Add rules to install evm; cask --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 7e46ced..61c3b66 100644 --- a/Makefile +++ b/Makefile @@ -25,3 +25,9 @@ $(VERSIONS) :: evm use emacs-24.$@-bin emacs --version emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit + +install_cask: + curl -fsSkL https://raw.github.com/cask/cask/master/go | python + +install_evm: + curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash -- cgit v1.2.3 From 1faf387be8f9feb621ad1a5ab0eb23d6cf1f5444 Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Sun, 9 Nov 2014 15:47:09 -0500 Subject: Ensure Emacs uses hard tabs for this file --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 61c3b66..28058d8 100644 --- a/Makefile +++ b/Makefile @@ -31,3 +31,7 @@ install_cask: install_evm: curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash + +# Local Variables: +# indent-tabs-mode: t +# End: -- cgit v1.2.3 From a3788b8f4f1ae24c48fa2c6c85bd789e08a4293c Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Sun, 9 Nov 2014 15:47:23 -0500 Subject: Ensure dependencies for this version are in place --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 28058d8..7b0b698 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ $(VERSIONS) :: evm install emacs-24.$@-bin --skip || true evm use emacs-24.$@-bin emacs --version + cask install emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit install_cask: -- cgit v1.2.3