branch: elpa/drupal-mode
commit 866c3f4f86b699d771889b820e8dd4e3a71f6e46
Author: Arne Jørgensen <[email protected]>
Commit: Arne Jørgensen <[email protected]>
Carton renamed to Cask.
---
Carton | 3 ---
Cask | 3 +++
Makefile | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Carton b/Carton
deleted file mode 100644
index d4838337c6..0000000000
--- a/Carton
+++ /dev/null
@@ -1,3 +0,0 @@
-(package-file "drupal-mode.el")
-
-(source "marmalade" "http://marmalade-repo.org/packages/";)
diff --git a/Cask b/Cask
new file mode 100644
index 0000000000..efad37c367
--- /dev/null
+++ b/Cask
@@ -0,0 +1,3 @@
+(package-file "drupal-mode.el")
+
+(source marmalade)
diff --git a/Makefile b/Makefile
index 8266815737..6a8e9f52cd 100644
--- a/Makefile
+++ b/Makefile
@@ -19,12 +19,12 @@
.PHONY: all test clean install
-CARTON?=carton
+CASK?=cask
EMACS?=emacs
TAR?=bsdtar
PANDOC?=pandoc --atx-headers
-VERSION?=$(shell $(CARTON) version)
+VERSION?=$(shell $(CASK) version)
ARCHIVE_NAME=drupal-mode
PACKAGE_NAME=$(ARCHIVE_NAME)-$(VERSION)
@@ -32,8 +32,8 @@ PACKAGE_NAME=$(ARCHIVE_NAME)-$(VERSION)
all: $(PACKAGE_NAME).tar
test:
- $(CARTON) install
- $(CARTON) exec $(EMACS) --no-site-file --no-site-lisp --batch -L $(PWD)
-l drupal-tests -f ert-run-tests-batch-and-exit
+ $(CASK) install
+ $(CASK) exec $(EMACS) --no-site-file --no-site-lisp --batch -L $(PWD)
-l drupal-tests -f ert-run-tests-batch-and-exit
$(ARCHIVE_NAME).info: README.md
$(PANDOC) -t texinfo $^ | makeinfo -o $@
@@ -42,7 +42,7 @@ README: README.md
$(PANDOC) -t plain -o $@ $^
$(ARCHIVE_NAME)-pkg.el: $(ARCHIVE_NAME).el
- $(CARTON) package
+ $(CASK) package
# create a tar ball in package.el format for uploading to
http://marmalade-repo.org
$(PACKAGE_NAME).tar: README $(ARCHIVE_NAME).el $(ARCHIVE_NAME)-pkg.el
$(ARCHIVE_NAME).info dir drupal/*.el drupal-tests.el drush-make-mode.el
@@ -53,4 +53,4 @@ install: $(PACKAGE_NAME).tar
clean:
$(RM) $(ARCHIVE_NAME).info $(ARCHIVE_NAME)-*.tar $(ARCHIVE_NAME)-pkg.el
README
- $(RM) -r elpa
+ $(RM) -r .cask
