branch: externals/csharp-mode
commit 64861a6c010c78ce21bbdf77237cec8396649ff5
Merge: be13af4 f2fda33
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Merge branch 'master' into devel
---
csharp-mode-package-template.el | 4 ++--
makefile | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/csharp-mode-package-template.el b/csharp-mode-package-template.el
index 9a7d092..9f10ccb 100644
--- a/csharp-mode-package-template.el
+++ b/csharp-mode-package-template.el
@@ -1,4 +1,4 @@
(define-package
- "demo-multifile"
+ "csharp-mode"
"VERSION"
- "a demo multifile package.")
+ "C# mode derived mode")
diff --git a/makefile b/makefile
index ddcd321..65d9f92 100644
--- a/makefile
+++ b/makefile
@@ -1,21 +1,20 @@
-#VERSION:=0.8.7
VERSION=$(shell grep ";; Version " csharp-mode.el | cut -d ":" -f2 | cut -c2-)
PACKAGE_SHORTNAME=csharp-mode
PACKAGE_NAME:=$(PACKAGE_SHORTNAME)-$(VERSION)
-#PACKAGE_DIR:=./.tmp/$(PACKAGE_NAME)
-PACKAGE_DIR:=/tmp/$(PACKAGE_NAME)
+PACKAGE_DIR:=./.tmp/$(PACKAGE_NAME)
+#PACKAGE_DIR:=/tmp/$(PACKAGE_NAME)
EMACS=$(shell which emacs) -Q -batch -L .
ELS = csharp-mode.el csharp-mode-tests.el
ELCS = $(ELS:.el=.elc)
package: $(PACKAGE_DIR)
- tar cvf ../$(PACKAGE_NAME).tar --exclude="*#" --exclude="*~"
--exclude="*tests*" --exclude "*package-template*" --exclude="makefile"
--exclude="*.sh" -C $(PACKAGE_DIR)/.. $(PACKAGE_NAME)
+ tar cvf ../$(PACKAGE_NAME).tar --exclude="*#" --exclude="*~"
--exclude="*tests*" --exclude "*package-template*" --exclude="makefile"
--exclude="run-travis-ci.sh" -C $(PACKAGE_DIR)/.. $(PACKAGE_NAME)
$(PACKAGE_DIR):
mkdir -p $@
cp -r ../$(PACKAGE_SHORTNAME)/* $@
- sed -re "s/VERSION/$(VERSION)/"
$@/$(PACKAGE_SHORTNAME)-package-template.el > $@/$(PACKAGE_NAME)-pkg.el
+ sed -re "s/VERSION/$(VERSION)/"
$@/$(PACKAGE_SHORTNAME)-package-template.el > $@/$(PACKAGE_SHORTNAME)-pkg.el
test:
+ $(EMACS) -l csharp-mode-tests.el -f ert-run-tests-batch-and-exit
