diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.nmake | 12 | ||||
| -rw-r--r-- | README.windows (renamed from README.win32) | 14 | ||||
| -rw-r--r-- | asn1/Makefile.inc.nmake | 13 | ||||
| -rw-r--r-- | config.nmake | 8 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 55 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 24 | ||||
| -rwxr-xr-x | tools/textify.sh | 50 | ||||
| -rwxr-xr-x | tools/unix2dos.pl | 36 |
10 files changed, 111 insertions, 105 deletions
@@ -14,7 +14,7 @@ Installation These are installation instructions for Unix and Unix-like systems that can run the "configure" script in this same directory. These are not the installation instructions for Windows systems; see -README.win32 for those instructions. +README.windows for those instructions. 0. This is software. Beware. diff --git a/Makefile.am b/Makefile.am index afd72111a5..8afe3f7625 100644 --- a/Makefile.am +++ b/Makefile.am @@ -578,7 +578,7 @@ EXTRA_DIST = \ README.macos \ README.tru64 \ README.vmware \ - README.win32 \ + README.windows \ aclocal-fallback/glib-2.0.m4 \ aclocal-fallback/gtk-2.0.m4 \ aclocal-flags \ diff --git a/Makefile.nmake b/Makefile.nmake index 799425eeb0..7eb061fcb9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -938,11 +938,10 @@ install-generated-files: xcopy "doc\AUTHORS-SHORT" $(INSTALL_DIR) /d xcopy ".\manuf" $(INSTALL_DIR) /d xcopy ".\services" $(INSTALL_DIR) /d - xcopy ".\README" $(INSTALL_DIR) /d - xcopy ".\README.win32" $(INSTALL_DIR) /d - xcopy "doc\AUTHORS-SHORT-FORMAT" $(INSTALL_DIR) /d - xcopy ".\COPYING" $(INSTALL_DIR) /d - copy ".\NEWS" $(INSTALL_DIR)\NEWS.txt + $(TEXTIFY) ".\COPYING" $(INSTALL_DIR) + $(TEXTIFY) ".\NEWS" $(INSTALL_DIR) + $(TEXTIFY) ".\README" $(INSTALL_DIR) + $(TEXTIFY) ".\README.windows" $(INSTALL_DIR) xcopy ".\cfilters" $(INSTALL_DIR) /d xcopy ".\colorfilters" $(INSTALL_DIR) /d xcopy ".\dfilters" $(INSTALL_DIR) /d @@ -957,8 +956,7 @@ install-generated-files: xcopy ".\help\*.*" $(INSTALL_DIR)\help /d # you can't reliably use xcopy to rename files "on the fly" (so copy first, then rename) xcopy ".\help\faq.txt" $(INSTALL_DIR) /d - if exist $(INSTALL_DIR)\FAQ del $(INSTALL_DIR)\FAQ - ren $(INSTALL_DIR)\faq.txt FAQ + $(UNIX2DOS) $(INSTALL_DIR)/help/*.txt if not exist $(INSTALL_DIR)\dtds mkdir $(INSTALL_DIR)\dtds xcopy ".\dtds\*.*" $(INSTALL_DIR)\dtds /d if not exist $(INSTALL_DIR)\asn1 mkdir $(INSTALL_DIR)\asn1 diff --git a/README.win32 b/README.windows index 314ff26353..b44867b865 100644 --- a/README.win32 +++ b/README.windows @@ -1,15 +1,19 @@ $Id$ -Installing Wireshark on Win32 +Installing Wireshark on Windows ============================= -To install Wireshark, just download the setup program from: +To install Wireshark, just download the appropriate installer program from http://www.wireshark.org/download/win32 +or + +http://www.wireshark.org/download/win64 + and start it. Just keep the default settings and start Wireshark after the installation finished (e.g. using the start menu entry). -For detailed descriptions how to install and use Wireshark and the +For detailed descriptions on how to install and use Wireshark and the related command line tools, see the Wireshark User's Guide at: http://www.wireshark.org/docs/ @@ -18,7 +22,7 @@ http://www.wireshark.org/docs/ Compiling the Wireshark distribution from source ================================================ In case you want to develop Wireshark code yourself, you can find a -comprehensive guide how to do this in the Developer's Guide, -which you can find (and much more info) at: +comprehensive guide how to do this in the Developer's Guide, which +you can find (and much more info) at: http://wiki.wireshark.org/Development diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake index c15f2c1476..79f6373ec1 100644 --- a/asn1/Makefile.inc.nmake +++ b/asn1/Makefile.inc.nmake @@ -21,9 +21,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - generate_dissector: $(DISSECTOR_FILES) generate_export: $(EXPORT_FILES) @@ -79,15 +76,7 @@ maintainer-clean: distclean # the generated stuff has "\n". fix_eol: generate_dissector - <<fix_file.bat -IF "%1"=="" EXIT -move %1 %1.tmp -$(UNIX2DOS) < %1.tmp > %1 - del /f %1.tmp -<< - <<fix_eol.bat -FOR %%A IN ($(DISSECTOR_FILES)) DO CALL fix_file.bat %%A -<< + u2d $(DISSECTOR_FILES) copy_files: generate_dissector <<copy_files.bat diff --git a/config.nmake b/config.nmake index 272e4baedd..a18b60874a 100644 --- a/config.nmake +++ b/config.nmake @@ -1,7 +1,7 @@ # $Id$ -# Some more informations about the settings in this file, can be found -# in the file README.win32 and the Developer's Guide (available online). +# Some more information about the settings in this file can be found in +# the file README.windows and the Developer's Guide (available online). ##### Target platform ##### # Only "win32" and "win64" are valid (for now). @@ -602,6 +602,10 @@ LEX=flex # command for yacc/bison (cygwin's bison recommended) YACC=bison +# Commands to convert UNIX line endings to DOS/Windows +UNIX2DOS=u2d +TEXTIFY=$(SH) $(TOOLS_DIR)/textify.sh + # # Optional: To build the NSIS installer. # diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 45fcddaec1..2e0e3f6a6f 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -12,38 +12,37 @@ include ../../config.nmake include Custom.nmake -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - - EXE=../../tshark.exe ../../editcap.exe \ !IFDEF GTK_DIR ../../wireshark.exe \ !ENDIF ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_1_1.exe DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll -DOC=../../doc/ws.css \ - ../../doc/capinfos.html \ - ../../doc/dumpcap.html \ - ../../doc/editcap.html \ - ../../doc/idl2wrs.html \ - ../../doc/mergecap.html \ - ../../doc/rawshark.html \ - ../../doc/text2pcap.html \ - ../../doc/rawshark.html \ - ../../doc/tshark.html \ - ../../doc/wireshark-filter.html \ - ../../doc/wireshark.html \ - ../../README \ - ../../README.win32 -DOC_dos=NEWS.txt +DOC=../../doc/ws.css \ + ../../doc/capinfos.html \ + ../../doc/dumpcap.html \ + ../../doc/editcap.html \ + ../../doc/idl2wrs.html \ + ../../doc/mergecap.html \ + ../../doc/rawshark.html \ + ../../doc/text2pcap.html \ + ../../doc/rawshark.html \ + ../../doc/tshark.html \ + ../../doc/wireshark-filter.html \ + ../../doc/wireshark.html \ + ../../$(INSTALL_DIR)/COPYING.txt \ + ../../$(INSTALL_DIR)/NEWS.txt \ + ../../$(INSTALL_DIR)/README.txt \ + ../../$(INSTALL_DIR)/README.windows.txt + GPL=../../COPYING -HELP=../../help/capture_filters.txt \ - ../../help/capturing.txt \ - ../../help/display_filters.txt \ - ../../help/faq.txt \ - ../../help/getting_started.txt \ - ../../help/overview.txt \ - ../../help/toc +HELP=../../$(INSTALL_DIR)/help/capture_filters.txt \ + ../../$(INSTALL_DIR)/help/capturing.txt \ + ../../$(INSTALL_DIR)/help/display_filters.txt \ + ../../$(INSTALL_DIR)/help/faq.txt \ + ../../$(INSTALL_DIR)/help/getting_started.txt \ + ../../$(INSTALL_DIR)/help/overview.txt \ + ../../$(INSTALL_DIR)/help/toc PLUGINS= \ ../../plugins/asn1/asn1.dll \ @@ -76,7 +75,7 @@ NSI=wireshark.nsi \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) !IFDEF MAKENSIS -all: NEWS.txt wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe +all: wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe !ELSE all: _FORCE_ @echo ? NSIS not available (MAKENSIS not defined in config.nmake) @@ -84,9 +83,6 @@ all: _FORCE_ @exit 1 !ENDIF -NEWS.txt: ../../NEWS - $(UNIX2DOS) < ../../NEWS > NEWS.txt - # fetch the latest available user-guide.chm version user-guide.chm:: if exist ..\..\docbook\user-guide.chm xcopy ..\..\docbook\user-guide.chm . /Y /D @@ -97,6 +93,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( /DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \ /DMSVC_VARIANT=$(MSVC_VARIANT) \ /DWIRESHARK_LIBS=$(WIRESHARK_LIBS) \ + /DBUILD_DIR=..\..\$(INSTALL_DIR) \ !IFDEF MSVCR_DLL /DMSVCR_DLL="$(MSVCR_DLL)" \ !ENDIF diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index ae4f78157a..fc26be9f9f 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -403,11 +403,11 @@ File "..\..\epan\wslua\dtd_gen.lua" !ifdef SMI_DIR File "${SMI_DIR}\lib\smi.dll" !endif -File "..\..\README" -File "..\..\README.win32" +File "${BUILD_DIR}\COPYING.txt" +File "${BUILD_DIR}\NEWS.txt" +File "${BUILD_DIR}\README.txt" +File "${BUILD_DIR}\README.windows.txt" File "..\..\doc\AUTHORS-SHORT" -File "..\..\COPYING" -File "NEWS.txt" File "..\..\manuf" File "..\..\services" File "..\..\doc\ws.css" @@ -652,13 +652,13 @@ File "..\..\wimaxasncp\dictionary.dtd" SetOutPath $INSTDIR SetOutPath $INSTDIR\help -File "..\..\help\toc" -File "..\..\help\overview.txt" -File "..\..\help\getting_started.txt" -File "..\..\help\capturing.txt" -File "..\..\help\capture_filters.txt" -File "..\..\help\display_filters.txt" -File "..\..\help\faq.txt" +File "${BUILD_DIR}\help\toc" +File "${BUILD_DIR}\help\overview.txt" +File "${BUILD_DIR}\help\getting_started.txt" +File "${BUILD_DIR}\help\capturing.txt" +File "${BUILD_DIR}\help\capture_filters.txt" +File "${BUILD_DIR}\help\display_filters.txt" +File "${BUILD_DIR}\help\faq.txt" ; Write the uninstall keys for Windows WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "DisplayVersion" "${VERSION}" @@ -1079,7 +1079,7 @@ Delete "$INSTDIR\*.exe" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.html" Delete "$INSTDIR\ws.css" -Delete "$INSTDIR\COPYING" +Delete "$INSTDIR\COPYING*" Delete "$INSTDIR\AUTHORS-SHORT" ; previous versions installed these files Delete "$INSTDIR\*.manifest" diff --git a/tools/textify.sh b/tools/textify.sh new file mode 100755 index 0000000000..b9a7e7ecd0 --- /dev/null +++ b/tools/textify.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# +# $Id$ +# +# Text file conversion script for packaging on Windows +# +# This script copies a text file from a source to a destination, +# converting line endings and adding a ".txt" filename extension +# if needed. If the destination is a directory the source file +# name is used. Newer files will not be overwritten. +# +# The destination file should be double-clickable and usable +# when Notepad is the default editor. + +SRC="$1" +DST="$2" + +err_exit () { + for str in "$@" ; do + echo "ERROR: $str" + done + echo "Usage:" + echo " $0 <source file> <destination file>" + echo "" + exit 1 +} + +if [ -z "$SRC" -o -z "$DST" ] ; then + err_exit +fi + +if [ ! -r "$SRC" ] ; then + err_exit "Can't read $SRC" +fi + +if [ -f "$DST" -a "$DST" -nt "SRC" ]; then + exit 0 +fi + +if [ -d "$DST" ] ; then + DSTBASE=`basename "$SRC" txt` + DST="$DST/$DSTBASE.txt" +else + DSTDIR=`dirname "$DST"` + DSTBASE=`basename "$DST" txt` + DST="$DSTDIR/$DSTBASE.txt" +fi + +cp "$SRC" "$DST" +u2d "$DST"
\ No newline at end of file diff --git a/tools/unix2dos.pl b/tools/unix2dos.pl deleted file mode 100755 index 9af4ffb6df..0000000000 --- a/tools/unix2dos.pl +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/perl -w -# -# unix2dos.pl - convert UNIX line endings (\n) in DOS line endings (\r\n) -# -# $Id$ -# -# Copyright (c) 2004, Olivier Biot -# -# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -use strict; -use warnings; - -while (<STDIN>) { - if($_ !~ /\r\n/) { - $_ =~ s/\n/\r\n/; - } - print $_; -} -1; |