diff options
author | Joerg Mayer <jmayer@loplof.de> | 2014-07-21 03:11:42 +0200 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2014-07-21 01:13:21 +0000 |
commit | 56a241137aeccb29268a4c0b8f924fc8a1b50d56 (patch) | |
tree | 3562f434395a85f3bd6f385da489758eb8eb5efd /tools | |
parent | 494092a4181e24dc039e9f8edbe9a07edeeeb866 (diff) | |
download | wireshark-56a241137aeccb29268a4c0b8f924fc8a1b50d56.tar.gz |
Remove tools/win32-setup.sh and tools/win64-setup.sh
Change-Id: Ifdc57304a0109f60260dc73d95b0598ddca81805
Reviewed-on: https://code.wireshark.org/review/3146
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.am | 10 | ||||
-rwxr-xr-x | tools/win32-setup.sh | 39 | ||||
-rwxr-xr-x | tools/win64-setup.sh | 39 |
3 files changed, 4 insertions, 84 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 734a16b4ba..ca912b8a7a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -94,7 +94,7 @@ EXTRA_DIST = \ cppcheck/includes \ cppcheck/suppressions \ debian-setup.sh \ - dfilter-test.py \ + dfilter-test.py \ extract_asn1_from_spec.pl \ fix-encoding-args.pl \ fixhf.pl \ @@ -112,8 +112,8 @@ EXTRA_DIST = \ make-dissector-reg \ make-dissector-reg.py \ make-manuf \ - make-sminmpec.pl \ - make-services.py \ + make-sminmpec.pl \ + make-services.py \ make-tapreg-dotc \ make-tap-reg.py \ msnchat \ @@ -129,10 +129,8 @@ EXTRA_DIST = \ setuid-root.pl.in \ test-common.sh \ test-captures.sh \ - textify.sh \ + textify.sh \ valgrind-wireshark.sh \ - win32-setup.sh \ - win64-setup.sh \ win-setup.sh \ wireshark_be.py \ wireshark_gen.py \ diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh deleted file mode 100755 index d056537fd6..0000000000 --- a/tools/win32-setup.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Copyright 2013 Gerald Combs <gerald@wireshark.org> -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# 32-bit wrapper for win-setup.sh. - -export DOWNLOAD_TAG="2014-06-05" - -WIN_SETUP=`echo $0 | sed -e s/win32/win/` - -if [ -z "$*" ]; then - exec $WIN_SETUP $@ -fi -case "$1" in ---download|--settag|--checktag) - exec $WIN_SETUP $@ $DOWNLOAD_TAG - ;; -*) - exec $WIN_SETUP $@ - ;; -esac diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh deleted file mode 100755 index 009c77b763..0000000000 --- a/tools/win64-setup.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Copyright 2013 Gerald Combs <gerald@wireshark.org> -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# 64-bit wrapper for win-setup.sh. - -export DOWNLOAD_TAG="2014-06-05" - -WIN_SETUP=`echo $0 | sed -e s/win64/win/` - -if [ -z "$*" ]; then - exec $WIN_SETUP $@ -fi -case "$1" in ---download|--settag|--checktag) - exec $WIN_SETUP $@ $DOWNLOAD_TAG - ;; -*) - exec $WIN_SETUP $@ - ;; -esac |