Skip to content

Commit

Permalink
jsonrpc.el is now a GNU ELPA depedency
Browse files Browse the repository at this point in the history
* Makefile (ELFILES): Don't include jsonrpc.
(jsonrpc-check): Remove target.
(check): Don't run jsonrpc-check

* eglot.el (Package-Requires): Require jsonrpc 1.0.0
(Version): Bump to 1.1

* jsonrpc.el: Remove

* jsonrpc-tests.el: Remove
  • Loading branch information
joaotavora committed Jul 9, 2018
1 parent 55ee8e9 commit 9211f16
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 936 deletions.
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SELECTOR=t

LOAD_PATH=-L .

ELFILES := eglot.el jsonrpc.el eglot-tests.el jsonrpc-tests.el
ELFILES := eglot.el eglot-tests.el
ELCFILES := $(ELFILES:.el=.elc)

all: compile
Expand All @@ -21,17 +21,12 @@ compile: $(ELCFILES)

# Automated tests
#
eglot-check: compile
eglot-check: compile
$(EMACS) -Q --batch $(LOAD_PATH) \
-l eglot-tests \
--eval '(ert-run-tests-batch-and-exit (quote $(SELECTOR)))'

jsonrpc-check: jsonrpc.elc jsonrpc-tests.elc
$(EMACS) -Q --batch $(LOAD_PATH) \
-l jsonrpc-tests \
--eval '(ert-run-tests-batch-and-exit (quote $(SELECTOR)))'

check: eglot-check jsonrpc-check
check: eglot-check

# Cleanup
#
Expand Down
4 changes: 2 additions & 2 deletions eglot.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

;; Copyright (C) 2018 Free Software Foundation, Inc.

;; Version: 1.0
;; Version: 1.1
;; Author: João Távora <joaotavora@gmail.com>
;; Maintainer: João Távora <joaotavora@gmail.com>
;; URL: https://github.com/joaotavora/eglot
;; Keywords: convenience, languages
;; Package-Requires: ((emacs "26.1"))
;; Package-Requires: ((emacs "26.1") (jsonrpc "1.0.0"))

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
Expand Down
204 changes: 0 additions & 204 deletions jsonrpc-tests.el

This file was deleted.

Loading

0 comments on commit 9211f16

Please sign in to comment.