branch: master
commit 87f30ef8a74139e763f4248b7d1bc531b585186e
Merge: 87c8aaa d68f312
Author: Mario Lang <ml...@delysid.org>
Commit: Mario Lang <ml...@delysid.org>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa
---
packages/realgud/.gitignore | 1 +
packages/realgud/INSTALL | 250 ---------------------------
packages/realgud/INSTALL.md | 5 +
packages/realgud/Makefile.am | 2 +-
packages/realgud/THANKS | 2 +-
packages/realgud/autogen.sh | 1 +
packages/realgud/common.mk | 10 --
packages/realgud/common.mk.in | 25 +++
packages/realgud/configure.ac | 1 +
packages/realgud/realgud.el | 4 +
packages/realgud/test/Makefile.am | 1 -
packages/realgud/test/bt-helper.el | 1 -
packages/realgud/test/test-buf-cmd.el | 1 +
packages/realgud/test/test-regexp-gdb.el | 1 +
packages/realgud/test/test-regexp-rdebug.el | 4 +
15 files changed, 45 insertions(+), 264 deletions(-)
diff --git a/packages/realgud/.gitignore b/packages/realgud/.gitignore
index 125299c..843d43b 100644
--- a/packages/realgud/.gitignore
+++ b/packages/realgud/.gitignore
@@ -7,6 +7,7 @@
/README
/aclocal.m4
/autom4te.cache
+/common.mk
/config.log
/config.status
/configure
diff --git a/packages/realgud/INSTALL b/packages/realgud/INSTALL
deleted file mode 100644
index 0ea147f..0000000
--- a/packages/realgud/INSTALL
+++ /dev/null
@@ -1,250 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
- Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved. This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
- Briefly, the shell commands `./configure && make' should configure,
-and build this package. If that succeeds `make install' will install
-the package. However on some systems you may need root privileges, you
-may have to use `sudo make install' or perhaps `su root' beforehand.
-
-
- See http://wiki.github.com/realgud/realgud/how-to-install for more
-detail as to how to install this package.
-
-Generic Information
-===================
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It also creates a shell script `config.status' that you can run in
-the future to recreate the current configuration, and a file
-`config.log' containing compiler output (useful mainly for debugging
-`configure').
-
- The configure script can also use an optional file (typically
-called `config.cache' and enabled with `--cache-file=config.cache' or
-simply `-C') that saves the results of its tests to speed up
-reconfiguring. Caching is disabled by default to prevent problems
-with accidental use of stale cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' is used to create `configure' by a program
-called `autoconf'. You need `configure.ac' if you want to change it
-or regenerate `configure' using a newer version of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
- documentation. When installing into a prefix owned by root, it is
- recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
- privileges.
-
- 5. You can remove the compiled Emacs Lisp files and other derived
- files from the source code directory by typing `make clean'. To
- also remove the files that `configure' created (so you can
- compile the package for a different kind of computer), type `make
- distclean'. There is also a `make maintainer-clean' target, but
- that is intended mainly for the package's developers. If you use
- it, you may have to get all sorts of other programs in order to
- regenerate files that came with the distribution.
-
- 6. You can also type `make uninstall' to remove the installed files
- again.
-
- 7. We don't provide `make distcheck' right now, but perhaps someday
- we will. This is by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
- This target is generally not run by end users.
-
-Options
-=====================
-
- Run `./configure --help' for details on the pertinent
-environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 EMACS=/usr/bin/emacs23-x
-
- *Note Defining Variables::, for more details.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's emacs files under
-`/usr/local/share/emacs/site-lisp', You can specify an installation
-prefix other than `/usr/local/emacs/site-lisp' by giving `configure'
-the option `--with-site-lisp=PREFIX', where PREFIX must be an absolute
-file name.
-
- The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
- The first method involves providing an override variable for each
-affected directory. For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters. On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
- Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure EMACS=/usr/bin/emacs23-x
-
-causes the specified `/usr/bin/emacs23-x' to be used as the Emacs program
-to use.
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/packages/realgud/INSTALL.md b/packages/realgud/INSTALL.md
new file mode 100644
index 0000000..cc7f7dd
--- /dev/null
+++ b/packages/realgud/INSTALL.md
@@ -0,0 +1,5 @@
+* Have `test-simple`, `loc-changes`, `cl-lib` and `load-relative` installed.
+* From inside emacs, evaluate:
+```lisp
+ (compile (format "EMACSLOADPATH=:%s:%s ./autogen.sh" (file-name-directory
(locate-library "test-simple.elc")) (file-name-directory (locate-library
"realgud.elc"))))
+```
diff --git a/packages/realgud/Makefile.am b/packages/realgud/Makefile.am
index e2fcd7a..0a8395f 100644
--- a/packages/realgud/Makefile.am
+++ b/packages/realgud/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 README.md INSTALL.md THANKS $(lisp_files) test/gcd.py
test/gcd.rb test/gdb
if MAINTAINER_MODE
diff --git a/packages/realgud/THANKS b/packages/realgud/THANKS
index 3bdda08..3bac612 100644
--- a/packages/realgud/THANKS
+++ b/packages/realgud/THANKS
@@ -13,5 +13,5 @@ Sean Farley - ipdb support
Clément Pit-Claudel - improvements, bug fixes, and emacs compliance too varied
to categorize.
See git commits for details
-
+Stefan Monnier <monn...@iro.umontreal.ca> - Elisp and ELPA guidance
amelio-vazquez-reina - documentation
diff --git a/packages/realgud/autogen.sh b/packages/realgud/autogen.sh
index 8948b34..cbe8d87 100755
--- a/packages/realgud/autogen.sh
+++ b/packages/realgud/autogen.sh
@@ -1,5 +1,6 @@
#!/bin/sh
ln -fs README.md README
+touch common.mk
autoreconf -vi && \
autoconf && {
echo "Running configure with --enable-maintainer-mode $@"
diff --git a/packages/realgud/common.mk b/packages/realgud/common.mk
deleted file mode 100644
index c8fc92a..0000000
--- a/packages/realgud/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/packages/realgud/common.mk.in b/packages/realgud/common.mk.in
new file mode 100644
index 0000000..0a2358e
--- /dev/null
+++ b/packages/realgud/common.mk.in
@@ -0,0 +1,25 @@
+lisp_files := $(wildcard *.el)
+lisp_LISP = $(lisp_files)
+MOSTLYCLEANFILES = *.elc
+
+short:
+ $(MAKE) 2>&1 >/dev/null | ruby $(top_srcdir)/make-check-filter.rb
+
+%.short:
+ $(MAKE) $(@:.short=) 2>&1 >/dev/null
+
+# This is the default rule, 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) \"$@\")" \
+ --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
+ else :; fi
diff --git a/packages/realgud/configure.ac b/packages/realgud/configure.ac
index a5f0706..d9cc1c1 100644
--- a/packages/realgud/configure.ac
+++ b/packages/realgud/configure.ac
@@ -60,6 +60,7 @@ AC_SUBST([lispdir_realgud])
AM_CONDITIONAL(INSTALL_EMACS_LISP, test "x$lispdir_realgud" != "x")
AC_CONFIG_FILES([Makefile \
+ common.mk \
realgud/Makefile \
realgud/common/Makefile \
realgud/common/buffer/Makefile \
diff --git a/packages/realgud/realgud.el b/packages/realgud/realgud.el
index 026dbb4..2035b9d 100644
--- a/packages/realgud/realgud.el
+++ b/packages/realgud/realgud.el
@@ -65,6 +65,10 @@
;;; 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
"load-relative.elc")) (file-name-directory (locate-library "loc-changes.elc"))))
+
(require 'load-relative)
(defgroup realgud nil
diff --git a/packages/realgud/test/Makefile.am
b/packages/realgud/test/Makefile.am
index c56f333..0fba6da 100644
--- a/packages/realgud/test/Makefile.am
+++ b/packages/realgud/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:
diff --git a/packages/realgud/test/bt-helper.el
b/packages/realgud/test/bt-helper.el
index 5236a55..a9f63d8 100644
--- a/packages/realgud/test/bt-helper.el
+++ b/packages/realgud/test/bt-helper.el
@@ -39,7 +39,6 @@ for DEBUGGER-NAME and initializes it to STRING"
(insert string)
(font-lock-fontify-buffer)
;; Newer emacs's use:
- ;; (font-lock-ensure)
(goto-char (point-min))
)
temp-bt
diff --git a/packages/realgud/test/test-buf-cmd.el
b/packages/realgud/test/test-buf-cmd.el
index f54ddb1..48aa2ee 100644
--- a/packages/realgud/test/test-buf-cmd.el
+++ b/packages/realgud/test/test-buf-cmd.el
@@ -10,6 +10,7 @@
(declare-function realgud-cmdbuf-debugger-name 'realgud-buffer-command)
(declare-function realgud-cmdbuf-info-srcbuf-list 'realgud-buffer-command)
(declare-function realgud-cmdbuf-add-srcbuf 'realgud-buffer-command)
+(declare-function realgud-cmdbuf? 'realgud-buffer-command)
(test-simple-start)
diff --git a/packages/realgud/test/test-regexp-gdb.el
b/packages/realgud/test/test-regexp-gdb.el
index fcf8fa9..b649e78 100644
--- a/packages/realgud/test/test-regexp-gdb.el
+++ b/packages/realgud/test/test-regexp-gdb.el
@@ -16,6 +16,7 @@
(defvar loc-pat) (defvar prompt-pat) (defvar test-s1)
(defvar file-group) (defvar line-group) (defvar test-pos)
(defvar test-dbgr) (defvar test-text) (defvar realgud-bt-re)
+ (defvar realgud:gdb-pat-hash)
)
; Some setup usually done in setting up the buffer.
diff --git a/packages/realgud/test/test-regexp-rdebug.el
b/packages/realgud/test/test-regexp-rdebug.el
index 2c37d41..c57dc23 100644
--- a/packages/realgud/test/test-regexp-rdebug.el
+++ b/packages/realgud/test/test-regexp-rdebug.el
@@ -9,6 +9,10 @@
(test-simple-start)
+(eval-when-compile
+ (defvar realgud-rdebug-pat-hash)
+)
+
(setup-regexp-vars realgud-rdebug-pat-hash)
(setq rails-bt (gethash "rails-backtrace" realgud-rdebug-pat-hash))
