]> git.ipfire.org Git - thirdparty/tor.git/commit
Clean the contrib directory with torch and machete.
authorNick Mathewson <nickm@torproject.org>
Mon, 28 Apr 2014 15:34:53 +0000 (11:34 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 28 Apr 2014 15:34:53 +0000 (11:34 -0400)
commit9230bc7c65cec68c66fa9c75751d6c6bd600e9fc
treeb9c2fe09bca52107a1595be0099bbc580dd39b19
parent78b431d3e30def3641f25707197c55a1c7200269
Clean the contrib directory with torch and machete.

We've accumulated a lot of cruft in this directory over the years: so
much, that it passed the point of being so disorganized that we no
longer browsed through it to see how bad it had gotten.

This patch (based on changes by rl1987) tries to remove the most
useless items, and split the others into reasonable directories.  It
creates a new scripts/ directory for maint and test scripts.

This patch was generated with the script below.  No other changes are made in
this patch.

#############
# new directories
mkdir -p contrib/test-tools
mkdir -p contrib/or-tools
mkdir -p contrib/dirauth-tools
mkdir -p contrib/operator-tools
mkdir -p contrib/client-tools
mkdir -p contrib/test-tools
mkdir -p contrib/dist
mkdir -p contrib/dist/suse
mkdir -p contrib/win32build

mkdir -p scripts/maint
mkdir -p scripts/test

############
# Deleted -- nobody who wants this is going to be looking for it here any
# longer.  Also, nobody wants it.
git rm contrib/auto-naming/README

# Deleted: We no longer do polipo.
git rm contrib/polipo/Makefile.mingw
git rm contrib/polipo/README
git rm contrib/polipo/polipo-mingw.nsi

# We haven't even tried to run this for ages. It is a relic of a bygone era
git rm contrib/mdd.py

# contrib/dir-tools/directory-archive/
# Tools for running a directory archive. No longer used - deleting them.
git rm contrib/directory-archive/crontab.sample
git rm contrib/directory-archive/fetch-all
git rm contrib/directory-archive/fetch-all-v3
git rm contrib/directory-archive/tar-them-up
git rm contrib/directory-archive/fetch-all-functions
git rm contrib/directory-archive/sort-into-month-folder

# This appears to be related to very old windows packaging stuff.
git rm contrib/bundle.nsi
git rm contrib/package_nsis-weasel.sh
git rm contrib/package_nsis.sh
git rm contrib/netinst.nsi
git rm contrib/torinst32.ico
git rm contrib/xenobite.ico

# This should not be needed for cross-compilation any more, should it?
git rm contrib/cross.sh

# I don't think anyone ever used this.
git rm contrib/make-signature.sh

# These are attempts to send tor controller commands from the command-line.
# They don't support modern authentication.
git rm contrib/tor-ctrl.sh

# this is for fetching about a tor server from a dirauth. But it
# doesn't authenticate the dirauth: yuck.
git rm contrib/sd

# wow, such unused, very perl4.
git rm contrib/tor-stress

####### contrib/dirauth-tools/
# Tools for running a directory authority

git mv contrib/add-tor contrib/dirauth-tools/
git mv contrib/nagios-check-tor-authority-cert contrib/dirauth-tools/

#######
# contrib/or-tools/
# Tools for examining relays
git mv contrib/check-tor contrib/or-tools/check-tor
git mv contrib/checksocks.pl contrib/or-tools/checksocks.pl
git mv contrib/exitlist contrib/or-tools/exitlist

#######
# contrib/operator-tools

# Tools for running a relay.
git mv contrib/linux-tor-prio.sh contrib/operator-tools/linux-tor-prio.sh
git mv contrib/tor-exit-notice.html contrib/operator-tools/tor-exit-notice.html
git mv contrib/tor.logrotate.in contrib/operator-tools/

######
# contrib/dist

git mv contrib/rc.subr contrib/dist/
git mv contrib/tor.sh.in contrib/dist/
git mv contrib/torctl.in contrib/dist/
git mv contrib/suse/* contrib/dist/suse/

######
# client-tools
git mv contrib/torify contrib/client-tools/torify
git mv contrib/tor-resolve.py contrib/client-tools/

######
# win32build

git mv contrib/package_nsis-mingw.sh contrib/win32build/
git mv contrib/tor.nsi.in contrib/win32build/
# Erinn didn't ask for this...
git mv contrib/tor-mingw.nsi.in contrib/win32build/
git mv contrib/tor.ico contrib/win32build/

######
# scripts/test
git mv contrib/cov-blame scripts/test/cov-blame
git mv contrib/cov-diff scripts/test/cov-diff
git mv contrib/coverage scripts/test/coverage
git mv contrib/scan-build.sh scripts/test/

######## scripts/maint
# Maintainance scripts
#
# These are scripts for developers to use when hacking on Tor.  They mostly
# look at the Tor source in one way or another.
git mv contrib/findMergedChanges.pl scripts/maint/findMergedChanges.pl
git mv contrib/checkOptionDocs.pl scripts/maint/checkOptionDocs.pl
git mv contrib/checkSpace.pl scripts/maint/checkSpace.pl
git mv contrib/redox.py scripts/maint/redox.py
git mv contrib/updateVersions.pl scripts/maint/updateVersions.pl
git mv contrib/checkLogs.pl scripts/maint/checkLogs.pl
git mv contrib/format_changelog.py scripts/maint/
52 files changed:
contrib/auto-naming/README [deleted file]
contrib/bundle.nsi [deleted file]
contrib/client-tools/tor-resolve.py [moved from contrib/tor-resolve.py with 100% similarity]
contrib/client-tools/torify [moved from contrib/torify with 100% similarity]
contrib/cross.sh [deleted file]
contrib/dirauth-tools/add-tor [moved from contrib/add-tor with 100% similarity]
contrib/dirauth-tools/nagios-check-tor-authority-cert [moved from contrib/nagios-check-tor-authority-cert with 100% similarity]
contrib/directory-archive/crontab.sample [deleted file]
contrib/directory-archive/fetch-all [deleted file]
contrib/directory-archive/fetch-all-functions [deleted file]
contrib/directory-archive/fetch-all-v3 [deleted file]
contrib/directory-archive/sort-into-month-folder [deleted file]
contrib/directory-archive/tar-them-up [deleted file]
contrib/dist/rc.subr [moved from contrib/rc.subr with 100% similarity]
contrib/dist/suse/include.am [moved from contrib/suse/include.am with 100% similarity]
contrib/dist/suse/tor.sh.in [moved from contrib/suse/tor.sh.in with 100% similarity]
contrib/dist/tor.sh.in [moved from contrib/tor.sh.in with 100% similarity]
contrib/dist/torctl.in [moved from contrib/torctl.in with 100% similarity]
contrib/make-signature.sh [deleted file]
contrib/mdd.py [deleted file]
contrib/netinst.nsi [deleted file]
contrib/operator-tools/linux-tor-prio.sh [moved from contrib/linux-tor-prio.sh with 100% similarity]
contrib/operator-tools/tor-exit-notice.html [moved from contrib/tor-exit-notice.html with 100% similarity]
contrib/operator-tools/tor.logrotate.in [moved from contrib/tor.logrotate.in with 100% similarity]
contrib/or-tools/check-tor [moved from contrib/check-tor with 100% similarity]
contrib/or-tools/checksocks.pl [moved from contrib/checksocks.pl with 100% similarity]
contrib/or-tools/exitlist [moved from contrib/exitlist with 100% similarity]
contrib/package_nsis-weasel.sh [deleted file]
contrib/package_nsis.sh [deleted file]
contrib/polipo/Makefile.mingw [deleted file]
contrib/polipo/README [deleted file]
contrib/polipo/polipo-mingw.nsi [deleted file]
contrib/sd [deleted file]
contrib/tor-ctrl.sh [deleted file]
contrib/tor-stress [deleted file]
contrib/torinst32.ico [deleted file]
contrib/win32build/package_nsis-mingw.sh [moved from contrib/package_nsis-mingw.sh with 100% similarity]
contrib/win32build/tor-mingw.nsi.in [moved from contrib/tor-mingw.nsi.in with 100% similarity]
contrib/win32build/tor.ico [moved from contrib/tor.ico with 100% similarity]
contrib/win32build/tor.nsi.in [moved from contrib/tor.nsi.in with 100% similarity]
contrib/xenobite.ico [deleted file]
scripts/maint/checkLogs.pl [moved from contrib/checkLogs.pl with 100% similarity]
scripts/maint/checkOptionDocs.pl [moved from contrib/checkOptionDocs.pl with 100% similarity]
scripts/maint/checkSpace.pl [moved from contrib/checkSpace.pl with 100% similarity]
scripts/maint/findMergedChanges.pl [moved from contrib/findMergedChanges.pl with 100% similarity]
scripts/maint/format_changelog.py [moved from contrib/format_changelog.py with 100% similarity]
scripts/maint/redox.py [moved from contrib/redox.py with 100% similarity]
scripts/maint/updateVersions.pl [moved from contrib/updateVersions.pl with 100% similarity]
scripts/test/cov-blame [moved from contrib/cov-blame with 100% similarity]
scripts/test/cov-diff [moved from contrib/cov-diff with 100% similarity]
scripts/test/coverage [moved from contrib/coverage with 100% similarity]
scripts/test/scan-build.sh [moved from contrib/scan-build.sh with 100% similarity]