Rename README.win32 to README.windows and add a 64-bit download link.

Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440

2 files changed, 38 insertions, 41 deletions

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"