emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/csharp-mode 79e0a60 256/459: New simpler build based on


From: ELPA Syncer
Subject: [elpa] externals/csharp-mode 79e0a60 256/459: New simpler build based on Cask
Date: Sun, 22 Aug 2021 13:59:39 -0400 (EDT)

branch: externals/csharp-mode
commit 79e0a606f60a2620631623285dbbbd8591cbd2f8
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>

    New simpler build based on Cask
---
 .gitignore                  |  1 +
 .travis.yml                 | 14 +++++++-------
 Cask                        |  5 +++++
 csharp-mode-pkg.el.template |  5 -----
 makefile                    | 38 +++++++++++---------------------------
 run-travis-ci.sh            | 14 --------------
 6 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1dc8ce0..f3d8a8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ tramp
 
 # cask packages
 .cask/
+dist/
 
 
 ### Elisp ###
diff --git a/.travis.yml b/.travis.yml
index 6a3a9ca..6307d4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,22 @@
 language: generic
 sudo: false
+before_install:
+  - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh 
&& source ./x.sh
+  - evm install $EVM_EMACS --use --skip
+  - cask
 
 env:
   - EVM_EMACS=emacs-24.4-travis
   - EVM_EMACS=emacs-24.5-travis
   - EVM_EMACS=emacs-25.1-travis
   - EVM_EMACS=emacs-25.2-travis
+  - EVM_EMACS=emacs-25.3-travis
   - EVM_EMACS=emacs-git-snapshot-travis
 
 matrix:
   allow_failures:
     - env: EVM_EMACS=emacs-git-snapshot-travis
 
-before_install:
-  - git clone https://github.com/rejeep/evm.git /home/travis/.evm
-  - export PATH="/home/travis/.evm/bin:$PATH"
-  - evm config path /tmp
-  - evm install --use $EVM_EMACS
-
 script:
-  ./run-travis-ci.sh
+  - emacs --version
+  - make test
diff --git a/Cask b/Cask
new file mode 100644
index 0000000..f69b06f
--- /dev/null
+++ b/Cask
@@ -0,0 +1,5 @@
+(source gnu)
+(source melpa)
+
+(files "*.el")
+(package-file "csharp-mode.el")
diff --git a/csharp-mode-pkg.el.template b/csharp-mode-pkg.el.template
deleted file mode 100644
index 34e209b..0000000
--- a/csharp-mode-pkg.el.template
+++ /dev/null
@@ -1,5 +0,0 @@
-(define-package
-    "csharp-mode"
-    "VERSION"
-    "C# mode derived mode"
-    '((cl-lib "0.5")))
diff --git a/makefile b/makefile
index 56f8d3b..efaf0ca 100644
--- a/makefile
+++ b/makefile
@@ -1,38 +1,22 @@
-VERSION=$(shell grep -a ";; 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)
+EMACS="$(shell which emacs)"
+EMACS_CLI=$(EMACS) -Q -batch -L .
+CASK=~/.cask/bin/cask
 
-EMACS="$(shell which emacs)" -Q -batch -L .
-ELS = csharp-mode.el csharp-mode-tests.el
-ELCS = $(ELS:.el=.elc)
+package: build
+       $(CASK) package
 
-all: $(ELCS) test package
+build: test
+       $(CASK) build
 
-package: $(PACKAGE_DIR)
-       tar cvf ../$(PACKAGE_NAME).tar --exclude="*#" --exclude="*~" 
--exclude="*tests*" --exclude="test-files" --exclude "*-pkg.el.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)-pkg.el.template 
> $@/$(PACKAGE_SHORTNAME)-pkg.el
-
-test:
-       + $(EMACS) -l csharp-mode-tests.el -f ert-run-tests-batch-and-exit
-
-%.elc: %.el
-       $(EMACS) -f batch-byte-compile $<
+test: *.el
+       + $(EMACS_CLI) -l csharp-mode-tests.el -f ert-run-tests-batch-and-exit
 
 clean:
-       rm -f ../$(PACKAGE_NAME).tar
-       rm -rf $(PACKAGE_DIR)
-       rm -rf $(ELCS)
+       $(CASK) clean-elc
+       rm -rf dist
 
 check-defuns:
        grep "^(defun " csharp-mode.el | sed -r "s/\(defun ([a-z0-9-]+) 
.*$$/\1/" | sort >/tmp/defuns.txt
        for line in `cat /tmp/defuns.txt` ; do echo -n "$$line: " ; grep 
"$$line" csharp-mode.el | grep -v defun | wc -l ; done >/tmp/use-count.txt
        grep " 0" /tmp/use-count.txt
 
-
-# end
diff --git a/run-travis-ci.sh b/run-travis-ci.sh
deleted file mode 100755
index e255a6a..0000000
--- a/run-travis-ci.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-cd "$(dirname "$0")"
-
-ECUKES_EMACS=${EMACS:-$(which emacs)}
-export ECUKES_EMACS
-
-echo "*** Emacs version ***"
-echo "ECUKES_EMACS = $ECUKES_EMACS"
-"$ECUKES_EMACS" --version
-echo
-
-# bytecompile, tests, package
-make



reply via email to

[Prev in Thread] Current Thread [Next in Thread]