move debugger-specific code down to a debugger directory.

diff --git a/configure.ac b/configure.ac
index eced53cdb3912a28fef30f97911aac3bd9bd38e6..7eae5f81d5eddfdd89264207da7c922037cdd253 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,13 +33,14 @@ AC_CONFIG_FILES([Makefile \
                 dbgr/common/Makefile \
                 dbgr/common/buffer/Makefile \
                 dbgr/common/init/Makefile \
+                dbgr/debugger/Makefile \
+                dbgr/debugger/gdb/Makefile \
+                dbgr/debugger/pydbgr/Makefile \
+                dbgr/debugger/rdebug/Makefile \
+                dbgr/debugger/trepan/Makefile \
+                dbgr/debugger/trepanx/Makefile \
+                dbgr/debugger/zshdb/Makefile \
                 dbgr/lang/Makefile \
-                dbgr/gdb/Makefile \
-                dbgr/pydbgr/Makefile \
-                dbgr/rdebug/Makefile \
-                dbgr/trepan/Makefile \
-                dbgr/trepanx/Makefile \
-                dbgr/zshdb/Makefile \
                 test/Makefile \
                 ])
 AC_OUTPUT

diff --git a/dbgr.el b/dbgr.el
index ca95dccf057af945f8c641f89013b01c49d6c93c..a536e29551919be5280d85f959c7826a09641138 100644 (file)
--- a/dbgr.el
+++ b/dbgr.el
@@ -6,12 +6,12 @@
   (require-relative-list
    '(
      "./dbgr/common/track-mode"
-     "./dbgr/gdb/gdb"
-     "./dbgr/pydbgr/pydbgr"
-     "./dbgr/rdebug/rdebug"
-     "./dbgr/trepan/trepan"
-     "./dbgr/trepanx/trepanx"
-     "./dbgr/zshdb/zshdb"
+     "./dbgr/debugger/gdb/gdb"
+     "./dbgr/debugger/pydbgr/pydbgr"
+     "./dbgr/debugger/rdebug/rdebug"
+     "./dbgr/debugger/trepan/trepan"
+     "./dbgr/debugger/trepanx/trepanx"
+     "./dbgr/debugger/zshdb/zshdb"
      ) "dbgr-")
   )
 

diff --git a/dbgr/Makefile.am b/dbgr/Makefile.am
index f5d0de0352b905d592075035f2ed5d1210851282..75a2af8cde2b8a3e9654070413219f1fb422232b 100644 (file)
--- a/dbgr/Makefile.am
+++ b/dbgr/Makefile.am
@@ -1,11 +1 @@
-SUBDIRS = common gdb lang pydbgr rdebug trepan trepanx zshdb
-MOSTLYCLEANFILES = *.elc
-EXTRA_DIST = common.mk
-
-test: check
-
-check:
-       $(MAKE) -C ../test $@
-
-
-
+SUBDIRS = common debugger lang

diff --git a/dbgr/common/Makefile.am b/dbgr/common/Makefile.am
index 94af6b8b35f7e27b7f13794e8ceb4365157bc7f7..4d28f305e41da41a980b801774103f62ffc9ddcf 100644 (file)
--- a/dbgr/common/Makefile.am
+++ b/dbgr/common/Makefile.am
@@ -6,11 +6,3 @@ lisp_files := $(wildcard *.el)
 
 EXTRA_DIST = $(lisp_files)
 lisp_LISP = $(lisp_files)
-
-test: check
-
-check:
-       $(MAKE) -C ../../test $@
-
-
-

diff --git a/dbgr/common/buffer/Makefile.am b/dbgr/common/buffer/Makefile.am
index 48977689492ace1034c32cdacee29dea7b790125..c50574ecc6b37ef8752f318b47dabaff291ff527 100644 (file)
--- a/dbgr/common/buffer/Makefile.am
+++ b/dbgr/common/buffer/Makefile.am
@@ -1,9 +1,5 @@
-lispdir = @lispdir_dbgr@/$(notdir $(subdir))
+lispdir = @lispdir_dbgr@/common/buffer
 lisp_files := $(wildcard *.el)
 lisp_LISP = $(lisp_files)
 EXTRA_DIST = $(lisp_files) 
 MOSTLYCLEANFILES = *.elc
-
-%: 
-       $(MAKE) -C ../../.. $@
-

diff --git a/dbgr/debugger/.gitignore b/dbgr/debugger/.gitignore
new file mode 100644 (file)
index 0000000..aeaec0f
--- /dev/null
+++ b/dbgr/debugger/.gitignore
@@ -0,0 +1 @@
+/*~

diff --git a/dbgr/debugger/Makefile.am b/dbgr/debugger/Makefile.am
new file mode 100644 (file)
index 0000000..1d496ed
--- /dev/null
+++ b/dbgr/debugger/Makefile.am
@@ -0,0 +1,8 @@
+SUBDIRS = gdb pydbgr rdebug trepan trepanx zshdb
+EXTRA_DIST = common.mk
+
+.PHONY: check all
+all: check
+
+check:
+       $(MAKE) -C ../../test $@

diff --git a/dbgr/common.mk b/dbgr/debugger/common.mk
similarity index 67%
rename from dbgr/common.mk
rename to dbgr/debugger/common.mk
index b0aefc54c84f8d2f4196897add3f889c15d490dc..a3d7d2e6a401100f964e32b963457f623714c99b 100644 (file)
--- a/dbgr/common.mk
+++ b/dbgr/debugger/common.mk
@@ -1,4 +1,4 @@
-lispdir = @lispdir_dbgr@/$(notdir $(subdir))
+lispdir = @lispdir_dbgr@/debugger/$(notdir $(subdir))
 lisp_files := $(wildcard *.el)
 lisp_LISP = $(lisp_files)
 EXTRA_DIST = $(lisp_files) 

diff --git a/dbgr/gdb/.gitignore b/dbgr/debugger/gdb/.gitignore
similarity index 100%
rename from dbgr/gdb/.gitignore
rename to dbgr/debugger/gdb/.gitignore

diff --git a/dbgr/gdb/Makefile.am b/dbgr/debugger/gdb/Makefile.am
similarity index 100%
rename from dbgr/gdb/Makefile.am
rename to dbgr/debugger/gdb/Makefile.am

diff --git a/dbgr/gdb/core.el b/dbgr/debugger/gdb/core.el
similarity index 97%
rename from dbgr/gdb/core.el
rename to dbgr/debugger/gdb/core.el
index 137275a6e7ba349377483df88caa75af9391eb98..5b6037bb00b1c4fd43d2853e2e5ff6d42c026b68 100644 (file)
--- a/dbgr/gdb/core.el
+++ b/dbgr/debugger/gdb/core.el
@@ -2,7 +2,9 @@
 (eval-when-compile (require 'cl))
   
 (require 'load-relative)
-(require-relative-list '("../common/track" "../common/core" "../common/lang")
+(require-relative-list '("../../common/track" 
+                        "../../common/core" 
+                        "../../common/lang")
                       "dbgr-")
 
 ;; FIXME: I think the following could be generalized and moved to 

diff --git a/dbgr/gdb/gdb.el b/dbgr/debugger/gdb/gdb.el
similarity index 97%
rename from dbgr/gdb/gdb.el
rename to dbgr/debugger/gdb/gdb.el
index 1e3fc7a217b44cfe5405ee4f8cfa65a57540f260..6602931f3843b6cd7a4dfc5ee96e3b024629ca66 100644 (file)
--- a/dbgr/gdb/gdb.el
+++ b/dbgr/debugger/gdb/gdb.el
@@ -1,7 +1,7 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 ;;  `dbgr-gdb' Main interface to gdb via Emacs
 (require 'load-relative)
-(require-relative-list '("../common/helper") "dbgr-")
+(require-relative-list '("../../common/helper") "dbgr-")
 (require-relative-list '("core" "track-mode") "dbgr-gdb-")
 
 ;; This is needed, or at least the docstring part of it is needed to

diff --git a/dbgr/gdb/track-mode.el b/dbgr/debugger/gdb/track-mode.el
similarity index 84%
rename from dbgr/gdb/track-mode.el
rename to dbgr/debugger/gdb/track-mode.el
index f07f7ef7283acb8665e0cc66a9eb4058d96dfbc2..d4463f5f35ae50a73091544cf515ad34b7690bff 100644 (file)
--- a/dbgr/gdb/track-mode.el
+++ b/dbgr/debugger/gdb/track-mode.el
@@ -3,10 +3,11 @@
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
-(require-relative-list
- '("../common/track-mode" "../common/cmds") "dbgr-")
+(require-relative-list '("../../common/track-mode" 
+                        "../../common/cmds") "dbgr-")
 (require-relative-list '("core") "dbgr-gdb-")
 
+(defalias 'dbgr-define-dbgr-gdb-commands 'dbgr-define-gdb-like-commands)
 (dbgr-track-mode-vars "dbgr-gdb")
 (declare-function dbgr-track-mode(bool))
 

diff --git a/dbgr/pydbgr/.gitignore b/dbgr/debugger/pydbgr/.gitignore
similarity index 100%
rename from dbgr/pydbgr/.gitignore
rename to dbgr/debugger/pydbgr/.gitignore

diff --git a/dbgr/pydbgr/Makefile.am b/dbgr/debugger/pydbgr/Makefile.am
similarity index 100%
rename from dbgr/pydbgr/Makefile.am
rename to dbgr/debugger/pydbgr/Makefile.am

diff --git a/dbgr/pydbgr/cmds.el b/dbgr/debugger/pydbgr/cmds.el
similarity index 90%
rename from dbgr/pydbgr/cmds.el
rename to dbgr/debugger/pydbgr/cmds.el
index 7fa592c8af5b1537c539be9ef4c0777509c81eda..aa06215b38dd702e32a606ed952de7e915676aed 100644 (file)
--- a/dbgr/pydbgr/cmds.el
+++ b/dbgr/debugger/pydbgr/cmds.el
@@ -1,7 +1,7 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 (require 'load-relative)
 (require-relative-list
- '("../common/send") "dbgr-")
+ '("../../common/send") "dbgr-")
 
 (declare-function dbgr-define-gdb-like-commands())
 

diff --git a/dbgr/pydbgr/core.el b/dbgr/debugger/pydbgr/core.el
similarity index 98%
rename from dbgr/pydbgr/core.el
rename to dbgr/debugger/pydbgr/core.el
index ab08996f326e85aee6f14f3f0ac92f5aa4555864..c6a401d9653f6680b91e6d164648e084ad1b6e34 100644 (file)
--- a/dbgr/pydbgr/core.el
+++ b/dbgr/debugger/pydbgr/core.el
@@ -2,7 +2,9 @@
 (eval-when-compile (require 'cl))
   
 (require 'load-relative)
-(require-relative-list '("../common/track" "../common/core" "../common/lang")
+(require-relative-list '("../../common/track" 
+                        "../../common/core" 
+                        "../../common/lang")
                       "dbgr-")
 (require-relative-list '("init") "dbgr-pydbgr-")
 

diff --git a/dbgr/pydbgr/init.el b/dbgr/debugger/pydbgr/init.el
similarity index 96%
rename from dbgr/pydbgr/init.el
rename to dbgr/debugger/pydbgr/init.el
index d4daca7bec33ea777606502489161109cde88297..1d8c9df5df4ddb47546142e3ee5ccaf3043e82c9 100644 (file)
--- a/dbgr/pydbgr/init.el
+++ b/dbgr/debugger/pydbgr/init.el
@@ -4,7 +4,9 @@
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
-(require-relative-list '("../common/regexp" "../common/loc" "../common/init")
+(require-relative-list '("../../common/regexp" 
+                        "../../common/loc" 
+                        "../../common/init")
                       "dbgr-")
 
 (defvar dbgr-pat-hash)

diff --git a/dbgr/pydbgr/pydbgr.el b/dbgr/debugger/pydbgr/pydbgr.el
similarity index 95%
rename from dbgr/pydbgr/pydbgr.el
rename to dbgr/debugger/pydbgr/pydbgr.el
index add86367c7febeeb5ae704d360417d08c9326087..07ffdd3d27554ad15d14dd78bd165c223c6eb58c 100644 (file)
--- a/dbgr/pydbgr/pydbgr.el
+++ b/dbgr/debugger/pydbgr/pydbgr.el
@@ -1,8 +1,8 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 ;;  `pydbgr' Main interface to pydbgr via Emacs
 (require 'load-relative)
-(require-relative-list '("../common/helper") "dbgr-")
-(require-relative-list '("../common/track") "dbgr-")
+(require-relative-list '("../../common/helper"
+                        "../../common/track") "dbgr-")
 (require-relative-list '("core" "track-mode") "dbgr-pydbgr-")
 
 ;; This is needed, or at least the docstring part of it is needed to

diff --git a/dbgr/pydbgr/track-mode.el b/dbgr/debugger/pydbgr/track-mode.el
similarity index 88%
rename from dbgr/pydbgr/track-mode.el
rename to dbgr/debugger/pydbgr/track-mode.el
index 5f893ef65e3dc025eca85f6af86a538fd02afe49..e670b1f040d2eab89b80f3b523cb54cc1b89b217 100644 (file)
--- a/dbgr/pydbgr/track-mode.el
+++ b/dbgr/debugger/pydbgr/track-mode.el
@@ -4,8 +4,9 @@
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
-(require-relative-list '("../common/track-mode" "../common/cmds"
-                        "../common/menu") "dbgr-")
+(require-relative-list '("../../common/track-mode" 
+                        "../../common/cmds"
+                        "../../common/menu") "dbgr-")
 (require-relative-list '("core" "cmds" "init") "dbgr-pydbgr-")
 
 (dbgr-track-mode-vars "pydbgr")

diff --git a/dbgr/rdebug/.gitignore b/dbgr/debugger/rdebug/.gitignore
similarity index 100%
rename from dbgr/rdebug/.gitignore
rename to dbgr/debugger/rdebug/.gitignore

diff --git a/dbgr/rdebug/Makefile.am b/dbgr/debugger/rdebug/Makefile.am
similarity index 100%
rename from dbgr/rdebug/Makefile.am
rename to dbgr/debugger/rdebug/Makefile.am

diff --git a/dbgr/rdebug/cmds.el b/dbgr/debugger/rdebug/cmds.el
similarity index 92%
rename from dbgr/rdebug/cmds.el
rename to dbgr/debugger/rdebug/cmds.el
index 8fd7502406f4b8b1e65b4ae36176fbc47d2291be..502e01adcadb106d700ee7c14fee0fa876ceec8b 100644 (file)
--- a/dbgr/rdebug/cmds.el
+++ b/dbgr/debugger/rdebug/cmds.el
@@ -1,7 +1,7 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 (require 'load-relative)
 (require-relative-list
- '("../common/send") "dbgr-")
+ '("../../common/send") "dbgr-")
 
 (declare-function dbgr-define-gdb-like-commands())
 

diff --git a/dbgr/rdebug/core.el b/dbgr/debugger/rdebug/core.el
similarity index 98%
rename from dbgr/rdebug/core.el
rename to dbgr/debugger/rdebug/core.el
index 5445697e8ef5d3888562a953718e8de94033131e..3cbdd523ba3992439de6c47f8afe45caf302f7d1 100644 (file)
--- a/dbgr/rdebug/core.el
+++ b/dbgr/debugger/rdebug/core.el
@@ -2,7 +2,9 @@
 (eval-when-compile (require 'cl))
   
 (require 'load-relative)
-(require-relative-list '("../common/track" "../common/core" "../common/lang")
+(require-relative-list '("../../common/track" 
+                        "../../common/core" 
+                        "../../common/lang")
                       "dbgr-")
 (require-relative-list '("init") "dbgr-rdebug-")
 

diff --git a/dbgr/rdebug/init.el b/dbgr/debugger/rdebug/init.el
similarity index 95%
rename from dbgr/rdebug/init.el
rename to dbgr/debugger/rdebug/init.el
index 963b147fe44b59cba8754782cc0ea353b492b1b2..a8c073310b8766d5728c353097e13a6d0f3129b0 100644 (file)
--- a/dbgr/rdebug/init.el
+++ b/dbgr/debugger/rdebug/init.el
@@ -4,8 +4,8 @@
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
-(require-relative-list '("../common/regexp" "../common/loc") "dbgr-")
-(require-relative-list '("../lang/ruby") "dbgr-lang-")
+(require-relative-list '("../../common/regexp" "../../common/loc") "dbgr-")
+(require-relative-list '("../../lang/ruby") "dbgr-lang-")
 
 (defvar dbgr-pat-hash)
 (declare-function make-dbgr-loc-pat (dbgr-loc))

diff --git a/dbgr/rdebug/rdebug.el b/dbgr/debugger/rdebug/rdebug.el
similarity index 97%
rename from dbgr/rdebug/rdebug.el
rename to dbgr/debugger/rdebug/rdebug.el
index f12604239c333a860d42d953eef35d566a47cd04..7c69268035e1d4646d40990827cebce683e05175 100644 (file)
--- a/dbgr/rdebug/rdebug.el
+++ b/dbgr/debugger/rdebug/rdebug.el
@@ -1,8 +1,8 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 ;;  `rdebug' Main interface to rdebug via Emacs
 (require 'load-relative)
-(require-relative-list '("../common/helper") "dbgr-")
-(require-relative-list '("../common/track") "dbgr-")
+(require-relative-list '("../../common/helper"
+                        "../../common/track") "dbgr-")
 (require-relative-list '("core" "track-mode") "dbgr-rdebug-")
 ;; This is needed, or at least the docstring part of it is needed to
 ;; get the customization menu to work in Emacs 23.

diff --git a/dbgr/rdebug/track-mode.el b/dbgr/debugger/rdebug/track-mode.el
similarity index 88%
rename from dbgr/rdebug/track-mode.el
rename to dbgr/debugger/rdebug/track-mode.el
index 696633ec8e020a2e0436af8dc19835ac4f63e357..99911a9f9a0c0b3915edbc705c1025d2f4d5f25b 100644 (file)
--- a/dbgr/rdebug/track-mode.el
+++ b/dbgr/debugger/rdebug/track-mode.el
@@ -3,8 +3,9 @@
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
-(require-relative-list '("../common/track-mode" "../common/cmds" 
-                        "../common/menu") "dbgr-")
+(require-relative-list '("../../common/track-mode" 
+                        "../../common/cmds" 
+                        "../../common/menu") "dbgr-")
 (require-relative-list '("core" "cmds" "init") "dbgr-rdebug-")
 
 (dbgr-track-mode-vars "rdebug")

diff --git a/dbgr/trepan/.gitignore b/dbgr/debugger/trepan/.gitignore
similarity index 100%
rename from dbgr/trepan/.gitignore
rename to dbgr/debugger/trepan/.gitignore

diff --git a/dbgr/trepan/Makefile.am b/dbgr/debugger/trepan/Makefile.am
similarity index 100%
rename from dbgr/trepan/Makefile.am
rename to dbgr/debugger/trepan/Makefile.am

diff --git a/dbgr/trepan/cmds.el b/dbgr/debugger/trepan/cmds.el
similarity index 96%
rename from dbgr/trepan/cmds.el
rename to dbgr/debugger/trepan/cmds.el
index 09a514956c5889b581ee71e2ddd478f6fa6493c5..7f3cdb7e186ffaa8d3048a9e70c1f87c4407503a 100644 (file)
--- a/dbgr/trepan/cmds.el
+++ b/dbgr/debugger/trepan/cmds.el
@@ -1,7 +1,7 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 (require 'load-relative)
 (require-relative-list
- '("../common/send") "dbgr-")
+ '("../../common/send") "dbgr-")
 
 (declare-function dbgr-terminate &optional arg)
 (declare-function dbgr-define-gdb-like-commands())

diff --git a/dbgr/trepan/core.el b/dbgr/debugger/trepan/core.el
similarity index 98%
rename from dbgr/trepan/core.el
rename to dbgr/debugger/trepan/core.el
index aeeec3ded5e9caf5e76959895ef4f52666b830d3..fc70a190392176bbf73a4e1ae92dc35e1dccf2b6 100644 (file)
--- a/dbgr/trepan/core.el
+++ b/dbgr/debugger/trepan/core.el
@@ -2,7 +2,9 @@
 (eval-when-compile (require 'cl))
   
 (require 'load-relative)
-(require-relative-list '("../common/track" "../common/core" "../common/lang")
+(require-relative-list '("../../common/track" 
+                        "../../common/core" 
+                        "../../common/lang")
                       "dbgr-")
 (require-relative-list '("init") "dbgr-trepan-")
 

diff --git a/dbgr/trepan/init.el b/dbgr/debugger/trepan/init.el
similarity index 95%
rename from dbgr/trepan/init.el
rename to dbgr/debugger/trepan/init.el
index 4f91411c9ecaf76924f4a561aaf3964e49fbd23a..8096b23624ae0fad4251b86403e4cf09ce956eb8 100644 (file)
--- a/dbgr/trepan/init.el
+++ b/dbgr/debugger/trepan/init.el
@@ -2,9 +2,11 @@
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
-(require-relative-list '("../common/regexp" "../common/loc" "../common/init") 
+(require-relative-list '("../../common/regexp" 
+                        "../../common/loc" 
+                        "../../common/init") 
                       "dbgr-")
-(require-relative-list '("../lang/ruby") "dbgr-lang-")
+(require-relative-list '("../../lang/ruby") "dbgr-lang-")
 
 (defvar dbgr-pat-hash)
 (declare-function make-dbgr-loc-pat (dbgr-loc))

diff --git a/dbgr/trepan/track-mode.el b/dbgr/debugger/trepan/track-mode.el
similarity index 91%
rename from dbgr/trepan/track-mode.el
rename to dbgr/debugger/trepan/track-mode.el
index f83f30ef3c02d7bc3a2d54abcc8d80b5f2dac906..16def273c3a9cfbce18ad7cd7f2dbad92cfa5546 100644 (file)
--- a/dbgr/trepan/track-mode.el
+++ b/dbgr/debugger/trepan/track-mode.el
@@ -3,9 +3,9 @@
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
-(require-relative-list '("../common/track-mode"
-                        "../common/cmds" 
-                        "../common/menu") "dbgr-")
+(require-relative-list '("../../common/track-mode"
+                        "../../common/cmds" 
+                        "../../common/menu") "dbgr-")
 (require-relative-list '("core" "cmds" "init") "dbgr-trepan-")
 
 (dbgr-track-mode-vars "trepan")

diff --git a/dbgr/trepan/trepan.el b/dbgr/debugger/trepan/trepan.el
similarity index 95%
rename from dbgr/trepan/trepan.el
rename to dbgr/debugger/trepan/trepan.el
index 8f946d156bb664339c6fde779b7ad6e69e9a09d6..28ad25bb0ea724e2b5b84f0abd1b01fbe0fe8957 100644 (file)
--- a/dbgr/trepan/trepan.el
+++ b/dbgr/debugger/trepan/trepan.el
@@ -1,8 +1,8 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 ;;  `trepan' Main interface to trepan via Emacs
 (require 'load-relative)
-(require-relative-list '("../common/helper") "dbgr-")
-(require-relative-list '("../common/track") "dbgr-")
+(require-relative-list '("../../common/helper") "dbgr-")
+(require-relative-list '("../../common/track") "dbgr-")
 (require-relative-list '("core" "track-mode") "dbgr-trepan-")
 ;; This is needed, or at least the docstring part of it is needed to
 ;; get the customization menu to work in Emacs 23.

diff --git a/dbgr/trepanx/.gitignore b/dbgr/debugger/trepanx/.gitignore
similarity index 100%
rename from dbgr/trepanx/.gitignore
rename to dbgr/debugger/trepanx/.gitignore

diff --git a/dbgr/trepanx/Makefile.am b/dbgr/debugger/trepanx/Makefile.am
similarity index 100%
rename from dbgr/trepanx/Makefile.am
rename to dbgr/debugger/trepanx/Makefile.am

diff --git a/dbgr/trepanx/cmds.el b/dbgr/debugger/trepanx/cmds.el
similarity index 93%
rename from dbgr/trepanx/cmds.el
rename to dbgr/debugger/trepanx/cmds.el
index 9b98cc10a26666264436d659c42ddd9b893bc62e..955518e9c46263e5c542addab39a1928b066628e 100644 (file)
--- a/dbgr/trepanx/cmds.el
+++ b/dbgr/debugger/trepanx/cmds.el
@@ -1,7 +1,7 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 (require 'load-relative)
 (require-relative-list
- '("../common/send") "dbgr-")
+ '("../../common/send") "dbgr-")
 
 (declare-function dbgr-define-gdb-like-commands())
 

diff --git a/dbgr/trepanx/core.el b/dbgr/debugger/trepanx/core.el
similarity index 98%
rename from dbgr/trepanx/core.el
rename to dbgr/debugger/trepanx/core.el
index 16a2f92171faac527acad47c25aadb0e9eea08ae..0d08c78151a74c56088e5bbc93e3e029e0ac03d2 100644 (file)
--- a/dbgr/trepanx/core.el
+++ b/dbgr/debugger/trepanx/core.el
@@ -3,7 +3,9 @@
   
 (require 'load-relative)
 
-(require-relative-list '("../common/track" "../common/core" "../common/lang")
+(require-relative-list '("../../common/track" 
+                        "../../common/core" 
+                        "../../common/lang")
                       "dbgr-")
 (require-relative-list '("init") "dbgr-trepanx-")
 

diff --git a/dbgr/trepanx/init.el b/dbgr/debugger/trepanx/init.el
similarity index 87%
rename from dbgr/trepanx/init.el
rename to dbgr/debugger/trepanx/init.el
index 32499a54879af92391cc95b961a6645ab47644d9..4d0b2b12258cfcdf8ec4a5c4a2992d0db668a1fa 100644 (file)
--- a/dbgr/trepanx/init.el
+++ b/dbgr/debugger/trepanx/init.el
@@ -2,7 +2,8 @@
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
-(require-relative-list '("../common/regexp" "../common/loc") "dbgr-")
+(require-relative-list '("../../common/regexp" "../../common/loc") "dbgr-")
+(require-relative-list '("../../lang/ruby") "dbgr-lang-")
 
 (defvar dbgr-pat-hash)
 (declare-function make-dbgr-loc-pat (dbgr-loc))
@@ -27,11 +28,7 @@ dbgr-loc-pat struct")
        ))
 
 ;;  Regular expression that describes a Ruby backtrace line.
-(setf (gethash "backtrace" dbgr-trepanx-pat-hash)
-      (make-dbgr-loc-pat
-       :regexp "^[ \t]+from \\([^:]+\\):\\([0-9]+\\)\\(?: in `.*'\\)?"
-       :file-group 1
-       :line-group 2))
+(setf (gethash "backtrace" dbgr-trepanx-pat-hash) dbgr-ruby-backtrace-loc-pat)
 
 ;;  Regular expression that describes a "breakpoint set" line
 (setf (gethash "brkpt-set" dbgr-trepanx-pat-hash)
@@ -54,11 +51,7 @@ dbgr-loc-pat struct")
        :line-group 9))
 
 ;;  Regular expression that describes a Ruby $! string
-(setf (gethash "dollar-bang" dbgr-trepanx-pat-hash)
-      (make-dbgr-loc-pat
-       :regexp "^[ \t]*[[]?\\(.+\\):\\([0-9]+\\):in `.*'"
-       :file-group 1
-       :line-group 2))
+(setf (gethash "dollar-bang" dbgr-trepanx-pat-hash) dbgr-ruby-dollar-bang)
 
 (setf (gethash "trepanx" dbgr-pat-hash) dbgr-trepanx-pat-hash)
 

diff --git a/dbgr/trepanx/track-mode.el b/dbgr/debugger/trepanx/track-mode.el
similarity index 91%
rename from dbgr/trepanx/track-mode.el
rename to dbgr/debugger/trepanx/track-mode.el
index 6460b4f3351c3ea25a0a6155579708f1a1cf8d92..455a61df013d37794f25915c01ce2d0d19d9c466 100644 (file)
--- a/dbgr/trepanx/track-mode.el
+++ b/dbgr/debugger/trepanx/track-mode.el
@@ -3,8 +3,8 @@
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
-(require-relative-list '("../common/track-mode" "../common/cmds" 
-                        "../common/menu") "dbgr-")
+(require-relative-list '("../../common/track-mode" "../../common/cmds" 
+                        "../../common/menu") "dbgr-")
 (require-relative-list '("core" "cmds" "init") "dbgr-trepanx-")
 
 (dbgr-track-mode-vars "trepanx")

diff --git a/dbgr/trepanx/trepanx.el b/dbgr/debugger/trepanx/trepanx.el
similarity index 95%
rename from dbgr/trepanx/trepanx.el
rename to dbgr/debugger/trepanx/trepanx.el
index 432a5d1d21f976992ca6270eab6e0820921a3cf1..ee729d71362d4577c7ea1d7acf2d1f77673d57f8 100644 (file)
--- a/dbgr/trepanx/trepanx.el
+++ b/dbgr/debugger/trepanx/trepanx.el
@@ -1,8 +1,8 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 ;;  `trepanx' Main interface to trepanx via Emacs
 (require 'load-relative)
-(require-relative-list '("../common/helper") "dbgr-")
-(require-relative-list '("../common/track") "dbgr-")
+(require-relative-list '("../../common/helper") "dbgr-")
+(require-relative-list '("../../common/track") "dbgr-")
 (require-relative-list '("core" "track-mode") "dbgr-trepanx-")
 ;; This is needed, or at least the docstring part of it is needed to
 ;; get the customization menu to work in Emacs 23.

diff --git a/dbgr/zshdb/.gitignore b/dbgr/debugger/zshdb/.gitignore
similarity index 100%
rename from dbgr/zshdb/.gitignore
rename to dbgr/debugger/zshdb/.gitignore

diff --git a/dbgr/zshdb/Makefile.am b/dbgr/debugger/zshdb/Makefile.am
similarity index 100%
rename from dbgr/zshdb/Makefile.am
rename to dbgr/debugger/zshdb/Makefile.am

diff --git a/dbgr/zshdb/cmds.el b/dbgr/debugger/zshdb/cmds.el
similarity index 96%
rename from dbgr/zshdb/cmds.el
rename to dbgr/debugger/zshdb/cmds.el
index 762189fcd13276a35a406e0adf1d2760996a53d8..f167a08c0bfdb360cf790631cce685c3f6a166dc 100644 (file)
--- a/dbgr/zshdb/cmds.el
+++ b/dbgr/debugger/zshdb/cmds.el
@@ -1,7 +1,7 @@
 ;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
 (require 'load-relative)
 (require-relative-list
- '("../common/send") "dbgr-")
+ '("../../common/send") "dbgr-")
 
 (declare-function dbgr-terminate &optional arg)
 (declare-function dbgr-define-gdb-like-commands())

diff --git a/dbgr/zshdb/core.el b/dbgr/debugger/zshdb/core.el
similarity index 98%
rename from dbgr/zshdb/core.el
rename to dbgr/debugger/zshdb/core.el
index e657c826352ba84da6fcbde55305b623d032c6b4..dd99227b56d9b09a2c5aec5cc68b8740eae36a8a 100644 (file)
--- a/dbgr/zshdb/core.el
+++ b/dbgr/debugger/zshdb/core.el
@@ -2,7 +2,7 @@
 (eval-when-compile (require 'cl))
   
 (require 'load-relative)
-(require-relative-list '("../common/track" "../common/core") "dbgr-")
+(require-relative-list '("../../common/track" "../../common/core") "dbgr-")
 (require-relative-list '("init") "dbgr-zshdb-")
 
 ;; FIXME: I think the following could be generalized and moved to 

diff --git a/dbgr/zshdb/init.el b/dbgr/debugger/zshdb/init.el
similarity index 96%
rename from dbgr/zshdb/init.el
rename to dbgr/debugger/zshdb/init.el
index 2b2f2819fdb4dcfb9f8651f738b5069842e956de..bf022269ad3e5efce3a88a77a8c57f8a2197e273 100644 (file)
--- a/dbgr/zshdb/init.el
+++ b/dbgr/debugger/zshdb/init.el
@@ -4,7 +4,7 @@
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
-(require-relative-list '("../common/regexp" "../common/loc") "dbgr-")
+(require-relative-list '("../../common/regexp" "../../common/loc") "dbgr-")
 
 (defvar dbgr-pat-hash)
 (declare-function make-dbgr-loc-pat (dbgr-loc))

diff --git a/dbgr/zshdb/track-mode.el b/dbgr/debugger/zshdb/track-mode.el
similarity index 90%
rename from dbgr/zshdb/track-mode.el
rename to dbgr/debugger/zshdb/track-mode.el
index 2c532425b735f88f01b8e864d7dcc873f3bdc332..e42137d55320b27a8e802f1cebc6d31d21effb45 100644 (file)
--- a/dbgr/zshdb/track-mode.el
+++ b/dbgr/debugger/zshdb/track-mode.el
@@ -2,9 +2,9 @@
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
-(require-relative-list '("../common/track-mode"
-                        "../common/cmds" 
-                        "../common/menu") "dbgr-")
+(require-relative-list '("../../common/track-mode"
+                        "../../common/cmds" 
+                        "../../common/menu") "dbgr-")
 (require-relative-list '("core" "cmds" "init") "dbgr-zshdb-")
 
 (dbgr-track-mode-vars "zshdb")

diff --git a/dbgr/zshdb/zshdb.el b/dbgr/debugger/zshdb/zshdb.el
similarity index 95%
rename from dbgr/zshdb/zshdb.el
rename to dbgr/debugger/zshdb/zshdb.el
index 9f3d7ca405b72b47fd603eaa19603a30ce8939a2..55291f182967ec069209800ba8723d6a6a7b8757 100644 (file)
--- a/dbgr/zshdb/zshdb.el
+++ b/dbgr/debugger/zshdb/zshdb.el
@@ -1,7 +1,7 @@
 ;;  `zshdb' Main interface to zshdb via Emacs
 (require 'load-relative)
-(require-relative-list '("../common/helper") "dbgr-")
-(require-relative-list '("../common/track") "dbgr-")
+(require-relative-list '("../../common/helper") "dbgr-")
+(require-relative-list '("../../common/track") "dbgr-")
 (require-relative-list '("core" "track-mode") "dbgr-zshdb-")
 ;; This is needed, or at least the docstring part of it is needed to
 ;; get the customization menu to work in Emacs 23.

diff --git a/dbgr/lang/Makefile.am b/dbgr/lang/Makefile.am
index 23f8a8fa29809a33deba1f95088720f95bd986a8..06480be197a6b8929dd99ea1dfc726172cb47f87 100644 (file)
--- a/dbgr/lang/Makefile.am
+++ b/dbgr/lang/Makefile.am
@@ -1 +1,6 @@
-include ../common.mk
+lispdir = @lispdir_dbgr@/$(notdir $(subdir))
+lisp_files := $(wildcard *.el)
+lisp_LISP = $(lisp_files)
+EXTRA_DIST = $(lisp_files) 
+MOSTLYCLEANFILES = *.elc
+

diff --git a/test/test-bt-pydbgr.el b/test/test-bt-pydbgr.el
index 658529a97466ca585ac2ca8ab7326d75f1c8c84c..230c1eac17fdec1dbb464e518339f5fcca010783 100644 (file)
--- a/test/test-bt-pydbgr.el
+++ b/test/test-bt-pydbgr.el
@@ -4,7 +4,7 @@
 (load-file "../dbgr/common/buffer/command.el")
 (load-file "../dbgr/common/buffer/backtrace.el")
 (load-file "../dbgr/common/init.el")
-(load-file "../dbgr/pydbgr/init.el")
+(load-file "../dbgr/debugger/pydbgr/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-bt-rdebug.el b/test/test-bt-rdebug.el
index 662be8541ee081b7707af5cd35fffccdddb52c2c..940aa79f487ba7269417701ba535ce26bb152b02 100644 (file)
--- a/test/test-bt-rdebug.el
+++ b/test/test-bt-rdebug.el
@@ -3,7 +3,7 @@
 
 (load-file "../dbgr/common/buffer/command.el")
 (load-file "../dbgr/common/buffer/backtrace.el")
-(load-file "../dbgr/rdebug/init.el")
+(load-file "../dbgr/debugger/rdebug/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-bt-trepan.el b/test/test-bt-trepan.el
index 8b25bf831ce83723ae8893ede003236da7e80a3c..841ed54fd0c650eb5ce27d86679023fa0c1875f5 100644 (file)
--- a/test/test-bt-trepan.el
+++ b/test/test-bt-trepan.el
@@ -3,7 +3,7 @@
 
 (load-file "../dbgr/common/buffer/command.el")
 (load-file "../dbgr/common/buffer/backtrace.el")
-(load-file "../dbgr/trepan/init.el")
+(load-file "../dbgr/debugger/trepan/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-bt-trepanx.el b/test/test-bt-trepanx.el
index cfa1970708ebc936613ad1f9a3cfae9e972f0035..5c46971e3587de16775450c319dbf74cee541eac 100644 (file)
--- a/test/test-bt-trepanx.el
+++ b/test/test-bt-trepanx.el
@@ -3,7 +3,7 @@
 
 (load-file "../dbgr/common/buffer/command.el")
 (load-file "../dbgr/common/buffer/backtrace.el")
-(load-file "../dbgr/trepanx/init.el")
+(load-file "../dbgr/debugger/trepanx/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-bt-zshdb.el b/test/test-bt-zshdb.el
index b6343aaecd2aba682651011ff205f8933b7de2e1..d12b4acf1e76c3ea146e448e796a460463af8dba 100644 (file)
--- a/test/test-bt-zshdb.el
+++ b/test/test-bt-zshdb.el
@@ -4,7 +4,7 @@
 (load-file "../dbgr/common/buffer/command.el")
 (load-file "../dbgr/common/buffer/backtrace.el")
 (load-file "../dbgr/common/init.el")
-(load-file "../dbgr/zshdb/init.el")
+(load-file "../dbgr/debugger/zshdb/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-buf-cmd.el b/test/test-buf-cmd.el
index 5a8c25aaac6082ed02ca17beb423f0f84749c42e..0cf5511f2176e3578fc9d0ba021474d32e4f2a48 100644 (file)
--- a/test/test-buf-cmd.el
+++ b/test/test-buf-cmd.el
@@ -1,6 +1,6 @@
 (require 'test-unit)
 (load-file "../dbgr/common/buffer/command.el")
-(load-file "../dbgr/trepan/init.el")
+(load-file "../dbgr/debugger/trepan/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-core.el b/test/test-core.el
index 123893069c05ed8e7cb4c7dcf7ca49f5e1b4efb4..a72d05f1f54663fac0d49a8a5b153d64fc65b0d1 100644 (file)
--- a/test/test-core.el
+++ b/test/test-core.el
@@ -1,7 +1,7 @@
-(setq trepan-core "../dbgr/trepan/core.el")
+(setq trepan-core "../dbgr/debugger/trepan/core.el")
 (require 'test-unit)
 (load-file "../dbgr/common/core.el")
-(load-file "../dbgr/trepan/core.el")
+(load-file "../dbgr/debugger/trepan/core.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-pydbgr.el b/test/test-pydbgr.el
index 5de1e0bc025bf7a821a641ec9f48924f6f6d1676..27368f6cf84440d0967d7a3413469fde9ff57ff3 100644 (file)
--- a/test/test-pydbgr.el
+++ b/test/test-pydbgr.el
@@ -1,5 +1,5 @@
 (require 'test-unit)
-(load-file "../dbgr/pydbgr/pydbgr.el")
+(load-file "../dbgr/debugger/pydbgr/pydbgr.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-rdebug.el b/test/test-rdebug.el
index 7adfb93f29162c8e57e9dcb6e76ec6eaba78e1af..419b6ac9522015721faf4390e9f4cb9da463c21c 100644 (file)
--- a/test/test-rdebug.el
+++ b/test/test-rdebug.el
@@ -1,5 +1,5 @@
 (require 'test-unit)
-(load-file "../dbgr/rdebug/rdebug.el")
+(load-file "../dbgr/debugger/rdebug/rdebug.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-regexp-pydbgr.el b/test/test-regexp-pydbgr.el
index fafb5b4ecfad218fb8a29c90f68a275d21669353..256da80fc25823e24505bb4399a67c40e9258f31 100644 (file)
--- a/test/test-regexp-pydbgr.el
+++ b/test/test-regexp-pydbgr.el
@@ -1,5 +1,5 @@
 (require 'test-unit)
-(load-file "../dbgr/pydbgr/init.el")
+(load-file "../dbgr/debugger/pydbgr/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-regexp-rdebug.el b/test/test-regexp-rdebug.el
index 44e986c301e2e619d36ed769c558cdbfbe26b137..5a8d711b8435044ae143e8157d931f9e7c64451f 100644 (file)
--- a/test/test-regexp-rdebug.el
+++ b/test/test-regexp-rdebug.el
@@ -1,5 +1,5 @@
 (require 'test-unit)
-(load-file "../dbgr/rdebug/init.el")
+(load-file "../dbgr/debugger/rdebug/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-regexp-trepan.el b/test/test-regexp-trepan.el
index 04853c20e6779613b659561b2ddf795cf53f899f..d1524e2409813e3b8dc0bc14e0bbc8078b0ff14b 100644 (file)
--- a/test/test-regexp-trepan.el
+++ b/test/test-regexp-trepan.el
@@ -1,5 +1,5 @@
 (require 'test-unit)
-(load-file "../dbgr/trepan/init.el")
+(load-file "../dbgr/debugger/trepan/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-regexp-trepanx.el b/test/test-regexp-trepanx.el
index 4e8922404d3aa6e63e78857b3802dbb57ee3ed33..3ebce9acd4ac519d08c133c93f976a7ef2eb43a1 100644 (file)
--- a/test/test-regexp-trepanx.el
+++ b/test/test-regexp-trepanx.el
@@ -1,5 +1,5 @@
 (require 'test-unit)
-(load-file "../dbgr/trepanx/init.el")
+(load-file "../dbgr/debugger/trepanx/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-regexp.el b/test/test-regexp.el
index c88b87ef915e9f3309be7adc52e077b1ea4570e9..7c5e4c0bd54301c264ab557d4477438c89f58498 100644 (file)
--- a/test/test-regexp.el
+++ b/test/test-regexp.el
@@ -1,6 +1,6 @@
 (require 'test-unit)
 (load-file "../dbgr/common/buffer/command.el")
-(load-file "../dbgr/trepan/init.el")
+(load-file "../dbgr/debugger/trepan/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-send.el b/test/test-send.el
index 48087c51d2110ffe133b16c77f1099541370ccb4..0dd463cb3e26a37b3c61ba75a1dc98e9e5f6ee6c 100644 (file)
--- a/test/test-send.el
+++ b/test/test-send.el
@@ -1,7 +1,7 @@
 (require 'test-unit)
 (load-file "../dbgr/common/send.el")
 (load-file "../dbgr/common/regexp.el")
-(load-file "../dbgr/trepan/init.el")
+(load-file "../dbgr/debugger/trepan/init.el")
 (test-unit-clear-contexts)
 
 (defvar temp-cmdbuf nil)

diff --git a/test/test-srcbuf.el b/test/test-srcbuf.el
index 00181934f69ca5c85583a82efafd689c4aea0b84..9c97c704750698741ab9c914dd6b7216fd5304c0 100644 (file)
--- a/test/test-srcbuf.el
+++ b/test/test-srcbuf.el
@@ -1,7 +1,7 @@
 (require 'test-unit)
 (load-file "../dbgr/common/buffer/source.el")
 (load-file "../dbgr/common/buffer/command.el")
-(load-file "../dbgr/trepan/init.el")
+(load-file "../dbgr/debugger/trepan/init.el")
 
 (test-unit-clear-contexts)
 

diff --git a/test/test-track-mode.el b/test/test-track-mode.el
index 3465171ae06d23e7763f489eaf52ed08a50f635c..6bfe92f96e7f19e97f4221de151563767ff7a78a 100644 (file)
--- a/test/test-track-mode.el
+++ b/test/test-track-mode.el
@@ -1,5 +1,5 @@
 (require 'test-unit)
-(load-file "../dbgr/trepan/trepan.el")
+(load-file "../dbgr/debugger/trepan/trepan.el")
 (test-unit-clear-contexts)
 
 (defvar temp-cmdbuf nil)

diff --git a/test/test-track.el b/test/test-track.el
index 264ec9779c164d72515b25fb8cb16f74ac936ec1..621737a36a662a4c48956415354f67df4265f1da 100644 (file)
--- a/test/test-track.el
+++ b/test/test-track.el
@@ -1,6 +1,6 @@
 (require 'test-unit)
 (load-file "../dbgr/common/track.el")
-(load-file "../dbgr/trepan/init.el")
+(load-file "../dbgr/debugger/trepan/init.el")
 
 (test-unit-clear-contexts)