From c5b43b6cda4e1093eafb506e57a8b08d6ac5fcd0 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Wed, 29 Aug 2007 00:15:15 +0000 Subject: [PATCH] various updates to match current MSVC compiler problems, fix some typos, ... svn path=/trunk/; revision=22721 --- docbook/wsdg_src/WSDG_chapter_quick_setup.xml | 32 ++-- docbook/wsdg_src/WSDG_chapter_tools.xml | 158 ++++++++++++------ 2 files changed, 129 insertions(+), 61 deletions(-) diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml index 182e0fe414..de53b13ca8 100644 --- a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml +++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml @@ -50,9 +50,8 @@ Other Microsoft C compiler variants possible! - It's possible to compile compile Wireshark with a - wide range of Microsoft C compiler variants, for details - see + It's possible to compile Wireshark with a wide range + of Microsoft C compiler variants, for details see ! @@ -196,9 +195,9 @@ if the download fails you may be behind a - restrictive firewall, see - XXX add link - - Obtaining Sources Section for alternative download - methods + restrictive firewall, see + for alternative + download methods @@ -231,7 +230,8 @@ 1Compiler dependent: This step depends on the compiler variant used, for other variants than the recommended Visual C++ 2005 Express Edition see the table - above! + at + ! 2International Windows might use different values here, e.g. a german version uses @@ -265,7 +265,8 @@ 1Compiler dependent: This step depends on the compiler variant used, for other variants than the recommended Visual C++ 2005 Express Edition see the table - above! + at + ! 2International Windows might use different values here, e.g. a german version uses @@ -427,7 +428,14 @@ Downloadthe C-Runtime redistributable for Visual C++ 2005 Express Edition (vcredist_x86.exe) and copy it into C:\wireshark-win32-libs - 1 + 1 + + Beware of Visual Studio Service Packs! + If you have installed the Visual Studio Service + Pack 1, you need a different vcredist_x86.exe version! + See + for details! + If you've closed cmd.exe in the meantime, prepare @@ -440,13 +448,15 @@ run C:\wireshark\packaging\nsis\wireshark-setup-<version>.exe - and test it + and test it - it's a good idea to test also on a + different than the developer machine. 1Compiler dependent: This step depends on the compiler variant used, for other variants than the recommended Visual C++ 2005 Express Edition see the table - above! + at + ! diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml index f141cdf1bb..ab043662ae 100644 --- a/docbook/wsdg_src/WSDG_chapter_tools.xml +++ b/docbook/wsdg_src/WSDG_chapter_tools.xml @@ -25,10 +25,9 @@ Warning! - Unless you know exactly what you are doing, you - should strictly follow the recommendations given in - ! - + Unless you know exactly what you are doing, you + should strictly follow the recommendations given in + ! The following sections give a very brief description of what a particular tool is doing, how it is used in the @@ -143,7 +142,7 @@ should result in something like: - @@ -168,7 +167,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.]]> should result in something like: - should result in something like: - - Visual Studio Code Name "Orcas" + Visual Studio 2008 + (Code Name "Orcas") Yes - Technology Preview + Beta 6 @@ -437,7 +437,35 @@ PARTICULAR PURPOSE.]]> 9.0\VC\bin\vcvars32.bat - preview only + beta only + + + + + Visual Studio 2008 Express Edition + (Code Name "Orcas") + + + Yes + + + Beta + 6 + + + No + 2 + + + - + (not yet implemented!) + + + Microsoft Visual Studio + 9.0\VC\bin\vcvars32.bat + + + beta only @@ -596,8 +624,8 @@ PARTICULAR PURPOSE.]]> compiler to work - or is this only needed to compile / run .NET programs?!? - 6"community technology preview" - (CTP), not suitable for production use! + 6beta version, not suitable for + production use! Note! The "Visual C++ Toolkit 2003" should NOT be used to @@ -634,7 +662,7 @@ PARTICULAR PURPOSE.]]> with the Windows operating system. This is also a wrongful interpretation, and the  - GPL FAQ explicitly addresses this issue. + GPL FAQexplicitly addresses this issue. Similar applies to Visual Studio 2005 and alike. @@ -753,18 +781,25 @@ PARTICULAR PURPOSE.]]> - Visual Studio Code Name "Orcas" + Visual Studio 2008 + (Code Name "Orcas") - + 9.0 - + 1500 - + msvcr90.dll + + + Visual Studio 2008 Express Edition + (Code Name "Orcas") + + @@ -776,7 +811,7 @@ PARTICULAR PURPOSE.]]> should result in something like: - @@ -786,7 +821,7 @@ usage: cl [ option... ] filename... [ /link linkoption... ]]> nmake.exe (Make) nmake is part of the toolchain packages described above. - Instead of using the the workspace (.dsw) and projects + Instead of using the workspace (.dsw) and projects (.dsp) files, the traditional nmake makefiles are used. This has one main reason: it makes it much easier to maintain changes simultaneous with the GCC toolchain makefile.am files @@ -802,17 +837,15 @@ usage: cl [ option... ] filename... [ /link linkoption... ]]> should result in something like: - However, the version string may vary. - - Documenation on nmake ca be found at - Microsoft MSDN - + Documentation on nmake can be found at + + Microsoft MSDN
link.exe (Linker) @@ -902,12 +935,13 @@ Stop.]]> - "Redistributable Merge Modules" (XXX - anyone - with further information about this?) + "Redistributable Merge Modules" (kind of loadable + modules for building msi installers - not suitable for + Wireshark's NSIS based installer) - copy the folder Microsoft.VC80.CRT (or only it's - content) to the target directory (e.g. "C:\program + copy the folder content of Microsoft.VC80.CRT to + the target directory (e.g. "C:\program files\Wireshark") @@ -919,12 +953,34 @@ Stop.]]> content of Microsoft.VC80.CRT (method 2 - this is the smallest package). As MSVC2005EE and DOTNET20 doesn't provide the folder "Microsoft.VC80.CRT" they use method 3. - You'll have to - download vcredist_x86.exefrom - Microsoft. + You'll have to download a vcredist_x86.exe from Microsoft + that matches your compiler version. The best way to + determine this version is to open one of the generated + manifest files (e.g. wireshark.exe.manifest) and look for + the version of the Microsoft.VC80.CRT entry. + + + + + 8.0.50608.0, from: "Microsoft + Visual C++ 2005" (and probably the Express Edition as + well): + + + + + 8.0.50727.762, from: "Microsoft + Visual C++ 2005 Express Edition - ENU Service Pack 1 + (KB926748)": + + + + + Please report to the developer mailing list, if you + find a different version number!
- msvcr90.dll - Version 9.0 + msvcr90.dll - Version 9.0 (2008) As the corresponding C compiler is preliminary, it's too early to say!
@@ -1050,7 +1106,7 @@ Stop.]]> should result in something like: - However, the version string may vary. @@ -1102,7 +1158,7 @@ Copyright (C) 2005 Free Software Foundation, Inc.]]> should result in something like: - + However, the version string may vary. @@ -1129,7 +1185,7 @@ Copyright (C) 2005 Free Software Foundation, Inc.]]> should result in something like: - should result in something like: - should result in something like: - should result in something like: - should result in something like: - + However, the version string may vary.
@@ -1299,7 +1355,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.]]> should result in something like: - should result in something like: - @@ -1344,11 +1400,12 @@ Copyright (C) 2000-2006 CollabNet.
UNIX or Win32 Cygwin: rapidSVN, subcommander - RapidSVN is a cross platform subversion frontend based on wxWidgets. - It can be found at: . - Subcommander is another cross platform subversion frontend. It can - be found at: . - + RapidSVN is a cross platform subversion frontend based + on wxWidgets. It can be found at: + . Subcommander is + another cross platform subversion frontend. It can be found + at: + . Cygwin don't provide any GUI client for subversion.
@@ -1390,7 +1447,7 @@ Copyright (C) 2000-2006 CollabNet. should result in something like: - should result in something like: - behind proxy.com which is listening on port 8080, you have to set it to something like: - set HTTP_PROXY=http://proxy.com:8080/ + set + HTTP_PROXY=http://proxy.com:8080/ If you are unsure about the settings, you might ask your system administrator.