branch: externals/tramp
commit dd0882d7fa6ff2b85716fac8fccef6bfc922acd0
Author: Michael Albinus <michael.albi...@gmx.de>
Commit: Michael Albinus <michael.albi...@gmx.de>
;
* .elpaignore: Do not ignore test/Makefile.
* test/Makefile (SELECTOR): Default to '(not (tag :unstable))'.
(sync):
* Makefile (sync):
* texi/Makefile (sync): Move down.
* README: Adapt for GNU ELPA.
---
.elpaignore | 2 +-
Makefile | 29 +++++++++++++++--------------
README | 31 +++----------------------------
test/Makefile | 9 +++++----
texi/Makefile | 9 +++++----
5 files changed, 29 insertions(+), 51 deletions(-)
diff --git a/.elpaignore b/.elpaignore
index c19eec5..ac7965a 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -1,3 +1,3 @@
Makefile
-*/Makefile
+texi/Makefile
README-GIT
diff --git a/Makefile b/Makefile
index 30d250b..fbf59ba 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,21 @@ LISP_FILES = $(wildcard *.el)
all: sync autoloads info
+autoloads: $(LISP_FILES)
+ $(EMACS) -l autoload \
+ --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
+ --eval "(setq generated-autoload-file \
+ (expand-file-name \"tramp-loaddefs.el\"))" \
+ --eval "(setq make-backup-files nil)" \
+ -f batch-update-autoloads .
+
+info:
+ $(MAKE) -C texi
+
+check test: autoloads
+ $(MAKE) -C test "TRAMP_TEST_ARGS=$(TRAMP_TEST_ARGS)" all
+
+# This target is for the maintainer only.
sync:
cp -p ~/src/tramp/lisp/tramp-adb.el tramp-adb.el
cp -p ~/src/tramp/lisp/tramp-archive.el tramp-archive.el
@@ -43,17 +58,3 @@ sync:
cp -p ~/src/tramp/lisp/trampver.el trampver.el
$(MAKE) -C texi sync
$(MAKE) -C test sync
-
-autoloads: $(LISP_FILES)
- $(EMACS) -l autoload \
- --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
- --eval "(setq generated-autoload-file \
- (expand-file-name \"tramp-loaddefs.el\"))" \
- --eval "(setq make-backup-files nil)" \
- -f batch-update-autoloads .
-
-info:
- $(MAKE) -C texi
-
-check test: autoloads
- $(MAKE) -C test "TRAMP_TEST_ARGS=$(TRAMP_TEST_ARGS)" all
diff --git a/README b/README
index 8d64c05..c134719 100644
--- a/README
+++ b/README
@@ -6,33 +6,8 @@ The difference is that Ange-FTP uses FTP to transfer files
between the
local and the remote host, whereas Tramp uses a combination of `rsh'
and `rcp' or other work-alike programs, such as `ssh'/`scp'.
-On GNU Emacs, this version of Tramp uses a unified filename syntax for
-Tramp and Ange-FTP. Read the manual for details.
+A remote file name has always the syntax
-Files in this directory:
-------------------------
+ /method:user%domain@host#port:/path/to/file
-ChangeLog List of changes, most recent first.
- There is a similar file for each directory.
-INSTALL Instructions for installation of Tramp.
-Makefile.in What I use for building Tramp.
-README This file.
-README-GIT For the brave ones who want to get the latest
- developer sources.
-aclocal.m4 Macros used by autoconf for generating the
- configure script.
-configure.ac Input for autoconf for generating the configure script.
-download.sh A script to download Tramp sources via wget instead
git.
-
-All other files in this directory are generated by either autoconf,
-configure, or make.
-
-Subdirectories:
----------------
-
-lisp The Tramp Lisp packages.
-test Some Lisp files to test Tramp.
-texi The documentation.
-
-Kai Großjohann <kai.grossjoh...@gmx.net>
-Michael Albinus <michael.albi...@gmx.de>
+Most of the parts are optional, read the manual for details.
diff --git a/test/Makefile b/test/Makefile
index 092f2b4..1a6eb7b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -26,7 +26,7 @@ CLEAN_FILES = .\\\#* \\\#* .*~ *~ *.elc *.log
TESTS = tramp-tests
TRAMP_TEST_ARGS ?=
-SELECTOR ?= t
+SELECTOR ?= (not (tag :unstable))
.PHONY: all check clean distclean sync test
@@ -46,10 +46,11 @@ check test: $(TESTS)
%.elc: %.el
$(EMACS) -l bytecomp -f batch-byte-compile $?
-sync:
- cp -p ~/src/tramp/test/tramp-tests.el tramp-tests.el
-
clean:
$(RM) $(CLEAN_FILES)
distclean: clean
+
+# This target is for the maintainer only.
+sync:
+ cp -p ~/src/tramp/test/tramp-tests.el tramp-tests.el
diff --git a/texi/Makefile b/texi/Makefile
index a5cf8b6..d13f853 100644
--- a/texi/Makefile
+++ b/texi/Makefile
@@ -30,12 +30,13 @@ CLEAN_FILES = .\\\#* \\\#* .*~ *~ *.aux *.cp *.cps *.diff
*.fn *.fns \
all: ../tramp.info
-sync:
- cp -p ~/src/tramp/texi/tramp.texi tramp.texi
- cp -p ~/src/tramp/texi/trampver.texi trampver.texi
-
../tramp.info: $(TEXI_FILES)
$(MAKEINFO) --footnote-style=end -o $@ $<
clean:
$(RM) $(CLEAN_FILES)
+
+# This target is for the maintainer only.
+sync:
+ cp -p ~/src/tramp/texi/tramp.texi tramp.texi
+ cp -p ~/src/tramp/texi/trampver.texi trampver.texi
