branch: externals/realgud-node-debug commit cf5e97819f2a52fecec3392e08a490f7e5abe025 Author: rocky <r...@dustyfeet.com> Commit: rocky <r...@dustyfeet.com>
Administrivia... add load-relative, note elc dependencies --- common.mk | 2 +- compute-lispdir.sh | 4 ++-- configure.ac | 2 +- realgud-node-debug.el | 6 +++--- realgud-node-debug/Makefile.am | 3 +++ realgud-node-debug/core.el | 1 + realgud-node-debug/init.el | 1 + realgud-node-debug/track-mode.el | 1 + 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/common.mk b/common.mk index fc865e4..36fbedc 100644 --- a/common.mk +++ b/common.mk @@ -1,5 +1,5 @@ MOSTLYCLEANFILES = *.elc -EMACSLOADPATH= +EMACSLOADPATH=:/home/rocky/.emacs.d/elpa/test-simple-20170527.1532/:/home/rocky/.emacs.d/elpa/realgud-20190504.1238/:/home/rocky/.emacs.d/elpa/load-relative-20170526.1010/:/home/rocky/.emacs.d/elpa/loc-changes-20160801.1708/ short: $(MAKE) 2>&1 >/dev/null | ruby $(top_srcdir)/make-check-filter.rb diff --git a/compute-lispdir.sh b/compute-lispdir.sh index c46a66a..b4053a6 100755 --- a/compute-lispdir.sh +++ b/compute-lispdir.sh @@ -24,7 +24,7 @@ done for dir in $list ; do if [[ -d $dir ]] ; then case $dir in - */emacs/2[3-6]\.[0-9]/site-lisp) + */emacs/2[5-7]\.[0-9]/site-lisp) ((DEBUG)) && echo "versioned site lisp: $dir" echo "$dir" exit 0 @@ -35,7 +35,7 @@ done for dir in $list ; do if [[ -d $dir ]] ; then case $dir in - */emacs/2[3-6]\.[0-9]/site-lisp) + */emacs/2[5-7]\.[0-9]/site-lisp) ((DEBUG)) && echo "versioned site lisp: $dir" echo "$dir" exit 0 diff --git a/configure.ac b/configure.ac index 457fce0..8824019 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_MSG_NOTICE("Checking emacs version") $EMACS -batch -q --no-site-file -eval \ '(if (<= emacs-major-version 23) (progn - (error "You need GNU Emacs 24 or better.") + (error "You need GNU Emacs 25 or better.") (kill-emacs 1) ) )' diff --git a/realgud-node-debug.el b/realgud-node-debug.el index 748c35b..c9a403a 100644 --- a/realgud-node-debug.el +++ b/realgud-node-debug.el @@ -3,9 +3,9 @@ ;; Author: Rocky Bernstein <ro...@gnu.org> ;; Version: 1.0.0 ;; Package-Type: multi -;; Package-Requires: ((realgud "1.4.5") (load-relative "1.2") (cl-lib "0.5") (emacs "24")) +;; Package-Requires: ((realgud "1.4.5") (load-relative "1.2") (cl-lib "0.5") (emacs "25")) ;; URL: http://github.com/realgud/realgud-node-debug -;; Compatibility: GNU Emacs 24.x +;; Compatibility: GNU Emacs 25.x ;; Copyright (C) 2019 Free Software Foundation, Inc @@ -40,7 +40,7 @@ (defgroup realgud-node-debug nil "Realgud interface to the older 'node debug' debugger" :group 'realgud - :version "24.3") + :version "25.1") (require-relative-list '( "./realgud-node-debug/main" ) "realgud-") (load-relative "./realgud-node-debug/main.el") diff --git a/realgud-node-debug/Makefile.am b/realgud-node-debug/Makefile.am index aa624b8..08541ac 100644 --- a/realgud-node-debug/Makefile.am +++ b/realgud-node-debug/Makefile.am @@ -3,3 +3,6 @@ EXTRA_DIST=$(lisp_files) lisp_LISP = $(lisp_files) include ../common.mk lispdir = @lispdir@/node-inspect + +main.elc: core.elc track-mode.elc +track-mode.elc: core.elc init.elc diff --git a/realgud-node-debug/core.el b/realgud-node-debug/core.el index 96d3092..6e90f61 100644 --- a/realgud-node-debug/core.el +++ b/realgud-node-debug/core.el @@ -15,6 +15,7 @@ (eval-when-compile (require 'cl-lib)) (require 'realgud) +(require 'load-relative) (declare-function realgud:expand-file-name-if-exists 'realgud-core) (declare-function realgud-lang-mode? 'realgud-lang) diff --git a/realgud-node-debug/init.el b/realgud-node-debug/init.el index fe3a5c3..f7162c0 100644 --- a/realgud-node-debug/init.el +++ b/realgud-node-debug/init.el @@ -27,6 +27,7 @@ (require 'realgud) (require 'realgud-lang-js) (require 'ansi-color) +(require 'load-relative) (defvar realgud:node-debug-pat-hash) (declare-function make-realgud-loc-pat (realgud-loc)) diff --git a/realgud-node-debug/track-mode.el b/realgud-node-debug/track-mode.el index f18fd0b..2f1f906 100644 --- a/realgud-node-debug/track-mode.el +++ b/realgud-node-debug/track-mode.el @@ -22,6 +22,7 @@ (declare-function realgud:remove-ansi-schmutz 'realgud:utils) (require 'realgud) +(require 'load-relative) (require-relative-list '("core" "init") "realgud:node-debug-")