diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 16:05:53 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 17:15:50 -0400 |
commit | ce84200542f48a92e8b56a8d032401ecd153e90c (patch) | |
tree | 643a4e08cda5ca46840416cbfddc2f78ca93b934 /contrib | |
parent | 81cb0afb2b0163d95a435583041dce1064eec65c (diff) | |
download | tor-ce84200542f48a92e8b56a8d032401ecd153e90c.tar.gz tor-ce84200542f48a92e8b56a8d032401ecd153e90c.zip |
Remove ancient unused script that used the old src/or location
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/include.am | 1 | ||||
-rw-r--r-- | contrib/win32build/package_nsis-mingw.sh | 95 |
2 files changed, 0 insertions, 96 deletions
diff --git a/contrib/include.am b/contrib/include.am index 5d5f216490..a23e82d6da 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -10,7 +10,6 @@ EXTRA_DIST+= \ contrib/operator-tools/linux-tor-prio.sh \ contrib/operator-tools/tor-exit-notice.html \ contrib/or-tools/exitlist \ - contrib/win32build/package_nsis-mingw.sh \ contrib/win32build/tor-mingw.nsi.in \ contrib/win32build/tor.ico \ contrib/win32build/tor.nsi.in diff --git a/contrib/win32build/package_nsis-mingw.sh b/contrib/win32build/package_nsis-mingw.sh deleted file mode 100644 index cae862b919..0000000000 --- a/contrib/win32build/package_nsis-mingw.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -# -# =============================================================================== -# package_nsis-ming.sh is distributed under this license: - -# Copyright (c) 2006-2007 Andrew Lewman -# Copyright (c) 2008 The Tor Project, Inc. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: - -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. - -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. - -# * Neither the names of the copyright owners nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# =============================================================================== - -# Script to package a Tor installer on win32. This script assumes that -# you have already built Tor, that you are running msys/mingw, and that -# you know what you are doing. - -# Start in the tor source directory after you've compiled tor.exe -# This means start as ./contrib/win32build/package_nsis-mingw.sh - -rm -rf win_tmp -mkdir win_tmp -mkdir win_tmp/bin -mkdir win_tmp/contrib -mkdir win_tmp/doc -mkdir win_tmp/doc/spec -mkdir win_tmp/doc/design-paper -mkdir win_tmp/doc/contrib -mkdir win_tmp/src -mkdir win_tmp/src/config -mkdir win_tmp/tmp - -cp src/or/tor.exe win_tmp/bin/ -cp src/tools/tor-resolve.exe win_tmp/bin/ -cp contrib/win32build/tor.ico win_tmp/bin/ -cp src/config/geoip win_tmp/bin/ -strip win_tmp/bin/*.exe - -# There is no man2html in mingw. -# Maybe we should add this into make dist instead. -# One has to do this manually and cp it do the tor-source/doc dir -#man2html doc/tor.1.in > win_tmp/tmp/tor-reference.html -#man2html doc/tor-resolve.1 > win_tmp/tmp/tor-resolve.html - -clean_newlines() { - perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg;' $1 >$2 -} - -clean_localstatedir() { - perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg; s{\@LOCALSTATEDIR\@/(lib|log)/tor/}{C:\\Documents and Settings\\Application Data\\Tor\\}' $1 >$2 -} - -for fn in address-spec.txt bridges-spec.txt control-spec.txt dir-spec.txt path-spec.txt rend-spec.txt socks-extensions.txt tor-spec.txt version-spec.txt; do - clean_newlines doc/spec/$fn win_tmp/doc/spec/$fn -done - -for fn in HACKING tor-gencert.html tor.html torify.html tor-resolve.html; do - clean_newlines doc/$fn win_tmp/doc/$fn -done - -for fn in README ChangeLog LICENSE; do - clean_newlines $fn win_tmp/$fn -done - -clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample - -cp contrib/win32build/tor-mingw.nsi.in win_tmp/contrib/ - -cd win_tmp -makensis.exe contrib/tor-mingw.nsi.in - |