Our new favored MS build environment is vc7/visual studio .net; vc6 is just too broken.

svn:r2897

diff --git a/Win32Build/vc7/Tor/Tor.sln b/Win32Build/vc7/Tor/Tor.sln
new file mode 100755 (executable)
index 0000000..47f1c9b
--- /dev/null
+++ b/Win32Build/vc7/Tor/Tor.sln
@@ -0,0 +1,29 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tor", "Tor.vcproj", "{63A6B170-E742-400C-B3A0-9CCED3699043}"
+       ProjectSection(ProjectDependencies) = postProject
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tor_resolve", "..\tor_resolve\tor_resolve.vcproj", "{E2D2762A-26BD-4A28-BD72-DDAB181324B4}"
+       ProjectSection(ProjectDependencies) = postProject
+       EndProjectSection
+EndProject
+Global
+       GlobalSection(SolutionConfiguration) = preSolution
+               Debug = Debug
+               Release = Release
+       EndGlobalSection
+       GlobalSection(ProjectConfiguration) = postSolution
+               {63A6B170-E742-400C-B3A0-9CCED3699043}.Debug.ActiveCfg = Debug|Win32
+               {63A6B170-E742-400C-B3A0-9CCED3699043}.Debug.Build.0 = Debug|Win32
+               {63A6B170-E742-400C-B3A0-9CCED3699043}.Release.ActiveCfg = Release|Win32
+               {63A6B170-E742-400C-B3A0-9CCED3699043}.Release.Build.0 = Release|Win32
+               {E2D2762A-26BD-4A28-BD72-DDAB181324B4}.Debug.ActiveCfg = Debug|Win32
+               {E2D2762A-26BD-4A28-BD72-DDAB181324B4}.Debug.Build.0 = Debug|Win32
+               {E2D2762A-26BD-4A28-BD72-DDAB181324B4}.Release.ActiveCfg = Release|Win32
+               {E2D2762A-26BD-4A28-BD72-DDAB181324B4}.Release.Build.0 = Release|Win32
+       EndGlobalSection
+       GlobalSection(ExtensibilityGlobals) = postSolution
+       EndGlobalSection
+       GlobalSection(ExtensibilityAddIns) = postSolution
+       EndGlobalSection
+EndGlobal

diff --git a/Win32Build/vc7/Tor/Tor.vcproj b/Win32Build/vc7/Tor/Tor.vcproj
new file mode 100755 (executable)
index 0000000..534c6c2
--- /dev/null
+++ b/Win32Build/vc7/Tor/Tor.vcproj
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="7.10"
+       Name="Tor"
+       ProjectGUID="{63A6B170-E742-400C-B3A0-9CCED3699043}"
+       Keyword="Win32Proj">
+       <Platforms>
+               <Platform
+                       Name="Win32"/>
+       </Platforms>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="Debug"
+                       IntermediateDirectory="Debug"
+                       ConfigurationType="1"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="c:\OpenSSL\include\;..\..\..\src\win32"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                               IgnoreStandardIncludePath="FALSE"
+                               MinimalRebuild="TRUE"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="FALSE"
+                               DebugInformationFormat="4"
+                               CompileAs="1"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="wsock32.lib c:\openssl\lib\vc\ssleay32.lib c:\openssl\lib\vc\libeay32.lib"
+                               OutputFile="$(OutDir)/Tor.exe"
+                               LinkIncremental="2"
+                               GenerateDebugInformation="TRUE"
+                               ProgramDatabaseFile="$(OutDir)/Tor.pdb"
+                               SubSystem="1"
+                               TargetMachine="1"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="Release"
+                       IntermediateDirectory="Release"
+                       ConfigurationType="1"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="c:\openssl\include;..\..\..\src\win32"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                               IgnoreStandardIncludePath="FALSE"
+                               RuntimeLibrary="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="1"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="wsock32.lib c:\openssl\lib\vc\ssleay32.lib c:\openssl\lib\vc\libeay32.lib"
+                               OutputFile="$(OutDir)/Tor.exe"
+                               LinkIncremental="1"
+                               GenerateDebugInformation="TRUE"
+                               SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="1"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+                       <File
+                               RelativePath="..\..\..\src\common\aes.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\buffers.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\circuitbuild.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\circuitlist.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\circuituse.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\command.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\compat.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\config.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\connection.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\connection_edge.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\connection_or.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\container.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\control.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\cpuworker.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\crypto.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\directory.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\dirserv.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\dns.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\fakepoll.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\hibernate.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\log.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\main.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\onion.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\or.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\win32\orconfig.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\relay.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\rendclient.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\rendcommon.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\rendmid.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\rendservice.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\rephist.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\router.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\routerlist.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\routerparse.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\tor_main.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\torgzip.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\torint.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\tortls.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\util.c">
+                       </File>
+                       <Filter
+                               Name="zlib"
+                               Filter="">
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\adler32.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\compress.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\crc32.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\crc32.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\deflate.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\deflate.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\gzio.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\infback.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\inffast.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\inffast.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\inffixed.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\inflate.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\inflate.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\inftrees.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\inftrees.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\trees.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\trees.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\uncompr.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\zconf.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\zlib.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\zutil.c">
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\contrib\zlib\zutil.h">
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+                       <File
+                               RelativePath="..\..\..\src\common\aes.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\compat.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\container.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\crypto.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\fakepoll.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\log.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\torgzip.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\tortls.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\or\tree.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\util.h">
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+               </Filter>
+               <File
+                       RelativePath=".\ReadMe.txt">
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

diff --git a/Win32Build/vc7/tor_resolve/tor_resolve.vcproj b/Win32Build/vc7/tor_resolve/tor_resolve.vcproj
new file mode 100755 (executable)
index 0000000..5e4cad3
--- /dev/null
+++ b/Win32Build/vc7/tor_resolve/tor_resolve.vcproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="7.10"
+       Name="tor_resolve"
+       ProjectGUID="{E2D2762A-26BD-4A28-BD72-DDAB181324B4}"
+       Keyword="Win32Proj">
+       <Platforms>
+               <Platform
+                       Name="Win32"/>
+       </Platforms>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="Debug"
+                       IntermediateDirectory="Debug"
+                       ConfigurationType="1"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\src\win32"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                               MinimalRebuild="TRUE"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="FALSE"
+                               DebugInformationFormat="4"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="wsock32.lib"
+                               OutputFile="$(OutDir)/tor_resolve.exe"
+                               LinkIncremental="2"
+                               GenerateDebugInformation="TRUE"
+                               ProgramDatabaseFile="$(OutDir)/tor_resolve.pdb"
+                               SubSystem="1"
+                               TargetMachine="1"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="Release"
+                       IntermediateDirectory="Release"
+                       ConfigurationType="1"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="..\..\..\src\win32"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                               RuntimeLibrary="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="FALSE"
+                               DebugInformationFormat="3"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="wsock32.lib"
+                               OutputFile="$(OutDir)/tor_resolve.exe"
+                               LinkIncremental="1"
+                               GenerateDebugInformation="TRUE"
+                               SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="1"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+                       <File
+                               RelativePath="..\..\..\src\common\compat.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\compat.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\container.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\container.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\log.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\log.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\win32\orconfig.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\tools\tor-resolve.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\torint.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\util.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\common\util.h">
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+               </Filter>
+               <File
+                       RelativePath=".\ReadMe.txt">
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

diff --git a/contrib/package_nsis.sh b/contrib/package_nsis.sh
index 19829c592a3743e3ecdb9503cc3e197daafae34a..770913f472d2c7f8b6254625e34c326dfa4be34b 100644 (file)
--- a/contrib/package_nsis.sh
+++ b/contrib/package_nsis.sh
@@ -15,8 +15,8 @@ mkdir win_tmp/src
 mkdir win_tmp/src/config
 mkdir win_tmp/tmp
 
-cp Win32Build/vc6/tor/Debug/tor.exe win_tmp/bin
-cp Win32Build/vc6/tor_resolve/Debug/tor_resolve.exe win_tmp/bin
+cp Win32Build/vc7/Tor/Debug/Tor.exe win_tmp/bin/tor.exe
+cp Win32Build/vc7/tor_resolve/Debug/tor_resolve.exe win_tmp/bin
 cp c:/windows/system32/libeay32.dll win_tmp/bin
 cp c:/windows/system32/ssleay32.dll win_tmp/bin