branch: externals/tramp
commit 6e788c5c17a99da644d781f643714b31317b0740
Author: Michael Albinus <michael.albi...@gmx.de>
Commit: Michael Albinus <michael.albi...@gmx.de>
Adapt auxiliary build files of Tramp
---
.dir-locals.el | 7 +++----
.elpaignore | 4 ++++
Makefile | 31 ++++++++++++++++---------------
test/Makefile | 3 ++-
test/README | 10 ++++++++--
texi/Makefile | 5 +++--
texi/doclicense.texi | 4 ++--
7 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/.dir-locals.el b/.dir-locals.el
index 378db4c..85118b6 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,9 +1,8 @@
((nil . ((tab-width . 8)
- (fill-column . 70)))
+ (fill-column . 70)
+ (bug-reference-url-format . "https://debbugs.gnu.org/%s";)))
(change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74)
- (bug-reference-url-format . "https://debbugs.gnu.org/%s";)
(mode . bug-reference)))
- (emacs-lisp-mode . ((bug-reference-url-format . "https://debbugs.gnu.org/%s";)
- (mode . bug-reference-prog)))
+ (emacs-lisp-mode . ((mode . bug-reference-prog)))
(diff-mode . ((mode . whitespace))))
diff --git a/.elpaignore b/.elpaignore
index ac7965a..002a1eb 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -1,3 +1,7 @@
+.dir-locals.el
+.elpaignore
+.git
+.gitignore
Makefile
texi/Makefile
README-GIT
diff --git a/Makefile b/Makefile
index fbf59ba..c2276c3 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@
EMACS = emacs -Q -batch -L .
LISP_FILES = $(wildcard *.el)
+SOURCE_DIR = ~/src/tramp
.PHONY: all autoloads check info sync test
@@ -41,20 +42,20 @@ check test: autoloads
# 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
- cp -p ~/src/tramp/lisp/tramp-cache.el tramp-cache.el
- cp -p ~/src/tramp/lisp/tramp-cmds.el tramp-cmds.el
- cp -p ~/src/tramp/lisp/tramp-compat.el tramp-compat.el
- cp -p ~/src/tramp/lisp/tramp-ftp.el tramp-ftp.el
- cp -p ~/src/tramp/lisp/tramp-gvfs.el tramp-gvfs.el
- cp -p ~/src/tramp/lisp/tramp-integration.el tramp-integration.el
- cp -p ~/src/tramp/lisp/tramp-rclone.el tramp-rclone.el
- cp -p ~/src/tramp/lisp/tramp-sh.el tramp-sh.el
- cp -p ~/src/tramp/lisp/tramp-smb.el tramp-smb.el
- cp -p ~/src/tramp/lisp/tramp-sudoedit.el tramp-sudoedit.el
- cp -p ~/src/tramp/lisp/tramp-uu.el tramp-uu.el
- cp -p ~/src/tramp/lisp/tramp.el tramp.el
- cp -p ~/src/tramp/lisp/trampver.el trampver.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-adb.el tramp-adb.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-archive.el tramp-archive.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-cache.el tramp-cache.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-cmds.el tramp-cmds.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-compat.el tramp-compat.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-ftp.el tramp-ftp.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-gvfs.el tramp-gvfs.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-integration.el tramp-integration.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-rclone.el tramp-rclone.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-sh.el tramp-sh.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-smb.el tramp-smb.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-sudoedit.el tramp-sudoedit.el
+ cp -p $(SOURCE_DIR)/lisp/tramp-uu.el tramp-uu.el
+ cp -p $(SOURCE_DIR)/lisp/tramp.el tramp.el
+ cp -p $(SOURCE_DIR)/lisp/trampver.el trampver.el
$(MAKE) -C texi sync
$(MAKE) -C test sync
diff --git a/test/Makefile b/test/Makefile
index 1a6eb7b..a8073ee 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -24,6 +24,7 @@
EMACS = emacs -Q -batch -L ../
CLEAN_FILES = .\\\#* \\\#* .*~ *~ *.elc *.log
TESTS = tramp-tests
+SOURCE_DIR = ~/src/tramp
TRAMP_TEST_ARGS ?=
SELECTOR ?= (not (tag :unstable))
@@ -53,4 +54,4 @@ distclean: clean
# This target is for the maintainer only.
sync:
- cp -p ~/src/tramp/test/tramp-tests.el tramp-tests.el
+ cp -p $(SOURCE_DIR)/test/tramp-tests.el tramp-tests.el
diff --git a/test/README b/test/README
index aa1e16a..c363f5b 100644
--- a/test/README
+++ b/test/README
@@ -9,7 +9,7 @@ tramp-tests.el
The Makefile in this directory supports the following targets:
-* make all or make check
+* make all -or- make check
Run all tests declared in tramp-tests.el. If
$REMOTE_TEMPORARY_FILE_DIRECTORY is set, only tramp-tests.el is
used.
@@ -25,7 +25,7 @@ selectors are constructed, see (info "(ert)Test Selectors") or
If your test file contains the tests "test-foo", "test2-foo" and
"test-foo-remote", and you want to run only the former two tests, you
-could use a selector regexp
+could use a selector regexp.
make <filename> SELECTOR='"foo$$"'
@@ -33,6 +33,12 @@ If you want to run just the non-expensive tests, you might
apply
make check SELECTOR='(not (tag :expensive-test))'
+The tag `:unstable' marks tests which do not run as expected, and are
+still under test by the developers. In order to exclude those tests
+from run, you might call
+
+ make check SELECTOR='(not (tag :unstable))'
+
The environment variable ${TRAMP_TEST_ARGS} allows to add further
arguments to the Emacs test run.
diff --git a/texi/Makefile b/texi/Makefile
index d13f853..107d964 100644
--- a/texi/Makefile
+++ b/texi/Makefile
@@ -25,6 +25,7 @@ MAKEINFO = makeinfo --no-warn --no-split
TEXI_FILES = $(wildcard *.texi)
CLEAN_FILES = .\\\#* \\\#* .*~ *~ *.aux *.cp *.cps *.diff *.fn *.fns \
*.ky *.log *.pg *.tmp *.toc *.tp *.vr *.vrs
+SOURCE_DIR = ~/src/tramp
.PHONY: all clean sync
@@ -38,5 +39,5 @@ clean:
# 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
+ cp -p $(SOURCE_DIR)/texi/tramp.texi tramp.texi
+ cp -p $(SOURCE_DIR)/texi/trampver.texi trampver.texi
diff --git a/texi/doclicense.texi b/texi/doclicense.texi
index a511ffc..3153569 100644
--- a/texi/doclicense.texi
+++ b/texi/doclicense.texi
@@ -7,7 +7,7 @@
@display
Copyright @copyright{} 2000, 2001, 2002, 2007, 2008, 2009 Free Software
Foundation, Inc.
-@uref{http://fsf.org/}
+@uref{https://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -415,7 +415,7 @@ The Free Software Foundation may publish new, revised
versions
of the GNU Free Documentation License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns. See
-@uref{http://www.gnu.org/copyleft/}.
+@uref{https://www.gnu.org/licenses/}.
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
