"Automate" use of .distfiles a little bit?

zsh-workers
 help / color / mirror / code / Atom feed

* "Automate" use of .distfiles a little bit?
@ 2014-08-20 15:52 Bart Schaefer
  2014-08-23 17:57 ` Peter Stephenson
  0 siblings, 1 reply; 5+ messages in thread
From: Bart Schaefer @ 2014-08-20 15:52 UTC (permalink / raw)
  To: zsh-workers

This is probably a question for PWS when he returns, but can anyone think
of a reason why, in e.g. the Completion subtree, the .distfiles should not
look like

DISTFILES_SRC='
.disfiles
_*
'

so that explicit names don't need to be added/updated every time completion
functions are added/changed?

I suppose there's an argument that a developer might have work in progress
sitting around that shouldn't accidentally get distributed, but wouldn't
the right solution for that be to always run Util/mkdistree.sh from a
clean clone of the repository?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "Automate" use of .distfiles a little bit?
  2014-08-20 15:52 "Automate" use of .distfiles a little bit? Bart Schaefer
@ 2014-08-23 17:57 ` Peter Stephenson
  2014-08-23 19:49   ` Peter Stephenson
  0 siblings, 1 reply; 5+ messages in thread
From: Peter Stephenson @ 2014-08-23 17:57 UTC (permalink / raw)
  To: zsh-workers

On Wed, 20 Aug 2014 08:52:47 -0700
Bart Schaefer <schaefer@brasslantern.com> wrote:
> This is probably a question for PWS when he returns, but can anyone think
> of a reason why, in e.g. the Completion subtree, the .distfiles should not
> look like
> 
> DISTFILES_SRC='
> .disfiles
> _*
> '
> 
> so that explicit names don't need to be added/updated every time completion
> functions are added/changed?

Probably a reasonable change.

> I suppose there's an argument that a developer might have work in progress
> sitting around that shouldn't accidentally get distributed, but wouldn't
> the right solution for that be to always run Util/mkdistree.sh from a
> clean clone of the repository?

I think we're generally doing more work than we need.  This dates from
the days even before CVS.  With git, I think it's fair to assume the
bundle is going to be made from a git repository, where we can check files
against git without even having to rely on the network.

I therfore suggest that at some point we change the code to assume files
that are managed by git are part of the src package unless an assignment
of the form above explicitly indicates otherwise e.g. with something
like DISTFILES_NO_SRC.

pws

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "Automate" use of .distfiles a little bit?
  2014-08-23 17:57 ` Peter Stephenson
@ 2014-08-23 19:49   ` Peter Stephenson
  2014-08-23 20:04     ` Peter Stephenson
  2014-08-28 19:30     ` Peter Stephenson
  0 siblings, 2 replies; 5+ messages in thread
From: Peter Stephenson @ 2014-08-23 19:49 UTC (permalink / raw)
  To: zsh-workers

On Sat, 23 Aug 2014 18:57:24 +0100
Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> I therfore suggest that at some point we change the code to assume files
> that are managed by git are part of the src package unless an assignment
> of the form above explicitly indicates otherwise e.g. with something
> like DISTFILES_NO_SRC.

DISTFILES_NOT already exists for the purpose of checking we've picked
everything up --- the SRC is irrelevant, if we're not distributing it
we're not distributing it in any package.  (The check in question was in
a script I never added to the distribution; it's now essentially
redundant.)

I think this does it.  Certainly a diff of the old and new tar archive
contents just tells me we've picked up _sequence and _dsh, which is
correct.

The only possible problem I can see is if the behaviour of git ls-files
changes, but that seems highly unlikely.  Or if somebody tried to make a
bundle outside the git tree, but the fix "don't do that" sounds a good
one.

I think we're already screwed if someone adds a file name with spaces.
I think that's another "don't do that".

Note that the presence of .distfiles still signifies a directory that
needs processing, though in principle the file can be empty; I've kept
empty assignments to DISTFILES_SRC just to be explicit but that's not
needed.

Perhaps some mention in the the development doc would be beneficial.

diff --git a/.distfiles b/.distfiles
index 5726294..d618a77 100644
--- a/.distfiles
+++ b/.distfiles
@@ -1,8 +1,4 @@
 DISTFILES_SRC='
-    .cvsignore .distfiles .editorconfig .gitignore .preconfig Makefile.in
-    ChangeLog
-    FEATURES INSTALL LICENCE MACHINES META-FAQ NEWS README
-    aclocal.m4 aczsh.m4 configure.ac
+    META-FAQ
     configure config.h.in stamp-h.in
-    config.guess config.sub install-sh mkinstalldirs 
 '
diff --git a/Completion/.distfiles b/Completion/.distfiles
index 65ab759..f03668b 100644
--- a/Completion/.distfiles
+++ b/Completion/.distfiles
@@ -1,5 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-.cvsignore   README       compaudit    compdump     compinit     compinstall
-bashcompinit
 '
diff --git a/Completion/AIX/.distfiles b/Completion/AIX/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/AIX/.distfiles
+++ b/Completion/AIX/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/AIX/Command/.distfiles b/Completion/AIX/Command/.distfiles
index 1f2ffc7..f03668b 100644
--- a/Completion/AIX/Command/.distfiles
+++ b/Completion/AIX/Command/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_floppy  _lscfg   _lsdev   _lslv    _lspv    _lsvg    _smit
 '
diff --git a/Completion/AIX/Type/.distfiles b/Completion/AIX/Type/.distfiles
index 4103c69..f03668b 100644
--- a/Completion/AIX/Type/.distfiles
+++ b/Completion/AIX/Type/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_logical_volumes   _object_classes    _physical_volumes  _volume_groups
 '
diff --git a/Completion/BSD/.distfiles b/Completion/BSD/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/BSD/.distfiles
+++ b/Completion/BSD/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/BSD/Command/.distfiles b/Completion/BSD/Command/.distfiles
index d08edf8..f03668b 100644
--- a/Completion/BSD/Command/.distfiles
+++ b/Completion/BSD/Command/.distfiles
@@ -1,19 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_bsd_pkg
-_chflags
-_csup
-_cvsup
-_fetch
-_freebsd-update
-_fstat
-_kld
-_pfctl
-_portaudit
-_portlint
-_portmaster
-_portsnap
-_powerd
-_procstat
-_sockstat
 '
diff --git a/Completion/Base/.distfiles b/Completion/Base/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/Base/.distfiles
+++ b/Completion/Base/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/Base/Completer/.distfiles b/Completion/Base/Completer/.distfiles
index 804c579..f03668b 100644
--- a/Completion/Base/Completer/.distfiles
+++ b/Completion/Base/Completer/.distfiles
@@ -1,18 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_all_matches
-_approximate
-_complete
-_correct
-_expand
-_expand_alias
-_extensions
-_history
-_ignored
-_list
-_match
-_menu
-_oldlist
-_prefix
-_user_expand
 '
diff --git a/Completion/Base/Core/.distfiles b/Completion/Base/Core/.distfiles
index acb6695..f03668b 100644
--- a/Completion/Base/Core/.distfiles
+++ b/Completion/Base/Core/.distfiles
@@ -1,6 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_all_labels     _main_complete  _next_label     _requested      _tags
-_description    _message        _normal         _setup          _wanted
-_dispatch
 '
diff --git a/Completion/Base/Utility/.distfiles b/Completion/Base/Utility/.distfiles
index 91ddf88..f03668b 100644
--- a/Completion/Base/Utility/.distfiles
+++ b/Completion/Base/Utility/.distfiles
@@ -1,25 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_alternative
-_arg_compile
-_arguments
-_cache_invalid
-_call_function
-_comp_locale
-_complete_help_generic
-_call_program
-_combination
-_set_command
-_describe
-_multi_parts
-_nothing
-_regex_arguments
-_retrieve_cache
-_sep_parts
-_store_cache
-_sub_commands
-_values
-_guard
-_pick_variant
-_regex_words
 '
diff --git a/Completion/Base/Widget/.distfiles b/Completion/Base/Widget/.distfiles
index f6c73a1..f03668b 100644
--- a/Completion/Base/Widget/.distfiles
+++ b/Completion/Base/Widget/.distfiles
@@ -1,7 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_bash_completions       _correct_filename       _history_complete_word
-_complete_debug         _correct_word           _most_recent_file
-_complete_help          _expand_word            _next_tags
-_complete_tag           _generic                _read_comp
 '
diff --git a/Completion/Cygwin/Command/.distfiles b/Completion/Cygwin/Command/.distfiles
index eec683b..f03668b 100644
--- a/Completion/Cygwin/Command/.distfiles
+++ b/Completion/Cygwin/Command/.distfiles
@@ -1,7 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_cygcheck       _cygpath        _cygrunsrv      _cygserver
-_cygstart       _dumper         _getclip
-_mkshortcut     _mkzsh          _pscp           _putclip
-_readshortcut
 '
diff --git a/Completion/Darwin/Command/.distfiles b/Completion/Darwin/Command/.distfiles
index 5756f54..f03668b 100644
--- a/Completion/Darwin/Command/.distfiles
+++ b/Completion/Darwin/Command/.distfiles
@@ -1,10 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_defaults
-_fink
-_hdiutil
-_open
-_qtplay
-_softwareupdate
-_system_profiler
 '
diff --git a/Completion/Darwin/Type/.distfiles b/Completion/Darwin/Type/.distfiles
index 059069d..f03668b 100644
--- a/Completion/Darwin/Type/.distfiles
+++ b/Completion/Darwin/Type/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_mac_applications _mac_files_for_application _retrieve_mac_apps
 '
diff --git a/Completion/Debian/.distfiles b/Completion/Debian/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/Debian/.distfiles
+++ b/Completion/Debian/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/Debian/Command/.distfiles b/Completion/Debian/Command/.distfiles
index ed15750..f03668b 100644
--- a/Completion/Debian/Command/.distfiles
+++ b/Completion/Debian/Command/.distfiles
@@ -1,52 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_a2utils
-_apt
-_apt-file
-_aptitude
-_apt-move
-_apt-show-versions
-_auto-apt
-_axi-cache
-_bts
-_bug
-_cdbs-edit-patch
-_dak
-_dchroot
-_dchroot-dsa
-_dcut
-_debchange
-_debdiff
-_debfoster
-_debsign
-_dlocate
-_dpatch-edit-patch
-_dpkg
-_dpkg-buildpackage
-_dpkg-cross
-_dpkg-repack
-_dpkg_source
-_dput
-_dupload
-_git-buildpackage
-_invoke-rc.d
-_lighttpd
-_lintian
-_madison
-_make-kpkg
-_members
-_mergechanges
-_module-assistant
-_pbuilder
-_piuparts
-_reprepro
-_schroot
-_svn-buildpackage
-_toolchain-source
-_update-alternatives
-_update-rc.d
-_uscan
-_wajig
-_wanna-build
-_vim-addons _grep-excuses
 '
diff --git a/Completion/Debian/Type/.distfiles b/Completion/Debian/Type/.distfiles
index 9f5db79..f03668b 100644
--- a/Completion/Debian/Type/.distfiles
+++ b/Completion/Debian/Type/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_deb_packages
 '
diff --git a/Completion/Linux/Command/.distfiles b/Completion/Linux/Command/.distfiles
index e5edd58..f03668b 100644
--- a/Completion/Linux/Command/.distfiles
+++ b/Completion/Linux/Command/.distfiles
@@ -1,39 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_acpi
-_acpitool
-_analyseplugin
-_brctl
-_btrfs
-_chrt
-_cryptsetup
-_docker
-_ethtool
-_fusermount
-_ionice
-_ipset
-_iptables
-_iwconfig
-_losetup
-_lsusb
-_mdadm
-_mii-tool
-_modutils
-_mondo
-_nmcli
-_pkgtool
-_rpmbuild
-_schedtool
-_ss
-_sshfs
-_strace
-_sysstat
-_tpb
-_tpconfig
-_tune2fs
-_uml
-_valgrind
-_vserver
-_wpa_cli
-_yast
 '
diff --git a/Completion/Linux/Type/.distfiles b/Completion/Linux/Type/.distfiles
index 36c1b6b..f03668b 100644
--- a/Completion/Linux/Type/.distfiles
+++ b/Completion/Linux/Type/.distfiles
@@ -1,6 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_fuse_arguments
-_fuse_values
-_wakeup_capable_devices
 '
diff --git a/Completion/Mandriva/.distfiles b/Completion/Mandriva/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/Mandriva/.distfiles
+++ b/Completion/Mandriva/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/Mandriva/Command/.distfiles b/Completion/Mandriva/Command/.distfiles
index 72f101f..f03668b 100644
--- a/Completion/Mandriva/Command/.distfiles
+++ b/Completion/Mandriva/Command/.distfiles
@@ -1,5 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_urpmi
-_rebootin
 '
diff --git a/Completion/Redhat/.distfiles b/Completion/Redhat/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/Redhat/.distfiles
+++ b/Completion/Redhat/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/Redhat/Command/.distfiles b/Completion/Redhat/Command/.distfiles
index 8f8a5da..f03668b 100644
--- a/Completion/Redhat/Command/.distfiles
+++ b/Completion/Redhat/Command/.distfiles
@@ -1,5 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_rpm
-_yum
 '
diff --git a/Completion/Solaris/Command/.distfiles b/Completion/Solaris/Command/.distfiles
index a900851..f03668b 100644
--- a/Completion/Solaris/Command/.distfiles
+++ b/Completion/Solaris/Command/.distfiles
@@ -1,28 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_beadm
-_coreadm
-_dhcpinfo
-_dladm
-_dtrace
-_dumpadm
-_flowadm
-_fmadm
-_gcore
-_inetadm
-_ipadm
-_netstat
-_pfexec
-_pkg5
-_prstat
-_ps
-_ptree
-_savecore
-_snoop
-_svcadm
-_svccfg
-_svcprop
-_svcs
-_zlogin
-_zoneadm
 '
diff --git a/Completion/Solaris/Type/.distfiles b/Completion/Solaris/Type/.distfiles
index 2f937ee..f03668b 100644
--- a/Completion/Solaris/Type/.distfiles
+++ b/Completion/Solaris/Type/.distfiles
@@ -1,6 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_be_name
-_svcs_fmri
-_zones
 '
diff --git a/Completion/Unix/.distfiles b/Completion/Unix/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/Unix/.distfiles
+++ b/Completion/Unix/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index fe810e1..f03668b 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -1,278 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_a2ps
-_aap
-_adb
-_ant
-_antiword
-_apachectl
-_apm
-_arp
-_arping
-_at
-_attr
-_awk
-_baz
-_bison
-_bittorrent
-_bogofilter
-_bpython
-_bzip2
-_bzr
-_cal
-_calendar
-_cat
-_ccal
-_cdcd
-_cdrdao
-_cdrecord
-_chkconfig
-_chmod
-_chown
-_clay
-_comm
-_compress
-_configure
-_cowsay
-_cp
-_cpio
-_cplay
-_cssh
-_cut
-_cvs
-_darcs
-_date
-_dbus
-_dd
-_devtodo
-_df
-_dhclient
-_dict
-_diff
-_diffstat
-_django
-_dmidecode
-_du
-_dvi
-_ecasound
-_elinks
-_elm
-_enscript
-_env
-_espeak
-_etags
-_fakeroot
-_feh
-_fetchmail
-_ffmpeg
-_figlet
-_find
-_finger
-_flasher
-_flex
-_fortune
-_fsh
-_fuser
-_gcc
-_gdb
-_genisoimage
-_getconf
-_getent
-_getfacl
-_getmail
-_git
-_global
-_gnu_generic
-_gnupod
-_gnutls
-_go
-_gpg
-_gphoto2
-_gprof
-_gradle
-_graphicsmagick
-_grep
-_groff
-_growisofs
-_gs
-_guilt
-_gzip
-_hg
-_iconv
-_id
-_ifconfig
-_iftop
-_imagemagick
-_init_d
-_initctl
-_ip
-_irssi
-_ispell
-_java
-_joe
-_join
-_killall
-_knock
-_kvno
-_last
-_ldd
-_less
-_lha
-_links
-_ln
-_loadkeys
-_locate
-_look
-_lp
-_ls
-_lsof
-_lynx
-_lzop
-_mail
-_make
-_man
-_md5sum
-_mencal
-_metaflac
-_mh
-_mkdir
-_module
-_monotone
-_moosic
-_mosh
-_mount
-_mpc
-_mt
-_mtools
-_mtr
-_mutt
-_mysql_utils
-_mysqldiff
-_ncftp
-_netcat
-_nice
-_nkf
-_nm
-_nmap
-_notmuch
-_npm
-_nslookup
-_od
-_pack
-_patch
-_pax
-_pbm
-_perforce
-_perl
-_perldoc
-_pgrep
-_php
-_pine
-_ping
-_pkg-config
-_pkg_instance
-_pkgadd
-_pkginfo
-_pkgrm
-_pon
-_postfix
-_prcs
-_printenv
-_prove
-_psutils
-_pump
-_pydoc
-_python
-_qemu
-_quilt
-_raggle
-_rake
-_ranlib
-_rar
-_rcs
-_renice
-_ri
-_rlogin
-_rm
-_rrdtool
-_rsync
-_rubber
-_ruby
-_sablotron
-_samba
-_sccs
-_screen
-_sed
-_service
-_setfacl
-_sh
-_showmount
-_sisu
-_slrn
-_socket
-_sort
-_spamassassin
-_sqlite
-_sqsh
-_ssh
-_stgit
-_strip
-_stty
-_su
-_subversion
-_sudo
-_surfraw
-_sysctl
-_systemd
-_tar
-_tardy
-_tcpdump
-_tcptraceroute
-_telnet
-_tex
-_texinfo
-_tidy
-_tiff
-_tin
-_tla
-_tmux
-_todo.sh
-_toilet
-_topgit
-_totd
-_tracepath
-_tree
-_twidge
-_twisted
-_unace
-_uname
-_unexpand
-_uniq
-_unison
-_units
-_user_admin
-_uzbl
-_vcsh
-_vim
-_vorbis
-_vorbiscomment
-_vux
-_w3m
-_webbrowser
-_wget
-_whereis
-_whois
-_wiggle
-_xargs
-_xmlsoft
-_xmms2
-_xz
-_yafc
-_yodl
-_yp
-_zcat
-_zdump
-_zfs
-_zip
-_zpool
 '
diff --git a/Completion/Unix/Type/.distfiles b/Completion/Unix/Type/.distfiles
index ea0baa7..f03668b 100644
--- a/Completion/Unix/Type/.distfiles
+++ b/Completion/Unix/Type/.distfiles
@@ -1,56 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_arch_archives
-_arch_namespace
-_bind_addresses
-_canonical_paths
-_ctags_tags
-_dict_words
-_diff_options
-_dir_list
-_directories
-_domains
-_email_addresses
-_file_systems
-_files
-_global_tags
-_groups
-_have_glob_qual
-_hosts
-_java_class
-_ld_debug
-_list_files
-_locales
-_mailboxes
-_mime_types
-_my_accounts
-_net_interfaces
-_newsgroups
-_other_accounts
-_path_commands
-_path_files
-_pdf
-_perl_basepods
-_perl_modules
-_pids
-_ports
-_postscript
-_printers
-_ps1234
-_pspdf
-_remote_files
-_services
-_signals
-_tar_archive
-_terminals
-_texi
-_tilde_files
-_time_zone
-_urls
-_user_at_host
-_users
-_users_on
-_zfs_dataset
-_zfs_keysource_props
-_zfs_pool
 '
diff --git a/Completion/X/.distfiles b/Completion/X/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/X/.distfiles
+++ b/Completion/X/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/X/Command/.distfiles b/Completion/X/Command/.distfiles
index c6835ea..f03668b 100644
--- a/Completion/X/Command/.distfiles
+++ b/Completion/X/Command/.distfiles
@@ -1,36 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_acroread
-_dcop
-_gnome-gv
-_gqview
-_gv
-_kfmclient
-_matlab
-_mozilla
-_mplayer
-_nautilus
-_nedit
-_netscape
-_okular
-_pdftk
-_qiv
-_setxkbmap
-_urxvt
-_vnc
-_x_utils
-_xauth
-_xclip
-_xdvi
-_xfig
-_xloadimage
-_xmodmap
-_xournal
-_xpdf
-_xscreensaver
-_xset
-_xterm
-_xv
-_xwit
-_xrandr
 '
diff --git a/Completion/X/Type/.distfiles b/Completion/X/Type/.distfiles
index fa5c16c..f03668b 100644
--- a/Completion/X/Type/.distfiles
+++ b/Completion/X/Type/.distfiles
@@ -1,10 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_x_borderwidth        _x_font               _x_resource
-_x_color              _x_geometry           _x_selection_timeout
-_x_colormapid         _x_keysym             _x_title
-_x_cursor             _x_locale             _x_window
-_x_display            _x_modifier           _xt_session_id
-_x_extension          _x_name               _x_visual
-_xft_fonts
 '
diff --git a/Completion/X/Utility/.distfiles b/Completion/X/Utility/.distfiles
index 44337f4..f03668b 100644
--- a/Completion/X/Utility/.distfiles
+++ b/Completion/X/Utility/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_x_arguments   _xt_arguments
 '
diff --git a/Completion/Zsh/.distfiles b/Completion/Zsh/.distfiles
index 9e276f9..f03668b 100644
--- a/Completion/Zsh/.distfiles
+++ b/Completion/Zsh/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-.distfiles
 '
diff --git a/Completion/Zsh/Command/.distfiles b/Completion/Zsh/Command/.distfiles
index bf780a2..f03668b 100644
--- a/Completion/Zsh/Command/.distfiles
+++ b/Completion/Zsh/Command/.distfiles
@@ -1,51 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_alias
-_bindkey
-_builtin
-_cd
-_command
-_compdef
-_dirs
-_disable
-_echotc
-_echoti
-_emulate
-_enable
-_fc
-_hash
-_jobs_builtin
-_kill
-_limit
-_mere
-_precommand
-_print
-_prompt
-_read
-_run-help
-_sched
-_set
-_setopt
-_source
-_stat
-_tcpsys
-_trap
-_ttyctl
-_typeset
-_ulimit
-_unhash
-_unsetopt
-_vared
-_wait
-_which
-_zattr
-_zcompile
-_zed
-_zftp
-_zle
-_zmodload
-_zmv
-_zpty
-_zstyle
-_ztodo
 '
diff --git a/Completion/Zsh/Context/.distfiles b/Completion/Zsh/Context/.distfiles
index 1537229..f03668b 100644
--- a/Completion/Zsh/Context/.distfiles
+++ b/Completion/Zsh/Context/.distfiles
@@ -1,19 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_assign
-_autocd
-_brace_parameter
-_condition
-_default
-_dynamic_directory_name
-_equal
-_first
-_in_vared
-_math
-_parameter
-_redirect
-_subscript
-_tilde
-_value
-_zcalc_line
 '
diff --git a/Completion/Zsh/Function/.distfiles b/Completion/Zsh/Function/.distfiles
index 20b5dc6..f03668b 100644
--- a/Completion/Zsh/Function/.distfiles
+++ b/Completion/Zsh/Function/.distfiles
@@ -1,5 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_zargs
-_zsh-mime-handler
 '
diff --git a/Completion/Zsh/Type/.distfiles b/Completion/Zsh/Type/.distfiles
index 4011353..f03668b 100644
--- a/Completion/Zsh/Type/.distfiles
+++ b/Completion/Zsh/Type/.distfiles
@@ -1,27 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_aliases
-_arrays
-_command_names
-_delimiters
-_directory_stack
-_file_descriptors
-_functions
-_globflags
-_globqual_delims
-_globquals
-_history_modifiers
-_jobs
-_jobs_bg
-_jobs_fg
-_limits
-_math_params
-_module_math_func
-_options
-_options_set
-_options_unset
-_parameters
-_suffix_alias_files
-_user_math_func
-_vars
 '
diff --git a/Completion/openSUSE/Command/.distfiles b/Completion/openSUSE/Command/.distfiles
index 995d12e..f03668b 100644
--- a/Completion/openSUSE/Command/.distfiles
+++ b/Completion/openSUSE/Command/.distfiles
@@ -1,8 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_hwinfo
-_osc
-_SUSEconfig
-_yast2
-_zypper
 '
diff --git a/Config/.distfiles b/Config/.distfiles
index d76f988..f03668b 100644
--- a/Config/.distfiles
+++ b/Config/.distfiles
@@ -1,6 +1,2 @@
 DISTFILES_SRC='
-    .distfiles .cvsignore
-    aczshoot.m4
-    clean.mk config.mk defs.mk.in version.mk
-    installfns.sh uninstallfns.sh
 '
diff --git a/Doc/.distfiles b/Doc/.distfiles
index 6c2b211..8c910da 100644
--- a/Doc/.distfiles
+++ b/Doc/.distfiles
@@ -1,11 +1,5 @@
 DISTFILES_SRC='
-    .cvsignore .distfiles Makefile.in
-    META-FAQ.yo intro.ms
-    version.yo zmacros.yo zman.yo ztexi.yo
-    zsh.yo zshbuiltins.yo zshcalsys.yo
-    zshcompctl.yo zshcompsys.yo zshcompwid.yo
-    zshexpn.yo zshmisc.yo zshmodules.yo zshoptions.yo zshparam.yo
-    zshroadmap.yo zshzftpsys.yo zshzle.yo zshcontrib.yo zshtcpsys.yo
+    version.yo
     zsh.texi
     zsh.1 zshbuiltins.1 zshcalsys.1
     zshcompctl.1 zshcompsys.1 zshcompwid.1 zshexpn.1
diff --git a/Doc/Zsh/.distfiles b/Doc/Zsh/.distfiles
index 4f521e9..22fd53a 100644
--- a/Doc/Zsh/.distfiles
+++ b/Doc/Zsh/.distfiles
@@ -1,73 +1,5 @@
 DISTFILES_SRC='
-.cvsignore
-.distfiles
-arith.yo
-builtins.yo
-calsys.yo
-compat.yo
-compctl.yo
-compsys.yo
-compwid.yo
-cond.yo
-contrib.yo
-exec.yo
-expn.yo
-filelist.yo
-files.yo
-ftp_sites.yo
-func.yo
-grammar.yo
-index.yo
-intro.yo
-invoke.yo
-jobs.yo
 manmodmenu.yo
-manual.yo
-metafaq.yo
-mod_attr.yo
-mod_cap.yo
-mod_clone.yo
-mod_compctl.yo
-mod_complete.yo
-mod_complist.yo
-mod_computil.yo
-mod_curses.yo
-mod_datetime.yo
-mod_deltochar.yo
-mod_example.yo
-mod_files.yo
-mod_langinfo.yo
 modlist.yo
-mod_mapfile.yo
-mod_mathfunc.yo
 modmenu.yo
-mod_newuser.yo
-mod_parameter.yo
-mod_pcre.yo
-mod_regex.yo
-mod_sched.yo
-mod_socket.yo
-mod_stat.yo
-mod_system.yo
-mod_tcp.yo
-mod_termcap.yo
-mod_terminfo.yo
-modules.yo
-mod_zftp.yo
-mod_zleparameter.yo
-mod_zle.yo
-mod_zprof.yo
-mod_zpty.yo
-mod_zselect.yo
-mod_zutil.yo
-options.yo
-params.yo
-prompt.yo
-redirect.yo
-restricted.yo
-roadmap.yo
-seealso.yo
-tcpsys.yo
-zftpsys.yo
-zle.yo
 '
diff --git a/Doc/help/.distfiles b/Doc/help/.distfiles
index 60962ad..6424d95 100644
--- a/Doc/help/.distfiles
+++ b/Doc/help/.distfiles
@@ -1,5 +1,3 @@
 DISTFILES_SRC='
-    .cvsignore
-    .distfiles
     [_a-zA-Z0-9]*
 '
diff --git a/Etc/.distfiles b/Etc/.distfiles
index 8c1218e..d5034ec 100644
--- a/Etc/.distfiles
+++ b/Etc/.distfiles
@@ -1,30 +1,5 @@
 DISTFILES_SRC='
-.cvsignore
-.distfiles
-BUGS
-CONTRIBUTORS
-ChangeLog-3.0
-ChangeLog-3.1
-ChangeLog-4.1
-ChangeLog-4.3
 FAQ
-FAQ.yo
-FTP-README
-Makefile.in
-NEWS-4.3
-STD-TODO TODO
-changelog2html.pl
-completion-style-guide
-pubring.pgp
-relnote_4.3.5.txt
-relnote_4.3.6.txt
-relnote_4.3.7.txt
-relnote_4.3.8.txt
-relnote_4.3.9.txt
-relnote_4.3.10.txt
-relnote_4.3.12.txt
-relnote_5.0.0.txt
-zsh-development-guide
 '
 
 DISTFILES_DOC='
diff --git a/Functions/.distfiles b/Functions/.distfiles
index e538ad2..f03668b 100644
--- a/Functions/.distfiles
+++ b/Functions/.distfiles
@@ -1,3 +1,2 @@
 DISTFILES_SRC='
-    .cvsignore .distfiles README.zftp
 '
diff --git a/Functions/Calendar/.distfiles b/Functions/Calendar/.distfiles
index 7c14c38..f03668b 100644
--- a/Functions/Calendar/.distfiles
+++ b/Functions/Calendar/.distfiles
@@ -1,14 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-age
-calendar
-calendar_add
-calendar_edit
-calendar_lockfiles
-calendar_parse
-calendar_read
-calendar_scandate
-calendar_show
-calendar_showdate
-calendar_sort
 '
diff --git a/Functions/Chpwd/.distfiles b/Functions/Chpwd/.distfiles
index 89779a6..f03668b 100644
--- a/Functions/Chpwd/.distfiles
+++ b/Functions/Chpwd/.distfiles
@@ -1,9 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-cdr
-_cdr
-chpwd_recent_add
-chpwd_recent_dirs
-chpwd_recent_filehandler
-zsh_directory_name_cdr
 '
diff --git a/Functions/Compctl/.distfiles b/Functions/Compctl/.distfiles
index d4eea91..f03668b 100644
--- a/Functions/Compctl/.distfiles
+++ b/Functions/Compctl/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-cdmatch    cdmatch2   multicomp
 '
diff --git a/Functions/Example/.distfiles b/Functions/Example/.distfiles
index 26cffaf..f03668b 100644
--- a/Functions/Example/.distfiles
+++ b/Functions/Example/.distfiles
@@ -1,6 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-acx       cx        pushd     yp        zless
-cat       proto     randline  yu        zls
-zpgrep
 '
diff --git a/Functions/Exceptions/.distfiles b/Functions/Exceptions/.distfiles
index 8b69743..f03668b 100644
--- a/Functions/Exceptions/.distfiles
+++ b/Functions/Exceptions/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-catch   throw
 '
diff --git a/Functions/MIME/.distfiles b/Functions/MIME/.distfiles
index 93c13f7..f03668b 100644
--- a/Functions/MIME/.distfiles
+++ b/Functions/MIME/.distfiles
@@ -1,7 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-pick-web-browser
-zsh-mime-contexts
-zsh-mime-handler
-zsh-mime-setup
 '
diff --git a/Functions/Misc/.distfiles b/Functions/Misc/.distfiles
index 5efb178..f03668b 100644
--- a/Functions/Misc/.distfiles
+++ b/Functions/Misc/.distfiles
@@ -1,34 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-add-zsh-hook
-allopt
-checkmail
-colors
-getjobs
-harden
-is-at-least
-mere
-nslookup
-promptnl
-regexp-replace
-relative
-run-help
-run-help-git
-run-help-openssl
-run-help-p4
-run-help-sudo
-run-help-svk
-run-help-svn
-sticky-note
-tetris
-xtermctl
-zargs
-zcalc
-zed
-zkbd
-zmathfuncdef
-zmv
-zrecompile
-zstyle+
-ztodo
 '
diff --git a/Functions/Newuser/.distfiles b/Functions/Newuser/.distfiles
index 9012263..f03668b 100644
--- a/Functions/Newuser/.distfiles
+++ b/Functions/Newuser/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-zsh-newuser-install
 '
diff --git a/Functions/Prompts/.distfiles b/Functions/Prompts/.distfiles
index dd18a5e..f03668b 100644
--- a/Functions/Prompts/.distfiles
+++ b/Functions/Prompts/.distfiles
@@ -1,20 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-prompt_adam1_setup
-prompt_adam2_setup
-prompt_bart_setup
-prompt_bigfade_setup
-prompt_clint_setup
-prompt_elite2_setup
-prompt_elite_setup
-prompt_fade_setup
-prompt_fire_setup
-prompt_off_setup
-prompt_oliver_setup
-prompt_pws_setup
-prompt_redhat_setup
-prompt_special_chars
-prompt_suse_setup
-prompt_walters_setup
-prompt_zefram_setup
-promptinit'
+'
diff --git a/Functions/TCP/.distfiles b/Functions/TCP/.distfiles
index 00d37ca..f03668b 100644
--- a/Functions/TCP/.distfiles
+++ b/Functions/TCP/.distfiles
@@ -1,7 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-tcp_command tcp_log        tcp_proxy   tcp_send    tcp_talk
-tcp_alias  tcp_expect	   tcp_open    tcp_read    tcp_sess  tcp_wait
-tcp_close  tcp_fd_handler  tcp_output  tcp_rename  tcp_spam
-tcp_point  tcp_shoot
 '
diff --git a/Functions/VCS_Info/.distfiles b/Functions/VCS_Info/.distfiles
index b6e55d2..f03668b 100644
--- a/Functions/VCS_Info/.distfiles
+++ b/Functions/VCS_Info/.distfiles
@@ -1,21 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-vcs_info
-vcs_info_hookadd
-vcs_info_hookdel
-VCS_INFO_adjust
-VCS_INFO_bydir_detect
-VCS_INFO_check_com
-VCS_INFO_formats
-VCS_INFO_get_cmd
-VCS_INFO_hook
-vcs_info_lastmsg
-VCS_INFO_maxexports
-VCS_INFO_nvcsformats
-vcs_info_printsys
-VCS_INFO_quilt
-VCS_INFO_realpath
-VCS_INFO_reposub
-VCS_INFO_set
-vcs_info_setsys
 '
diff --git a/Functions/VCS_Info/Backends/.distfiles b/Functions/VCS_Info/Backends/.distfiles
index 67fb06c..f03668b 100644
--- a/Functions/VCS_Info/Backends/.distfiles
+++ b/Functions/VCS_Info/Backends/.distfiles
@@ -1,27 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-VCS_INFO_detect_bzr
-VCS_INFO_detect_cdv
-VCS_INFO_detect_cvs
-VCS_INFO_detect_darcs
-VCS_INFO_detect_fossil
-VCS_INFO_detect_git
-VCS_INFO_detect_hg
-VCS_INFO_detect_mtn
-VCS_INFO_detect_p4
-VCS_INFO_detect_svk
-VCS_INFO_detect_svn
-VCS_INFO_detect_tla
-VCS_INFO_get_data_bzr
-VCS_INFO_get_data_cdv
-VCS_INFO_get_data_cvs
-VCS_INFO_get_data_darcs
-VCS_INFO_get_data_fossil
-VCS_INFO_get_data_git
-VCS_INFO_get_data_hg
-VCS_INFO_get_data_mtn
-VCS_INFO_get_data_p4
-VCS_INFO_get_data_svk
-VCS_INFO_get_data_svn
-VCS_INFO_get_data_tla
 '
diff --git a/Functions/Zftp/.distfiles b/Functions/Zftp/.distfiles
index c8d8f81..f03668b 100644
--- a/Functions/Zftp/.distfiles
+++ b/Functions/Zftp/.distfiles
@@ -1,10 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-zfanon         zfdir          zfinit         zfrglob        zftype
-zfautocheck    zffcache       zfls           zfrtime        zfuget
-zfcd           zfgcp          zfmark         zfsession      zfuput
-zfcd_match     zfget          zfopen         zfstat
-zfcget         zfget_match    zfparams       zftp_chpwd
-zfclose        zfgoto         zfpcp          zftp_progress
-zfcput         zfhere         zfput          zftransfer
 '
diff --git a/Functions/Zle/.distfiles b/Functions/Zle/.distfiles
index 90a0769..f03668b 100644
--- a/Functions/Zle/.distfiles
+++ b/Functions/Zle/.distfiles
@@ -1,50 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-backward-kill-word-match
-backward-word-match
-capitalize-word-match
-copy-earlier-word
-cycle-completion-positions
-define-composed-chars
-delete-whole-word-match
-down-case-word-match
-down-line-or-beginning-search
-edit-command-line
-expand-absolute-path
-forward-word-match
-history-beginning-search-menu
-history-pattern-search
-history-search-end
-incarg
-incremental-complete-word
-insert-composed-char
-insert-files
-insert-unicode-char
-keeper
-keymap+widget
-kill-word-match
-match-word-context
-match-words-by-style
-modify-current-argument
-move-line-in-buffer
-narrow-to-region
-narrow-to-region-invisible
-predict-on
-quote-and-complete-word
-read-from-minibuffer
-replace-argument
-replace-string
-replace-string-again
-select-word-style
-send-invisible
-smart-insert-last-word
-split-shell-arguments
-transpose-lines
-transpose-words-match
-up-case-word-match
-up-line-or-beginning-search
-url-quote-magic
-which-command
-zcalc-auto-insert
-zed-set-file-name
 '
diff --git a/Misc/.distfiles b/Misc/.distfiles
index d40656c..f03668b 100644
--- a/Misc/.distfiles
+++ b/Misc/.distfiles
@@ -1,7 +1,2 @@
 DISTFILES_SRC='
-    .distfiles
-    bash2zshprompt
-    c2z compctl-examples globtests globtests.ksh
-    job-control-tests lete2ctl make-zsh-urls
-    vcs_info-examples
 '
diff --git a/Scripts/.distfiles b/Scripts/.distfiles
index 2232f30..f03668b 100644
--- a/Scripts/.distfiles
+++ b/Scripts/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-newuser
 '
diff --git a/Src/.distfiles b/Src/.distfiles
index 1da58ea..f03668b 100644
--- a/Src/.distfiles
+++ b/Src/.distfiles
@@ -1,53 +1,2 @@
 DISTFILES_SRC='
-.cvsignore
-.distfiles
-.exrc
-.indent.pro
-Makefile.in
-Makemod.in.in
-signames1.awk
-signames2.awk
-modentry.c
-builtin.c
-compat.c
-cond.c
-exec.c
-glob.c
-hashtable.c
-hashtable.h
-hashnameddir.c
-hist.c
-init.c
-input.c
-jobs.c
-lex.c
-linklist.c
-loop.c
-main.c
-makepro.awk
-math.c
-mem.c
-mkbltnmlst.sh
-mkmakemod.sh
-module.c
-options.c
-params.c
-parse.c
-pattern.c
-prompt.c
-prototypes.h
-signals.c
-signals.h
-sort.c
-string.c
-subst.c
-text.c
-utils.c
-watch.c
-zsh.h
-zsh.mdd
-zsh_system.h
-ztype.h
-zsh.rc
-zsh.ico
 '
diff --git a/Src/Builtins/.distfiles b/Src/Builtins/.distfiles
index cd36388..f03668b 100644
--- a/Src/Builtins/.distfiles
+++ b/Src/Builtins/.distfiles
@@ -1,5 +1,2 @@
 DISTFILES_SRC='
-    .cvsignore .distfiles .exrc
-    rlimits.mdd rlimits.c rlimits.awk
-    sched.mdd sched.c
 '
diff --git a/Src/Modules/.distfiles b/Src/Modules/.distfiles
index 9231cec..f03668b 100644
--- a/Src/Modules/.distfiles
+++ b/Src/Modules/.distfiles
@@ -1,61 +1,2 @@
 DISTFILES_SRC='
-.cvsignore
-.distfiles
-.exrc
-attr.mdd
-attr.c
-cap.mdd
-cap.c
-clone.mdd
-clone.c
-curses.mdd
-curses.c
-curses_keys.awk
-datetime.mdd
-datetime.c
-db_gdbm.mdd
-db_gdbm.c
-example.mdd
-example.c
-files.mdd
-files.c
-langinfo.mdd
-langinfo.c
-mapfile.mdd
-mapfile.c
-mathfunc.mdd
-mathfunc.c
-newuser.mdd
-newuser.c
-parameter.mdd
-parameter.c
-pcre.mdd
-pcre.c
-regex.mdd
-regex.c
-socket.mdd
-socket.c
-stat.mdd
-stat.c
-system.mdd
-system.c
-errnames1.awk
-errnames2.awk
-tcp.mdd
-tcp.c
-tcp.h
-termcap.mdd
-termcap.c
-terminfo.mdd
-terminfo.c
-zftp.mdd
-zftp.c
-zprof.mdd
-zprof.c
-zselect.mdd
-zselect.c
-zutil.mdd
-zutil.c
-zpty.mdd
-zpty.c
 '
diff --git a/Src/Zle/.distfiles b/Src/Zle/.distfiles
index e280a01..f03668b 100644
--- a/Src/Zle/.distfiles
+++ b/Src/Zle/.distfiles
@@ -1,14 +1,2 @@
 DISTFILES_SRC='
-    .cvsignore .distfiles .exrc
-    comp.h complete.mdd complete.c
-    compcore.c compmatch.c compresult.c
-    compctl.mdd compctl.c compctl.h
-    complist.mdd complist.c
-    computil.mdd computil.c
-    deltochar.mdd deltochar.c
-    zleparameter.mdd zleparameter.c
-    zle.mdd iwidgets.list zle.h zle_bindings.c zle_hist.c
-    zle_keymap.c zle_main.c zle_misc.c zle_move.c zle_params.c
-    zle_refresh.c zle_things.sed zle_thingy.c zle_tricky.c
-    zle_utils.c zle_vi.c zle_widget.sed zle_word.c
 '
diff --git a/StartupFiles/.distfiles b/StartupFiles/.distfiles
index 7058edd..f03668b 100644
--- a/StartupFiles/.distfiles
+++ b/StartupFiles/.distfiles
@@ -1,4 +1,2 @@
 DISTFILES_SRC='
-    .distfiles
-    zlogin zshenv zshrc
 '
diff --git a/Test/.distfiles b/Test/.distfiles
index 5826e75..f03668b 100644
--- a/Test/.distfiles
+++ b/Test/.distfiles
@@ -1,52 +1,2 @@
 DISTFILES_SRC='
-.cvsignore
-.distfiles
-A01grammar.ztst
-A02alias.ztst
-A03quoting.ztst
-A04redirect.ztst
-A05execution.ztst
-A06assign.ztst
-A07control.ztst
-B01cd.ztst
-B02typeset.ztst
-B03print.ztst
-B04read.ztst
-B05eval.ztst
-B06fc.ztst
-B07emulate.ztst
-B08shift.ztst
-C01arith.ztst
-C02cond.ztst
-C03traps.ztst
-C04funcdef.ztst
-C05debug.ztst
-D01prompt.ztst
-D02glob.ztst
-D03procsubst.ztst
-D04parameter.ztst
-D05array.ztst
-D06subscript.ztst
-D07multibyte.ztst
-D08cmdsubst.ztst
-D09brace.ztst
-E01options.ztst
-E02xtrace.ztst
-Makefile.in
-README
-V01zmodload.ztst
-V02zregexparse.ztst
-V03mathfunc.ztst
-V04features.ztst
-V05styles.ztst
-V06parameter.ztst
-V07pcre.ztst
-V08zpty.ztst
-X02zlevi.ztst
-Y01completion.ztst
-Y02compmatch.ztst
-Y03arguments.ztst
-comptest
-runtests.zsh
-ztst.zsh
 '
diff --git a/Util/.distfiles b/Util/.distfiles
index 162ace3..4119385 100644
--- a/Util/.distfiles
+++ b/Util/.distfiles
@@ -1,10 +1,4 @@
 DISTFILES_SRC='
-    .distfiles
-    check_exports
-    helpfiles
-    mkdisttree.sh
-    preconfig
-    reporter
 '
 DISTFILES_NOT='
     difflog.pl
diff --git a/Util/mkdisttree.sh b/Util/mkdisttree.sh
index 17b936e..2d55b06 100755
--- a/Util/mkdisttree.sh
+++ b/Util/mkdisttree.sh
@@ -51,9 +51,15 @@ trap 'rm -f $filelist; rm -rf $disttree; exit 1' 1 2 15
 ( while read dfn; do
     subdir=`echo $dfn | sed 's,/\.distfiles$,,'`
     echo >&2 "Processing directory $subdir..."
-    eval "DISTFILES_$type="
+    eval "DISTFILES_$type= DISTFILES_NOT="
     . $sdir_top/$dfn
     eval "distfiles=\$DISTFILES_$type"
+    if [ $type = SRC ]; then
+	# All files in git appear in the source bundle, unless
+	# explicitly excluded with DISTFILES_NOT.
+	distfiles="$distfiles
+        `cd $sdir_top/$subdir; git ls-files | grep -v /`"
+    fi
     if test -n "$distfiles"; then
 	cmds=`echo "$distfiles" | sed -e "$sed_separate"`
 	eval "$cmds"
@@ -62,6 +68,11 @@ trap 'rm -f $filelist; rm -rf $disttree; exit 1' 1 2 15
 	fi
 	$sdir_top/mkinstalldirs $disttree/$subdir || exit 1
 	for f in $deplist `test -z "$globlist" || ( cd $dir_top/$subdir && eval "echo $globlist")`; do
+	    for fnot in $DISTFILES_NOT; do
+		if [ $fnot = $f ]; then
+		    continue 2
+		fi
+	    done
 	    if test -f $dir_top/$subdir/$f; then
 #		ln $dir_top/$subdir/$f $disttree/$subdir/$f || \
 		    cp -p $dir_top/$subdir/$f $disttree/$subdir/$f || exit 1

-- 
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "Automate" use of .distfiles a little bit?
  2014-08-23 19:49   ` Peter Stephenson
@ 2014-08-23 20:04     ` Peter Stephenson
  2014-08-28 19:30     ` Peter Stephenson
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Stephenson @ 2014-08-23 20:04 UTC (permalink / raw)
  To: zsh-workers

On Sat, 23 Aug 2014 20:49:13 +0100
Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> On Sat, 23 Aug 2014 18:57:24 +0100
> Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> > I therfore suggest that at some point we change the code to assume files
> > that are managed by git are part of the src package unless an assignment
> > of the form above explicitly indicates otherwise
> 
> I think this does it.

Pushed immediately in order to forestall any messy conflicts --- I've handled one in a commit from Bart since the state when I posted.  I'm assuming there can't be a hell of a lot wrong with it.

pws


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: "Automate" use of .distfiles a little bit?
  2014-08-23 19:49   ` Peter Stephenson
  2014-08-23 20:04     ` Peter Stephenson
@ 2014-08-28 19:30     ` Peter Stephenson
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Stephenson @ 2014-08-28 19:30 UTC (permalink / raw)
  To: zsh-workers

On Sat, 23 Aug 2014 20:49:13 +0100
Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> Perhaps some mention in the the development doc would be beneficial.

diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide
index 37364e1..2ed7542 100644
--- a/Etc/zsh-development-guide
+++ b/Etc/zsh-development-guide
@@ -931,18 +931,22 @@ freely available tools.
 To indicate which files should be distributed, each directory in the git
 tree includes a file .distfiles that sets any number of a set of Bourne
 shell (scalar) parameters.  The value of the parameter is expanded as a
-set of standard command line arguments.  Basic globbing is allowed in the
-values.
+set of standard command line arguments.  Apart from DISTFILES_NOT, which
+must be an explicit list of files separated by whitespace, basic
+globbing is allowed in the values.
+
+Because of the way DISTFILES_SRC is constructed it is only possible
+to make a release from a git checkout.
 
 The following parameters are currently used:
 
 - DISTFILES_SRC is a list of files from the directory for the "src"
-  distribution.
+  distribution.  However, if the file .distfiles is present in
+  a directory, all files known to git will be added to DISTFILES_SRC
+  except for files listed explicitly in DISTFILES_NOT.
 
 - DISTFILES_DOC is a list of files from the directory for the "doc"
   distribution.
 
 - DISTFILES_NOT is a list of files that will not be included in a
-  distribution, but that need to be present in the git tree.  This
-  variable is not used by the zsh build process and is present for
-  the convenience of external checks.
+  distribution even though they are present in the git tree.


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-08-28 19:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-20 15:52 "Automate" use of .distfiles a little bit? Bart Schaefer
2014-08-23 17:57 ` Peter Stephenson
2014-08-23 19:49   ` Peter Stephenson
2014-08-23 20:04     ` Peter Stephenson
2014-08-28 19:30     ` Peter Stephenson

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).