[elpa] externals/realgud-lldb 8132538 06/56: Lots of fixups

[Rocky Bernstein]

branch: externals/realgud-lldb
commit 8132538b880d1dd4de96b9262346da164f7f80e9
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Lots of fixups
---
 .gitignore               |  1 +
 Makefile.am              |  2 +-
 autogen.sh               |  1 +
 common.mk                | 10 ----------
 common.mk.in             | 26 ++++++++++++++++++++++++++
 lldb/core.el             | 14 +++-----------
 lldb/init.el             | 10 ++++++----
 lldb/lldb.el             | 12 +++++-------
 lldb/track-mode.el       |  2 +-
 realgud-lldb.el          | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 test/Makefile.am         |  5 ++---
 test/test-regexp-lldb.el |  4 ++--
 12 files changed, 95 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index ebc253a..ae58d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /README
 /aclocal.m4
 /autom4te.cache
+/common.mk
 /config.log
 /config.status
 /configure
diff --git a/Makefile.am b/Makefile.am
index 4134762..02ec831 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ include common.mk
 
 PHONY=check clean dist distclean test check-short check-terse install-short
 
-EXTRA_DIST+=common.mk README.md THANKS
+EXTRA_DIST=common.mk.in README.md THANKS $(lisp_files)
 
 if MAINTAINER_MODE
 
diff --git a/autogen.sh b/autogen.sh
index 4ec4b71..88c32e7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 ln -fs README.md README
+touch common.mk
 autoreconf -vfi && \
 autoconf && {
   echo "Running configure with --enable-maintainer-mode $@"
diff --git a/common.mk b/common.mk
deleted file mode 100644
index c8fc92a..0000000
--- a/common.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-lisp_files := $(wildcard *.el)
-lisp_LISP = $(lisp_files)
-EXTRA_DIST = $(lisp_files)
-MOSTLYCLEANFILES = *.elc
-
-short:
-       $(MAKE) 2>&1 >/dev/null | ruby $(top_srcdir)/make-check-filter.rb
-
-%.short:
-       $(MAKE) $(@:.short=) 2>&1 >/dev/null
diff --git a/common.mk.in b/common.mk.in
new file mode 100644
index 0000000..570c996
--- /dev/null
+++ b/common.mk.in
@@ -0,0 +1,26 @@
+lisp_files := $(wildcard *.el)
+lisp_LISP = $(lisp_files)
+MOSTLYCLEANFILES = *.elc
address@hidden@
+
+short:
+       $(MAKE) 2>&1 >/dev/null | ruby $(top_srcdir)/make-check-filter.rb
+
+%.short:
+       $(MAKE) $(@:.short=) 2>&1 >/dev/null
+
+# This is the default taget but We need to include an EMACLOADPATH
+.el.elc:
+       if test "$(EMACS)" != "no"; then \
+         am__dir=. am__subdir_includes=''; \
+         case $@ in */*) \
+           am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
+           am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
+         esac; \
+         test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
+         EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS) --batch \
+           $(AM_ELCFLAGS) $(ELCFLAGS) \
+           $$am__subdir_includes -L $(builddir) -L $(srcdir) \
+           --eval "(defun byte-compile-dest-file (f) \"address@hidden")" \
+           --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
+       else :; fi
diff --git a/lldb/core.el b/lldb/core.el
index cc1c83c..69bdab1 100644
--- a/lldb/core.el
+++ b/lldb/core.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2016 Rocky Bernstein
+
 ;; 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
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -48,7 +50,7 @@ We return the a list containing
 * the name of the debugger given (e.g. lldb) and its arguments - a list of 
strings
 * nil (a placehoder in other routines of this ilk for a debugger
 * the script name and its arguments - list of strings
-* whether the annotate or emacs option was given ('-A', '--annotate' or 
'--emacs) - a boolean
+* whether the emacs option was given ('--emacs) - a boolean
 
 For example for the following input
   (map 'list 'symbol-name
@@ -70,7 +72,6 @@ Note that path elements have been expanded via 
`expand-file-name'.
        ;; h is really -h and -host is really --host.
        (lldb-two-args '("x" "-command" "b" "-exec"
                        "cd" "-pid"  "-core" "-directory"
-                       "-annotate"
                        "se" "-symbols" "-tty"))
        ;; lldb doesn't optionsl 2-arg options.
        (lldb-opt-two-args '())
@@ -102,15 +103,6 @@ Note that path elements have been expanded via 
`expand-file-name'.
        (while (and args (not script-name))
          (let ((arg (car args)))
            (cond
-            ;; Annotation or emacs option with level number.
-            ((or (member arg '("--annotate" "-A"))
-                 (equal arg "--emacs"))
-             (setq annotate-p t)
-             (nconc debugger-args (list (pop args) (pop args))))
-            ;; Combined annotation and level option.
-            ((string-match "^--annotate=[0-9]" arg)
-             (nconc debugger-args (list (pop args) (pop args)) )
-             (setq annotate-p t))
             ;; path-argument ooptions
             ((member arg '("-cd" ))
              (setq arg (pop args))
diff --git a/lldb/init.el b/lldb/init.el
index 5d36cd4..e894bbd 100644
--- a/lldb/init.el
+++ b/lldb/init.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2016 Rocky Bernstein
+
 ;; 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
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -107,15 +109,15 @@ realgud-loc-pat struct")
 
 (defvar realgud:lldb-command-hash (make-hash-table :test 'equal)
   "Hash key is command name like 'continue' and the value is
-  the lldb command to use, like 'continue'")
+  the lldb command to use, like 'process continue'")
 
-(setf (gethash "break"    realgud:lldb-command-hash) "break %l")
+(setf (gethash "break"    realgud:lldb-command-hash) "b %l")
 (setf (gethash "clear"    realgud:lldb-command-hash) "clear %l")
-(setf (gethash "continue" realgud:lldb-command-hash) "continue")
+(setf (gethash "continue" realgud:lldb-command-hash) "process continue")
 (setf (gethash "eval"     realgud:lldb-command-hash) "print %s")
 (setf (gethash "quit"     realgud:lldb-command-hash) "quit")
 (setf (gethash "run"      realgud:lldb-command-hash) "run")
-(setf (gethash "step"     realgud:lldb-command-hash) "step %p")
+(setf (gethash "step"     realgud:lldb-command-hash) "thread step --count %p")
 (setf (gethash "lldb" realgud-command-hash) realgud:lldb-command-hash)
 
 (setf (gethash "lldb" realgud-pat-hash) realgud:lldb-pat-hash)
diff --git a/lldb/lldb.el b/lldb/lldb.el
index c4192ac..22891f6 100644
--- a/lldb/lldb.el
+++ b/lldb/lldb.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2016 Rocky Bernstein
+
 ;; 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
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -14,24 +16,20 @@
 ;;  `realgud:lldb' Main interface to lldb via Emacs
 (require 'cl)
 (require 'load-relative)
-(require-relative-list '("../../common/helper" "../../common/utils")
-                      "realgud-")
-(require-relative-list '("core" "track-mode") "realgud:lldb-")
 
 ;; This is needed, or at least the docstring part of it is needed to
 ;; get the customization menu to work in Emacs 24.
 (defgroup realgud:lldb nil
   "The realgud interface to lldb"
   :group 'realgud
-  :version "24.1")
+  :version "24.3")
 
 ;; -------------------------------------------------------------------
 ;; User definable variables
 ;;
 
 (defcustom realgud:lldb-command-name
-  ;;"lldb
-  "gdb"
+  "lldb"
   "File name for executing the and command options.
 This should be an executable on your path, or an absolute file name."
   :type 'string
@@ -79,7 +77,7 @@ fringe and marginal icons.
         )
     (if cmd-buf
        (with-current-buffer cmd-buf
-         (realgud-command "set annotate 1" nil nil nil)
+         ; (realgud-command "set annotate 1" nil nil nil)
          )
       )
     )
diff --git a/lldb/track-mode.el b/lldb/track-mode.el
index c277827..0730a42 100644
--- a/lldb/track-mode.el
+++ b/lldb/track-mode.el
@@ -1,4 +1,4 @@
-;;; track-mode.el ---
+;; Copyright (C) 2016 Rocky Bernstein
 
 ;; 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
diff --git a/realgud-lldb.el b/realgud-lldb.el
new file mode 100644
index 0000000..cbed82e
--- /dev/null
+++ b/realgud-lldb.el
@@ -0,0 +1,47 @@
+;;; realgud-lldb.el --- realgud front-end to lldb
+
+;; Author: Rocky Bernstein
+;; Version: 1.0
+;; Package-Requires: ((realgud "1.4.2"))
+;; URL: http://github.com/rocky/realgud-byebug
+;; Compatibility: GNU Emacs 24.x
+
+;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; realgud support for the Ruby byebug debugger
+
+;;; Code:
+
+;; Press C-x C-e at the end of the next line configure the program in
+;; for building via "make" to get set up.
+;; (compile (format "EMACSLOADPATH=:%s:%s ./autogen.sh" (file-name-directory 
(locate-library "test-simple.elc")) (file-name-directory (locate-library 
"realgud.elc"))))
+
+(require 'load-relative)
+
+(defgroup realgud-byebug  nil
+  "Realgud interface to lldb"
+  :group 'realgud
+  :version "24.3")
+
+(require-relative-list '( "./lldb/lldb" ) "realgud-")
+
+(provide-me)
+
+;;; realgud-lldb.el ends here
diff --git a/test/Makefile.am b/test/Makefile.am
index c0e7ede..f37cb09 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,6 @@
 include $(top_srcdir)/common.mk
 
 PHONY=check test all check-elget test-elget help
-EXTRA_DIST += gcd.py gcd.rb gdb
 
 #: overall help on running the make targets
 help:
@@ -57,11 +56,11 @@ check-short-elget:
        $(MAKE) check-elget 2>&1  | ruby ../make-check-filter.rb
 
 test-%.run:
-       (cd $(top_srcdir)/test && $(EMACS) --batch --no-site-file --no-splash 
--load $(@:.run=.el))
+       (cd $(top_srcdir)/test && EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS) 
--batch --no-site-file --no-splash --load $(@:.run=.el))
 
 #: Run tests using el-get to specify external Lisp dependencies
 test-%.elrun:
-       (cd $(top_srcdir)/test && $(EMACS) --batch --no-site-file --no-splash 
--load ../el-get-install.el --load $(@:.elrun=.el))
+       (cd $(top_srcdir)/test && EMACSLOADPATH=$(EMACSLOADPAth) $(EMACS) 
--batch --no-site-file --no-splash --load ../el-get-install.el --load 
$(@:.elrun=.el))
 
 # Whatever it is you want to do, it should be forwarded to the
 # to top-level directories
diff --git a/test/test-regexp-lldb.el b/test/test-regexp-lldb.el
index 7f55c2d..7d112cd 100644
--- a/test/test-regexp-lldb.el
+++ b/test/test-regexp-lldb.el
@@ -1,6 +1,6 @@
 (require 'test-simple)
 (require 'load-relative)
-(require 'realgud-buffer-command)
+(require 'realgud)
 (load-file "../lldb/init.el")
 (load-file "./regexp-helper.el")
 
@@ -18,7 +18,7 @@
 ; Some setup usually done in setting up the buffer.
 ; We customize this for this debugger.
 ; FIXME: encapsulate this.
-(setq dbg-name "gdb")
+(setq dbg-name "lldb")
 
 (setq loc-pat (gethash "loc" (gethash dbg-name realgud-pat-hash)))
 (setq test-dbgr (make-realgud-cmdbuf-info