branch: elpa/lua-mode
commit 5640afe440cef7193551c467aaf44fd11b390ee5
Merge: 33097fe a0d6744
Author: dennis again <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #128 from immerrr/update-makefile-and-travis-yml
Update makefile and travis yml
---
.travis.yml | 1 +
Makefile | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1afca93..910f4f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
- EVM_EMACS=emacs-24.3-travis
- EVM_EMACS=emacs-24.4-travis
- EVM_EMACS=emacs-24.5-travis
+ - EVM_EMACS=emacs-25.1-travis
- EVM_EMACS=emacs-git-snapshot-travis
before_install:
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw >
travis.sh && source ./travis.sh
diff --git a/Makefile b/Makefile
index 32f46e1..c6af0ff 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ EMACS?=emacs
EMACS_MAJOR_VERSION=$(shell $(EMACS) -batch -eval '(princ
emacs-major-version)')
LUA_MODE_ELC=lua-mode.$(EMACS_MAJOR_VERSION).elc
-EMACS_BATCH=cask exec $(EMACS) --batch -Q
+EMACS_BATCH=$(EMACS) --batch -Q
default:
@echo version is $(VERSION)
@@ -25,16 +25,30 @@ dist:
rm -f $(DISTFILE) && \
git archive --format=zip -o $(DISTFILE) --prefix=lua-mode/ HEAD
-.PHONY: test-compiled test-uncompiled
+.PHONY: test-compiled-nocask test-uncompiled-nocask test-compiled
test-uncompiled
# check both regular and compiled versions
+test-nocask: test-compiled-nocask test-uncompiled-nocask
+
test: test-compiled test-uncompiled
+test-compiled-nocask: $(LUA_MODE_ELC)
+ $(EMACS) -batch -l $(LUA_MODE_ELC) -l buttercup -f
buttercup-run-discover
+
+test-uncompiled-nocask:
+ $(EMACS) -batch -l lua-mode.el -l buttercup -f buttercup-run-discover
+
test-compiled: $(LUA_MODE_ELC)
EMACS=$(EMACS) cask exec buttercup -l $(LUA_MODE_ELC)
test-uncompiled:
EMACS=$(EMACS) cask exec buttercup -l lua-mode.el
+tryout:
+ cask exec $(EMACS) -Q -l init-tryout.el test.lua
+
+tryout-nocask:
+ $(EMACS) -Q -l init-tryout.el test.lua
+
release:
git fetch && \
git diff remotes/origin/master --exit-code && \
@@ -42,7 +56,3 @@ release:
woger lua-l lua-mode lua-mode "release $(VERSION)" "Emacs major mode
for editing Lua files" release-notes-$(VERSION)
http://github.com/immerrr/lua-mode/ && \
git push origin master
@echo 'Send update to ELPA!'
-
-
-tryout:
- cask exec $(EMACS) -Q -l init-tryout.el test.lua
