forked from osmocom/wireshark
First support for Unix-to-DOS line termination translation by means of a small
perl script (unix2dos.pl). The NEWS file is now properly displayed on the Notepad.exe text editor on a Windows box. svn path=/trunk/; revision=12318
This commit is contained in:
parent
a3340a4c2e
commit
4878b7488b
|
@ -9,6 +9,8 @@
|
||||||
|
|
||||||
include ../../config.nmake
|
include ../../config.nmake
|
||||||
|
|
||||||
|
UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
|
||||||
|
|
||||||
!IFDEF GTK1_ONLY
|
!IFDEF GTK1_ONLY
|
||||||
# define installer name and undefine GTK2_DIR to get a separate
|
# define installer name and undefine GTK2_DIR to get a separate
|
||||||
# installer for ethereal GTK1 version
|
# installer for ethereal GTK1 version
|
||||||
|
@ -50,9 +52,9 @@ DOC=../../doc/ethereal.html \
|
||||||
../../doc/mergecap.html \
|
../../doc/mergecap.html \
|
||||||
../../doc/capinfo.html \
|
../../doc/capinfo.html \
|
||||||
../../FAQ \
|
../../FAQ \
|
||||||
../../NEWS \
|
|
||||||
../../README \
|
../../README \
|
||||||
../../README.win32
|
../../README.win32
|
||||||
|
DOC_dos=NEWS.txt
|
||||||
GPL=../../COPYING
|
GPL=../../COPYING
|
||||||
HELP=../../help/toc \
|
HELP=../../help/toc \
|
||||||
../../help/overview.txt \
|
../../help/overview.txt \
|
||||||
|
@ -81,9 +83,12 @@ PLUGINS=../../plugins/acn/acn.dll \
|
||||||
../../plugins/rudp/rudp.dll \
|
../../plugins/rudp/rudp.dll \
|
||||||
../../plugins/v5ua/v5ua.dll
|
../../plugins/v5ua/v5ua.dll
|
||||||
|
|
||||||
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(HELP) $(PLUGINS)
|
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS)
|
||||||
|
|
||||||
|
all: NEWS.txt $(DEST)-setup-$(VERSION).exe
|
||||||
|
|
||||||
|
NEWS.txt: ../../NEWS
|
||||||
|
$(UNIX2DOS) < ../../NEWS > NEWS.txt
|
||||||
|
|
||||||
$(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake
|
$(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake
|
||||||
$(MAKENSIS) \
|
$(MAKENSIS) \
|
||||||
|
@ -126,6 +131,7 @@ clean:
|
||||||
rm -f ethereal-setup-$(VERSION).exe
|
rm -f ethereal-setup-$(VERSION).exe
|
||||||
rm -f ethereal-gtk1-setup-$(VERSION).exe
|
rm -f ethereal-gtk1-setup-$(VERSION).exe
|
||||||
rm -f ethereal-gtk2-setup-$(VERSION).exe
|
rm -f ethereal-gtk2-setup-$(VERSION).exe
|
||||||
|
rm -f NEWS.txt
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
|
|
||||||
|
|
|
@ -263,7 +263,7 @@ File "..\..\README"
|
||||||
File "..\..\README.win32"
|
File "..\..\README.win32"
|
||||||
File "..\..\AUTHORS-SHORT"
|
File "..\..\AUTHORS-SHORT"
|
||||||
File "..\..\COPYING"
|
File "..\..\COPYING"
|
||||||
File /oname=NEWS.txt "..\..\NEWS"
|
File "NEWS.txt"
|
||||||
File "..\..\manuf"
|
File "..\..\manuf"
|
||||||
File "..\..\doc\ethereal.html"
|
File "..\..\doc\ethereal.html"
|
||||||
File "..\..\doc\ethereal-filter.html"
|
File "..\..\doc\ethereal-filter.html"
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
#!/usr/bin/perl -w
|
||||||
|
#
|
||||||
|
# unix2dos.pl - convert UNIX line endings (\n) in DOS line endings (\r\n)
|
||||||
|
#
|
||||||
|
# $Id$
|
||||||
|
#
|
||||||
|
# Copyright (c) 2004, Olivier Biot
|
||||||
|
#
|
||||||
|
# Ethereal - Network traffic analyzer
|
||||||
|
# By Gerald Combs <gerald@ethereal.com>
|
||||||
|
# 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;
|
||||||
|
|
||||||
|
while (<STDIN>) {
|
||||||
|
$_ =~ s/\n/\r\n/;
|
||||||
|
print $_;
|
||||||
|
}
|
||||||
|
1;
|
Loading…
Reference in New Issue