diff options
| author | Glenn Morris | 2021-05-10 10:42:53 -0700 |
|---|---|---|
| committer | Glenn Morris | 2021-05-10 10:42:53 -0700 |
| commit | dc151c000128cef231dfd88c6da43ad76cc08aeb (patch) | |
| tree | 9b779c3ea38ea0f9e2584f8c8e397fe55528bc82 /make-dist | |
| parent | 02c80307f13f7ffe3dc024aee72e47060b4a1996 (diff) | |
| download | emacs-dc151c000128cef231dfd88c6da43ad76cc08aeb.tar.gz emacs-dc151c000128cef231dfd88c6da43ad76cc08aeb.zip | |
Always include the test/ directory in tarfiles
In hindsight, it's hard to see why not including it was ever an option.
* make-dist: Always include the test/ directory.
(with_tests): Remove.
(--tests, --no-tests): Make these options no-ops.
* Makefile.in (mostlyclean_dirs, maintainer_clean_dirs): Add "test".
(mostlyclean, clean, distclean, maintainer-clean):
Remove special-casing for "test".
($(CHECK_TARGETS)): Simplify.
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 18 |
1 files changed, 3 insertions, 15 deletions
| @@ -52,7 +52,6 @@ make_tar=no | |||
| 52 | default_gzip=gzip | 52 | default_gzip=gzip |
| 53 | newer="" | 53 | newer="" |
| 54 | with_info=yes | 54 | with_info=yes |
| 55 | with_tests=yes | ||
| 56 | changelog=yes | 55 | changelog=yes |
| 57 | verbose=no | 56 | verbose=no |
| 58 | 57 | ||
| @@ -109,16 +108,10 @@ while [ $# -gt 0 ]; do | |||
| 109 | update=no | 108 | update=no |
| 110 | ;; | 109 | ;; |
| 111 | 110 | ||
| 112 | ## Include the test/ directory. | 111 | "--tests"|"--no-tests") |
| 113 | ## This is for backward compatibility to when --no-tests was the default. | 112 | echo "The option $1 no longer does anything" |
| 114 | "--tests") | ||
| 115 | with_tests=yes | ||
| 116 | ;; | 113 | ;; |
| 117 | 114 | ||
| 118 | ## Exclude the test/ directory. | ||
| 119 | "--no-tests") | ||
| 120 | with_tests=no | ||
| 121 | ;; | ||
| 122 | 115 | ||
| 123 | "--verbose") | 116 | "--verbose") |
| 124 | verbose=yes | 117 | verbose=yes |
| @@ -136,7 +129,6 @@ while [ $# -gt 0 ]; do | |||
| 136 | echo " --no-update don't recompile or do analogous things" | 129 | echo " --no-update don't recompile or do analogous things" |
| 137 | echo " --no-changelog don't generate the top-level ChangeLog" | 130 | echo " --no-changelog don't generate the top-level ChangeLog" |
| 138 | echo " --no-info don't include info files" | 131 | echo " --no-info don't include info files" |
| 139 | echo " --no-tests don't include the test/ directory" | ||
| 140 | echo " --snapshot same as --clean-up --no-update --tar" | 132 | echo " --snapshot same as --clean-up --no-update --tar" |
| 141 | echo " --tar make a tar file" | 133 | echo " --tar make a tar file" |
| 142 | echo " --verbose noisier output" | 134 | echo " --verbose noisier output" |
| @@ -402,11 +394,7 @@ manifest=MANIFEST | |||
| 402 | # if .git is present. | 394 | # if .git is present. |
| 403 | if ( [ $update = yes ] || [ ! -f $manifest ] ) && [ -r .git ]; then | 395 | if ( [ $update = yes ] || [ ! -f $manifest ] ) && [ -r .git ]; then |
| 404 | echo "Updating $manifest" | 396 | echo "Updating $manifest" |
| 405 | if [ $with_tests = yes ]; then | 397 | git ls-files > $manifest || exit |
| 406 | git ls-files > $manifest | ||
| 407 | else | ||
| 408 | git ls-files | grep -v '^test' >$manifest | ||
| 409 | fi || exit | ||
| 410 | printf '%s\n' $possibly_non_vc_files $info_files >>$manifest || exit | 398 | printf '%s\n' $possibly_non_vc_files $info_files >>$manifest || exit |
| 411 | sort -u -o $manifest $manifest || exit | 399 | sort -u -o $manifest $manifest || exit |
| 412 | fi | 400 | fi |