diff options
Diffstat (limited to 'PCbuild')
49 files changed, 11860 insertions, 8242 deletions
diff --git a/PCbuild/Uninstal.wse b/PCbuild/Uninstal.wse deleted file mode 100644 index 216dd30..0000000 --- a/PCbuild/Uninstal.wse +++ /dev/null @@ -1,514 +0,0 @@ -Document Type: WSE -item: Global - Version=8.14 - Flags=00000100 - Split=1420 - Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - Copy Default=1 - Japanese Font Name=MS Gothic - Japanese Font Size=10 - Start Gradient=0 0 255 - End Gradient=0 0 0 - Windows Flags=00000000000000000000101000001000 - Message Font=MS Sans Serif - Font Size=8 - Disk Label=GLBS - Disk Filename=INSTALL - Patch Flags=0000000000000001 - Patch Threshold=200 - Patch Memory=4096 - Per-User Version ID=1 - Crystal Format=10111100101100000010001001001001 - Step View=&Properties -end -item: Remark - Text=Note from Tim: This is a verbatim copy of Wise's Uninstal.wse, altered at the end to write -end -item: Remark - Text=uninstall info under HKCU instead of HKLM if our DOADMIN var is false. -end -item: Remark -end -item: Remark - Text= Install Support for uninstalling the application. -end -item: Remark -end -item: Set Variable - Variable=UNINSTALL_PATH - Value=%_LOGFILE_PATH_% - Flags=00000010 -end -item: Set Variable - Variable=UNINSTALL_PATH - Value=%UNINSTALL_PATH%\UNWISE.EXE -end -item: Compiler Variable If - Variable=_EXE_OS_TYPE_ - Value=WIN32 -end -item: Install File - Source=%_WISE_%\UNWISE32.EXE - Destination=%UNINSTALL_PATH% - Flags=0000000000000010 -end -item: Compiler Variable Else -end -item: Install File - Source=%_WISE_%\UNWISE.EXE - Destination=%UNINSTALL_PATH% - Flags=0000000000000010 -end -item: Compiler Variable End -end -item: Remark -end -item: Remark - Text= Install Support for multiple languages -end -item: Remark -end -item: Set Variable - Variable=UNINSTALL_LANG - Value=%UNINSTALL_PATH% - Flags=00000010 -end -item: Set Variable - Variable=UNINSTALL_LANG - Value=%UNINSTALL_LANG%\UNWISE.INI -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=C - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.FRA - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_C_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.FRA - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=D - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.FRA - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_D_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.FRA - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=E - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.DEU - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_E_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.DEU - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=F - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.PTG - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_F_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.PTG - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=G - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ESP - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_G_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ESP - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=H - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ESP - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_H_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ESP - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=I - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ITA - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_I_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ITA - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=J - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.DAN - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_J_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.DAN - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=K - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.FIN - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_K_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.FIN - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=L - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ISL - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_L_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ISL - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=M - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.NLD - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_M_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.NLD - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=N - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.NOR - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_N_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.NOR - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=O - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.SVE - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_O_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.SVE - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=P - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.JPN - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_P_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.JPN - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Remark -end -item: Remark - Text= Install the add/remove or uninstall icon -end -item: Remark -end -item: Set Variable - Variable=UNINSTALL_PATH - Value=%UNINSTALL_PATH% - Flags=00010100 -end -item: Set Variable - Variable=INST_LOG_PATH - Value=%_LOGFILE_PATH_% - Flags=00010100 -end -item: Check Configuration - Flags=10111011 -end -item: If/While Statement - Variable=DOADMIN - Value=1 -end -item: Remark - Text=Write uninstall info under HKLM. This if/else/end block added by Tim. -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%APPTITLE% - Value Name=DisplayName - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%UNINSTALL_PATH% %INST_LOG_PATH% - New Value= - Value Name=UninstallString - Root=2 -end -item: Else Statement -end -item: Remark - Text=The same, but write under HKCU instead. -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%APPTITLE% - Value Name=DisplayName - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%UNINSTALL_PATH% %INST_LOG_PATH% - New Value= - Value Name=UninstallString - Root=1 -end -item: End Block -end -item: Else Statement -end -item: Add ProgMan Icon - Group=%GROUP% - Icon Name=Uninstall %APPTITLE% - Command Line=%UNINSTALL_PATH% %INST_LOG_PATH% -end -item: End Block -end -item: Check Configuration - Flags=11110010 -end -item: If/While Statement - Variable=DOBRAND - Value=1 -end -item: Edit Registry - Total Keys=2 - item: Key - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%COMPANY% - Value Name=RegCompany - Root=2 - end - item: Key - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%NAME% - Value Name=RegOwner - Root=2 - end -end -item: End Block -end -item: End Block -end diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj index 85da3b3..205a178 100644 --- a/PCbuild/_bsddb.vcproj +++ b/PCbuild/_bsddb.vcproj @@ -1,257 +1,552 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_bsddb" - SccProjectName="_bsddb" - SccLocalPath=".."> + ProjectGUID="{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" + RootNamespace="_bsddb" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_bsddb" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include;..\PC;"..\..\db-4.4.20\build_win32"" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build Debug /project db_static
" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\db-4.4.20\build_win32\Debug\libdb44sd.lib" - OutputFile="./_bsddb_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_bsddb_d.pdb" - SubSystem="2" + AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_bsddb_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build "Debug AMD64" /project db_static /useenv
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib" + BaseAddress="0x1e180000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_bsddb" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include;..\PC;"..\..\db-4.4.20\build_win32"" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib" - OutputFile="./_bsddb.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_bsddb.pdb" - SubSystem="2" + AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_bsddb.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib" + BaseAddress="0x1e180000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_bsddb" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include;..\PC;"..\..\db-4.4.20\build_win32"" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_IA64\libdb44s.lib" - OutputFile="./_bsddb.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_bsddb.pdb" - SubSystem="2" + AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_bsddb.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib" + BaseAddress="0x1e180000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_bsddb" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include;..\PC;"..\..\db-4.4.20\build_win32"" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib bufferoverflowU.lib" - OutputFile="./_bsddb.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_bsddb.pdb" - SubSystem="2" + AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_bsddb.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bsddbDir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib" + BaseAddress="0x1e180000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_bsddb.c"> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\bsddb.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_bsddb.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_ctypes.vcproj b/PCbuild/_ctypes.vcproj index 748ee44..f923ca0 100644 --- a/PCbuild/_ctypes.vcproj +++ b/PCbuild/_ctypes.vcproj @@ -1,310 +1,703 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_ctypes" - ProjectGUID="{F22F40F4-D318-40DC-96B3-88DC81CE0894}" + ProjectGUID="{0E9791DB-593A-465F-98BC-681011311618}" RootNamespace="_ctypes" - Keyword="Win32Proj"> + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_ctypes" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - MinimalRebuild="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_ctypes_d.pdb" - SubSystem="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D1A0000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_ctypes" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="FALSE" - ProgramDatabaseFile=".\./_ctypes.pdb" SubSystem="0" - OptimizeReferences="0" - EnableCOMDATFolding="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes.lib" - TargetMachine="1"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_ctypes" + Name="PGInstrument|Win32" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="FALSE" - ProgramDatabaseFile=".\./_ctypes.pdb" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" SubSystem="0" - OptimizeReferences="0" - EnableCOMDATFolding="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes.lib" - TargetMachine="0"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="." - IntermediateDirectory="ia64-temp-release\_ctypes" + Name="PGUpdate|Win32" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="FALSE" - ProgramDatabaseFile=".\./_ctypes.pdb" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" SubSystem="0" - OptimizeReferences="0" - EnableCOMDATFolding="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_ctypes\_ctypes.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\callbacks.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\callproc.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\cfield.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\malloc_closure.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\stgdict.c"> - </File> - <File - RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c"> - <FileConfiguration - Name="ReleaseAMD64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - </File> - <File - RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm"> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseAMD64|Win32"> - <Tool - Name="VCCustomBuildTool" - CommandLine="amd64_ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)" -" - Outputs=""$(IntDir)\win64.obj""/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\_ctypes\ctypes.h" + > + </File> + <File + RelativePath="..\Modules\_ctypes\ctypes_dlfcn.h" + > + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.h" + > + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\ffi_common.h" + > + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\fficonfig.h" + > + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\ffitarget.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_ctypes\_ctypes.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\callbacks.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\callproc.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\cfield.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\malloc_closure.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\stgdict.c" + > + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c" + > + <FileConfiguration + Name="Debug|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="PGInstrument|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="PGUpdate|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" + Outputs="$(IntDir)\win64.obj" + /> + </FileConfiguration> + <FileConfiguration + Name="PGInstrument|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="PGInstrument|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" + Outputs="$(IntDir)\win64.obj" + /> + </FileConfiguration> + <FileConfiguration + Name="PGUpdate|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="PGUpdate|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" + Outputs="$(IntDir)\win64.obj" + /> + </FileConfiguration> + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_ctypes_test.vcproj b/PCbuild/_ctypes_test.vcproj index a4bb7f1..156c10c 100644 --- a/PCbuild/_ctypes_test.vcproj +++ b/PCbuild/_ctypes_test.vcproj @@ -1,241 +1,520 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_ctypes_test" - ProjectGUID="{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}" - Keyword="Win32Proj"> + ProjectGUID="{9EC7190A-249F-4180-A900-548FDCF3055F}" + RootNamespace="_ctypes_test" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_ctypes_test" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - MinimalRebuild="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./_ctypes_test_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_ctypes_test_d.pdb" - SubSystem="0" - ImportLibrary=".\./_ctypes_test_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_ctypes_test" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="0" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./_ctypes_test.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="FALSE" - ProgramDatabaseFile=".\./_ctypes_test.pdb" - SubSystem="0" - OptimizeReferences="0" - EnableCOMDATFolding="0" - ImportLibrary=".\./_ctypes_test.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="." - IntermediateDirectory="ia64-temp-release\_ctypes_test" + Name="PGInstrument|Win32" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - MinimalRebuild="FALSE" - BasicRuntimeChecks="0" - RuntimeLibrary="3" - BufferSecurityCheck="FALSE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - OutputFile="./_ctypes_test_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_ctypes_test_d.pdb" - SubSystem="0" - ImportLibrary=".\./_ctypes_test_d.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_ctypes_test" + Name="PGUpdate|Win32" ConfigurationType="2" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - OutputFile="./_ctypes_test.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="FALSE" - ProgramDatabaseFile=".\./_ctypes_test.pdb" - SubSystem="0" - OptimizeReferences="0" - EnableCOMDATFolding="0" - ImportLibrary=".\./_ctypes_test.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_ctypes\_ctypes_test.c"> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\_ctypes\_ctypes_test.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_ctypes\_ctypes_test.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_elementtree.vcproj b/PCbuild/_elementtree.vcproj index 587a35c..c22c252 100644 --- a/PCbuild/_elementtree.vcproj +++ b/PCbuild/_elementtree.vcproj @@ -1,263 +1,620 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_elementtree" - ProjectGUID="{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}" - SccProjectName="_elementtree" - SccLocalPath=".."> + ProjectGUID="{17E1E049-C309-4D79-843F-AE483C264AEA}" + RootNamespace="_elementtree" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_elementtree" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_elementtree_d.pdb" - SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + BaseAddress="0x1D100000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_elementtree" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_elementtree.pdb" - SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree.lib" - TargetMachine="1"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + BaseAddress="0x1D100000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_elementtree" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_elementtree.pdb" - SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree.lib" - TargetMachine="0"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + BaseAddress="0x1D100000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_elementtree" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_elementtree.pdb" - SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree.lib" - TargetMachine="0"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + BaseAddress="0x1D100000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_elementtree.c"> - </File> - <File - RelativePath="..\Modules\expat\xmlparse.c"> - </File> - <File - RelativePath="..\Modules\expat\xmlrole.c"> - </File> - <File - RelativePath="..\Modules\expat\xmltok.c"> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\expat\ascii.h" + > + </File> + <File + RelativePath="..\Modules\expat\asciitab.h" + > + </File> + <File + RelativePath="..\Modules\expat\expat.h" + > + </File> + <File + RelativePath="..\Modules\expat\expat_config.h" + > + </File> + <File + RelativePath="..\Modules\expat\expat_external.h" + > + </File> + <File + RelativePath="..\Modules\expat\iasciitab.h" + > + </File> + <File + RelativePath="..\Modules\expat\internal.h" + > + </File> + <File + RelativePath="..\Modules\expat\latin1tab.h" + > + </File> + <File + RelativePath="..\Modules\expat\macconfig.h" + > + </File> + <File + RelativePath="..\Modules\expat\nametab.h" + > + </File> + <File + RelativePath="..\Modules\expat\pyexpatns.h" + > + </File> + <File + RelativePath="..\Modules\expat\utf8tab.h" + > + </File> + <File + RelativePath="..\Modules\expat\winconfig.h" + > + </File> + <File + RelativePath="..\Modules\expat\xmlrole.h" + > + </File> + <File + RelativePath="..\Modules\expat\xmltok.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_elementtree.c" + > + </File> + <File + RelativePath="..\Modules\expat\xmlparse.c" + > + </File> + <File + RelativePath="..\Modules\expat\xmlrole.c" + > + </File> + <File + RelativePath="..\Modules\expat\xmltok.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_msi.vcproj b/PCbuild/_msi.vcproj index be2a92c..2d92599 100644 --- a/PCbuild/_msi.vcproj +++ b/PCbuild/_msi.vcproj @@ -1,251 +1,528 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_msi" - ProjectGUID="{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}" - SccProjectName="_msi" - SccLocalPath="..\pc"> + ProjectGUID="{31FFC478-7B4A-43E8-9954-8D03E2187E9C}" + RootNamespace="_msi" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_msi" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" - OutputFile="./_msi_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_msi_d.pdb" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_msi" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" - OutputFile="./_msi.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./_msi.pdb" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCCLCompilerTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCResourceCompilerTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCPreLinkEventTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\_msi" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib" - OutputFile="./_msi.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./_msi.pdb" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCCLCompilerTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCResourceCompilerTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCPreLinkEventTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" + TargetMachine="17" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_msi" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib" - OutputFile="./_msi.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./_msi.pdb" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi.lib" - TargetMachine="0"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\PC\_msi.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\PC\_msi.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_socket.vcproj b/PCbuild/_socket.vcproj index 26f77ef..6ef5407 100644 --- a/PCbuild/_socket.vcproj +++ b/PCbuild/_socket.vcproj @@ -1,253 +1,536 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_socket" - SccProjectName="_socket" - SccLocalPath=".."> + ProjectGUID="{86937F53-C189-40EF-8CE8-8759D8E7D480}" + RootNamespace="_socket" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_socket" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" - OutputFile="./_socket_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_socket_d.pdb" - SubSystem="2" BaseAddress="0x1e1D0000" - ImportLibrary=".\./_socket_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_socket" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" - OutputFile="./_socket.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_socket.pdb" - SubSystem="2" BaseAddress="0x1e1D0000" - ImportLibrary=".\./_socket.lib" - TargetMachine="1"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_socket" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="ws2_32.lib" - OutputFile="./_socket.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_socket.pdb" - SubSystem="2" BaseAddress="0x1e1D0000" - ImportLibrary=".\./_socket.lib" - TargetMachine="0"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_socket" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="ws2_32.lib" - OutputFile="./_socket.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_socket.pdb" - SubSystem="2" BaseAddress="0x1e1D0000" - ImportLibrary=".\./_socket.lib" - TargetMachine="0"/> + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\socketmodule.c"> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\socketmodule.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\socketmodule.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj index aea3978..646c545 100644 --- a/PCbuild/_sqlite3.vcproj +++ b/PCbuild/_sqlite3.vcproj @@ -1,282 +1,636 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_sqlite3" - ProjectGUID="{2FF0A312-22F9-4C34-B070-842916DE27A9}" - SccProjectName="_sqlite3" - SccLocalPath=".."> + ProjectGUID="{13CECB97-4119-4316-9D42-8534019A5A44}" + RootNamespace="_sqlite3" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_sqlite3" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" - OutputFile="./_sqlite3_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_sqlite3_d.pdb" - SubSystem="2" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" + BaseAddress="0x1e180000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_sqlite3" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" - OutputFile="./_sqlite3.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_sqlite3.pdb" - SubSystem="2" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" + BaseAddress="0x1e180000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_sqlite3" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\sqlite-source-3.3.4\ia64\sqlite3.lib" - OutputFile="./_sqlite3.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_sqlite3.pdb" - SubSystem="2" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" + BaseAddress="0x1e180000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_sqlite3" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\sqlite-source-3.3.4\amd64\sqlite3.lib" - OutputFile="./_sqlite3.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_sqlite3.pdb" - SubSystem="2" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build sqlite3 libs and dll" + CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" + BaseAddress="0x1e180000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_sqlite\cache.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\connection.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\cursor.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\microprotocols.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\module.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\prepare_protocol.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\row.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\statement.c"> - </File> - <File - RelativePath="..\Modules\_sqlite\util.c"> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\_sqlite\cache.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\connection.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\cursor.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\microprotocols.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\module.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\prepare_protocol.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\row.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\sqlitecompat.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\statement.h" + > + </File> + <File + RelativePath="..\Modules\_sqlite\util.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_sqlite\cache.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\connection.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\cursor.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\microprotocols.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\module.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\prepare_protocol.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\row.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\statement.c" + > + </File> + <File + RelativePath="..\Modules\_sqlite\util.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_ssl.mak b/PCbuild/_ssl.mak deleted file mode 100644 index 3420ef1..0000000 --- a/PCbuild/_ssl.mak +++ /dev/null @@ -1,38 +0,0 @@ -EXTRA_LIBS= - -!IFDEF DEBUG -SUFFIX=_d.pyd -TEMP=x86-temp-debug/ -CFLAGS=/Od /Zi /MDd /LDd /DDEBUG /D_DEBUG /DWIN32 -SSL_LIB_DIR=$(SSL_DIR)/out32.dbg -!ELSE -SUFFIX=.pyd -TEMP=x86-temp-release/ -CFLAGS=/Ox /MD /LD /DWIN32 -SSL_LIB_DIR=$(SSL_DIR)/out32 -!ENDIF - -INCLUDES=-I ../Include -I ../PC -I $(SSL_DIR)/inc32 - -SSL_LIBS=gdi32.lib wsock32.lib user32.lib advapi32.lib /LIBPATH:$(SSL_LIB_DIR) libeay32.lib ssleay32.lib -SSL_SOURCE=../Modules/_ssl.c - -HASH_LIBS=gdi32.lib user32.lib advapi32.lib /libpath:$(SSL_LIB_DIR) libeay32.lib -HASH_SOURCE=../Modules/_hashopenssl.c - -all: _ssl$(SUFFIX) _hashlib$(SUFFIX) - -# Split compile/link into two steps to better support VSExtComp -_ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32.lib ../PC/*.h ../Include/*.h - @if not exist "$(TEMP)/_ssl/." mkdir "$(TEMP)/_ssl" - cl /nologo /c $(SSL_SOURCE) $(CFLAGS) /Fo$(TEMP)\_ssl\$*.obj $(INCLUDES) - link /nologo @<< - /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS) $(EXTRA_LIBS) -<< - -_hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h - @if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib" - cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) - link /nologo @<< - /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(EXTRA_LIBS) $(TEMP)\_hashlib\$*.obj -<< diff --git a/PCbuild/_ssl.vcproj b/PCbuild/_ssl.vcproj index c1abd24..ddd396a 100644 --- a/PCbuild/_ssl.vcproj +++ b/PCbuild/_ssl.vcproj @@ -1,83 +1,548 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_ssl" + ProjectGUID="{C6E20F84-3247-4AD6-B051-B073268F73BA}" RootNamespace="_ssl" - SccProjectName="" - SccLocalPath="" - Keyword="MakeFileProj"> + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc32" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc64" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_ssl" - ConfigurationType="0" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCNMakeTool" - BuildCommandLine="build_ssl.bat $(ConfigurationName)" - ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a" - CleanCommandLine="echo Nothing to do" - Output="_ssl.pyd"/> + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc32" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_ssl" - ConfigurationType="0" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCNMakeTool" - BuildCommandLine="build_ssl.bat $(ConfigurationName)" - ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a" - CleanCommandLine="echo Nothing to do" - Output="_ssl_d.pyd"/> + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc64" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_ssl" - ConfigurationType="0" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCNMakeTool" - BuildCommandLine="build_ssl.bat $(ConfigurationName)" - ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a" - CleanCommandLine="echo Nothing to do" - Output="_ssl.pyd"/> + Name="PGInstrument|Win32" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc32" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc64" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_ssl" - ConfigurationType="0" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCNMakeTool" - BuildCommandLine="build_ssl.bat $(ConfigurationName)" - ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a" - CleanCommandLine="echo Nothing to do" - Output="_ssl.pyd"/> + Name="PGUpdate|Win32" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc32" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc64" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_ssl.c"> - </File> - <File - RelativePath="..\Modules\_hashopenssl.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_hashopenssl.c" + > + </File> + <File + RelativePath="..\Modules\_ssl.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_testcapi.vcproj b/PCbuild/_testcapi.vcproj index a91d8ce..8ef456a 100644 --- a/PCbuild/_testcapi.vcproj +++ b/PCbuild/_testcapi.vcproj @@ -1,246 +1,520 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_testcapi" - SccProjectName="_testcapi" - SccLocalPath=".."> + ProjectGUID="{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" + RootNamespace="_testcapi" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_testcapi" + Name="Debug|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./_testcapi.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./_testcapi.pdb" BaseAddress="0x1e1F0000" - ImportLibrary=".\./_testcapi.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_testcapi" + Name="Release|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./_testcapi_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_testcapi_d.pdb" BaseAddress="0x1e1F0000" - ImportLibrary=".\./_testcapi_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_testcapi" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - OutputFile="./_testcapi.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./_testcapi.pdb" BaseAddress="0x1e1F0000" - ImportLibrary=".\./_testcapi.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_testcapi" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - OutputFile="./_testcapi.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./_testcapi.pdb" BaseAddress="0x1e1F0000" - ImportLibrary=".\./_testcapi.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_testcapimodule.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_testcapimodule.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj index f14e727..e3baa5c 100644 --- a/PCbuild/_tkinter.vcproj +++ b/PCbuild/_tkinter.vcproj @@ -1,260 +1,540 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="_tkinter" - SccProjectName="_tkinter" - SccLocalPath="..\..\.."> + ProjectGUID="{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" + RootNamespace="_tkinter" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_tkinter" + Name="Debug|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(tcltkDir)\include" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib" - OutputFile="./_tkinter.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_tkinter.pdb" - SubSystem="2" - BaseAddress="0x1e190000" - ImportLibrary=".\./_tkinter.lib" - TargetMachine="1"/> + AdditionalDependencies="$(tcltkLib)" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64Lib)" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_tkinter" + Name="Release|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(tcltkDir)\include" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib" - OutputFile="./_tkinter_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_tkinter_d.pdb" - SubSystem="2" - BaseAddress="0x1e190000" - ImportLibrary=".\./_tkinter_d.lib" - TargetMachine="1"/> + AdditionalDependencies="$(tcltkLib)" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64Lib)" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_tkinter" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(tcltkDir)\include" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib" - OutputFile="./_tkinter.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_tkinter.pdb" - SubSystem="2" - BaseAddress="0x1e190000" - ImportLibrary=".\./_tkinter.lib" - TargetMachine="0"/> + AdditionalDependencies="$(tcltkLib)" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCResourceCompilerTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPreLinkEventTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64Lib)" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_tkinter" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(tcltkDir)\include" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib" - OutputFile="./_tkinter.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./_tkinter.pdb" - SubSystem="2" - BaseAddress="0x1e190000" - ImportLibrary=".\./_tkinter.lib" - TargetMachine="0"/> + AdditionalDependencies="$(tcltkLib)" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + PreprocessorDefinitions="WITH_APPINIT" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64Lib)" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\_tkinter.c"> - </File> - <File - RelativePath="..\Modules\tkappinit.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\_tkinter.c" + > + </File> + <File + RelativePath="..\Modules\tkappinit.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/amd64_ml64.bat b/PCbuild/amd64_ml64.bat deleted file mode 100644 index fa9acf1..0000000 --- a/PCbuild/amd64_ml64.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off -rem Try to find the AMD64 assembler and call it with the supplied arguments. - -set MLEXE=Microsoft Platform SDK\Bin\Win64\x86\AMD64\ml64.EXE - -rem For the environment variables see also -rem http://msdn.microsoft.com/library/en-us/win64/win64/wow64_implementation_details.asp - -if exist "%ProgramFiles%\%MLEXE%" ( - set ML64="%ProgramFiles%\%MLEXE%" -) else if exist "%ProgramW6432%\%MLEXE%" ( - set ML64="%ProgramW6432%\%MLEXE%" -) else ( - set ML64=ml64.exe -) - -%ML64% %* diff --git a/PCbuild/bdist_wininst.vcproj b/PCbuild/bdist_wininst.vcproj new file mode 100644 index 0000000..414f7ed --- /dev/null +++ b/PCbuild/bdist_wininst.vcproj @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="bdist_wininst"
+ ProjectGUID="{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
+ RootNamespace="wininst"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\lib\distutils\command"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\lib\distutils\command\wininst.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\PC\bdist_wininst;..\Include;..\Modules\zlib"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="0"
+ AdditionalIncludeDirectories="..\PC;..\PC\bdist_wininst;..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="comctl32.lib imagehlp.lib"
+ OutputFile="..\lib\distutils\command\wininst-9.0.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames="LIBC"
+ ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\PC\bdist_wininst\extract.c"
+ >
+ </File>
+ <File
+ RelativePath="..\PC\bdist_wininst\install.c"
+ >
+ </File>
+ <Filter
+ Name="zlib"
+ >
+ <File
+ RelativePath="..\Modules\zlib\adler32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\crc32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\inffast.c"
+ >
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\inflate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\inftrees.c"
+ >
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\zutil.c"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\PC\bdist_wininst\archive.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\PC\bdist_wininst\install.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\PC\bdist_wininst\PythonPowered.bmp"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/PCbuild/build.bat b/PCbuild/build.bat index 5eeb123..9bc8186 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -1,50 +1,17 @@ @echo off -setlocal - -set target=end - -if "%1"=="makeinfo" goto makeinfo -if "%1"=="clean" goto clean -if "%1"=="build" goto build -if "%1"=="setargv" goto setargv -if "%1"=="" goto build - -echo Usage: build.bat build -echo build.bat clean -echo build.bat setargv -goto end - -:clean -del *.pyd *.exe *.dll *.exp *.lib *.pdb *.o -rmdir /S /Q temp -rmdir /S /Q x86-temp-release -goto %target% +rem A batch program to build or rebuild a particular configuration. +rem just for convenience. -:setargv -cl /c /I"%SDK%\src\crt" /MD /D_CRTBLD "%SDK%\src\crt\setargv.c" -if not exist setargv.obj echo An error occured & goto end -echo copy setargv.obj "%SDK%\Lib" -copy setargv.obj "%SDK%\Lib" -del setargv.obj -goto %target% - -:makeinfo -nant -buildfile:python.build all -lib /def: x86-temp-release\make_buildinfo\make_buildinfo.obj -lib /def: x86-temp-release\make_versioninfo\make_versioninfo.obj -goto %target% - -:build -if not exist make_buildinfo.lib set target=realbuild & goto makeinfo -if not exist make_versioninfo.lib set target=realbuild & goto makeinfo -if exist "%SDK%\Lib\setargv.obj" goto realbuild -echo !!!!!!!! -echo setargv.obj is missing. Please call build setargv -echo !!!!!!!! - -:realbuild -if not exist sqlite3.dll copy ..\..\sqlite-source-3.3.4\sqlite3.dll . -nant -buildfile:python.build all -goto end - -:end +setlocal +set platf=Win32 +set conf=Release +set build=/build + +:CheckOpts +if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts +if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts +if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts + +set cmd=devenv pcbuild.sln %build% "%conf%|%platf%" +echo %cmd% +%cmd% diff --git a/PCbuild/build_env.bat b/PCbuild/build_env.bat index 3a8b16d..4c67ae3 100644 --- a/PCbuild/build_env.bat +++ b/PCbuild/build_env.bat @@ -1 +1 @@ -@%comspec% /k env.bat +@%comspec% /k env.bat %* diff --git a/PCbuild/build_pgo.bat b/PCbuild/build_pgo.bat new file mode 100644 index 0000000..0c0a473 --- /dev/null +++ b/PCbuild/build_pgo.bat @@ -0,0 +1,41 @@ +@echo off +rem A batch program to build PGO (Profile guided optimization) by first +rem building instrumented binaries, then running the testsuite, and +rem finally building the optimized code. +rem Note, after the first instrumented run, one can just keep on +rem building the PGUpdate configuration while developing. + +setlocal +set platf=Win32 + +rem use the performance testsuite. This is quick and simple +set job1=..\tools\pybench\pybench.py -n 1 -C 1 --with-gc +set path1=..\tools\pybench + +rem or the whole testsuite for more thorough testing +set job2=..\lib\test\regrtest.py +set path2=..\lib + +set job=%job1% +set clrpath=%path1% + +:CheckOpts +if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts +if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts + +set PGI=%platf%-pgi +set PGO=%platf%-pgo + +@echo on +rem build the instrumented version +call build -p %platf% -c PGInstrument + +rem remove .pyc files, .pgc files and execute the job +%PGI%\python.exe rmpyc.py %clrpath% +del %PGI%\*.pgc +%PGI%\python.exe %job% + +rem finally build the optimized version +if exist %PGO% del /s /q %PGO% +call build -p %platf% -c PGUpdate + diff --git a/PCbuild/build_ssl.bat b/PCbuild/build_ssl.bat index 3c87f82..ba14446 100644 --- a/PCbuild/build_ssl.bat +++ b/PCbuild/build_ssl.bat @@ -1,14 +1,12 @@ -if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
-
-@echo off
-if not defined HOST_PYTHON (
- if %1 EQU Debug (
- set HOST_PYTHON=python_d.exe
- if not exist python30_d.dll exit 1
- ) ELSE (
- set HOST_PYTHON=python.exe
- if not exist python30.dll exit 1
- )
-)
-%HOST_PYTHON% build_ssl.py %1 %2
-
+@echo off +if not defined HOST_PYTHON ( + if %1 EQU Debug ( + set HOST_PYTHON=python_d.exe + if not exist python30_d.dll exit 1 + ) ELSE ( + set HOST_PYTHON=python.exe + if not exist python30.dll exit 1 + ) +) +%HOST_PYTHON% build_ssl.py %1 %2 %3 + diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 12a78e0..2ccceec 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -13,7 +13,17 @@ # it should configure and build SSL, then build the _ssl and _hashlib # Python extensions without intervention. -import os, sys, re +# Modified by Christian Heimes +# Now this script supports pre-generated makefiles and assembly files. +# Developers don't need an installation of Perl anymore to build Python. A svn +# checkout from our svn repository is enough. +# +# In Order to create the files in the case of an update you still need Perl. +# Run build_ssl in this order: +# python.exe build_ssl.py Release x64 +# python.exe build_ssl.py Release Win32 + +import os, sys, re, shutil # Find all "foo.exe" files on the PATH. def find_all_on_path(filename, extras = None): @@ -51,7 +61,6 @@ def find_working_perl(perls): else: print(" NO perl interpreters were found on this machine at all!") print(" Please install ActivePerl and ensure it appears on your path") - print("The Python SSL module was not built") return None # Locate the best SSL directory given a few roots to look into. @@ -86,38 +95,82 @@ def find_best_ssl_dir(sources): sys.stdout.flush() return best_name +def create_makefile64(makefile, m32): + """Create and fix makefile for 64bit + + Replace 32 with 64bit directories + """ + if not os.path.isfile(m32): + return + with open(m32) as fin: + with open(makefile, 'w') as fout: + for line in fin: + line = line.replace("=tmp32", "=tmp64") + line = line.replace("=out32", "=out64") + line = line.replace("=inc32", "=inc64") + # force 64 bit machine + line = line.replace("MKLIB=lib", "MKLIB=lib /MACHINE:X64") + line = line.replace("LFLAGS=", "LFLAGS=/MACHINE:X64 ") + # don't link against the lib on 64bit systems + line = line.replace("bufferoverflowu.lib", "") + fout.write(line) + os.unlink(m32) + +def fix_makefile(makefile): + """Fix some stuff in all makefiles + """ + if not os.path.isfile(makefile): + return + with open(makefile) as fin: + lines = fin.readlines() + with open(makefile, 'w') as fout: + for line in lines: + if line.startswith("PERL="): + continue + if line.startswith("CP="): + line = "CP=copy\n" + if line.startswith("MKDIR="): + line = "MKDIR=mkdir\n" + if line.startswith("CFLAG="): + line = line.strip() + for algo in ("RC5", "MDC2", "IDEA"): + noalgo = " -DOPENSSL_NO_%s" % algo + if noalgo not in line: + line = line + noalgo + line = line + '\n' + fout.write(line) + def run_configure(configure, do_script): + print("perl Configure "+configure) os.system("perl Configure "+configure) + print(do_script) os.system(do_script) def main(): build_all = "-a" in sys.argv if sys.argv[1] == "Release": - arch = "x86" debug = False - configure = "VC-WIN32" - do_script = "ms\\do_masm" - makefile = "ms\\nt.mak" elif sys.argv[1] == "Debug": - arch = "x86" debug = True + else: + raise ValueError(str(sys.argv)) + + if sys.argv[2] == "Win32": + arch = "x86" configure = "VC-WIN32" - do_script = "ms\\do_masm" - makefile="ms\\d32.mak" - elif sys.argv[1] == "ReleaseItanium": - arch = "ia64" - debug = False - configure = "VC-WIN64I" - do_script = "ms\\do_win64i" - makefile = "ms\\nt.mak" - os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM" - elif sys.argv[1] == "ReleaseAMD64": + do_script = "ms\\do_nasm" + makefile="ms\\nt.mak" + m32 = makefile + elif sys.argv[2] == "x64": arch="amd64" - debug=False configure = "VC-WIN64A" do_script = "ms\\do_win64a" - makefile = "ms\\nt.mak" - os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON" + makefile = "ms\\nt64.mak" + m32 = makefile.replace('64', '') + #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON" + else: + raise ValueError(str(sys.argv)) + make_flags = "" if build_all: make_flags = "-a" @@ -126,7 +179,7 @@ def main(): perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"]) perl = find_working_perl(perls) if perl is None: - sys.exit(1) + print("No Perl installation was found. Existing Makefiles are used.") print("Found a working perl at '%s'" % (perl,)) sys.stdout.flush() @@ -138,10 +191,18 @@ def main(): old_cd = os.getcwd() try: os.chdir(ssl_dir) + # rebuild makefile when we do the role over from 32 to 64 build + if arch == "amd64" and os.path.isfile(m32) and not os.path.isfile(makefile): + os.unlink(m32) + # If the ssl makefiles do not exist, we invoke Perl to generate them. # Due to a bug in this script, the makefile sometimes ended up empty # Force a regeneration if it is. if not os.path.isfile(makefile) or os.path.getsize(makefile)==0: + if perl is None: + print("Perl is required to build the makefiles!") + sys.exit(1) + print("Creating the makefiles...") sys.stdout.flush() # Put our working Perl at the front of our path @@ -149,13 +210,31 @@ def main(): os.pathsep + \ os.environ["PATH"] run_configure(configure, do_script) - if arch=="x86" and debug: - # the do_masm script in openssl doesn't generate a debug - # build makefile so we generate it here: - os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile) + if debug: + print("OpenSSL debug builds aren't supported.") + #if arch=="x86" and debug: + # # the do_masm script in openssl doesn't generate a debug + # # build makefile so we generate it here: + # os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile) + + if arch == "amd64": + create_makefile64(makefile, m32) + fix_makefile(makefile) + shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) + shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch) # Now run make. - makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) + if arch == "amd64": + rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm") + if rc: + print("ml64 assembler has failed.") + sys.exit(rc) + + shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") + shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h") + + #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) + makeCommand = "nmake /nologo -f \"%s\"" % makefile print("Executing ssl makefiles:", makeCommand) sys.stdout.flush() rc = os.system(makeCommand) @@ -165,16 +244,6 @@ def main(): sys.exit(rc) finally: os.chdir(old_cd) - # And finally, we can build the _ssl module itself for Python. - defs = "SSL_DIR=\"%s\"" % (ssl_dir,) - if debug: - defs = defs + " " + "DEBUG=1" - if arch in ('amd64', 'ia64'): - defs = defs + " EXTRA_CFLAGS=/GS- EXTRA_LIBS=bufferoverflowU.lib" - makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags - print("Executing:", makeCommand) - sys.stdout.flush() - rc = os.system(makeCommand) sys.exit(rc) if __name__=='__main__': diff --git a/PCbuild/build_tkinter.py b/PCbuild/build_tkinter.py new file mode 100644 index 0000000..dada386 --- /dev/null +++ b/PCbuild/build_tkinter.py @@ -0,0 +1,86 @@ +"""Script to compile the dependencies of _tkinter + +Copyright (c) 2007 by Christian Heimes <christian@cheimes.de> + +Licensed to PSF under a Contributor Agreement. +""" + +import os +import sys +import shutil + +here = os.path.abspath(os.path.dirname(__file__)) +par = os.path.pardir + +if 1: + TCL = "tcl8.4.16" + TK = "tk8.4.16" + TIX = "tix-8.4.0" +else: + TCL = "tcl8.5b3" + TK = "tcl8.5b3" + TIX = "Tix8.4.2" + +ROOT = os.path.abspath(os.path.join(here, par, par)) +# Windows 2000 compatibility: WINVER 0x0500 +# http://msdn2.microsoft.com/en-us/library/aa383745.aspx +NMAKE = "nmake /nologo /f %s COMPILERFLAGS=-DWINVER=0x0500 %s %s" + +def nmake(makefile, command="", **kw): + defines = ' '.join(k+'='+v for k, v in kw.items()) + cmd = NMAKE % (makefile, defines, command) + print("\n\n"+cmd+"\n") + if os.system(cmd) != 0: + raise RuntimeError(cmd) + +def build(platform, clean): + if platform == "Win32": + dest = os.path.join(ROOT, "tcltk") + machine = "X86" + elif platform == "x64": + dest = os.path.join(ROOT, "tcltk64") + machine = "X64" + else: + raise ValueError(platform) + + # TCL + tcldir = os.path.join(ROOT, TCL) + if 1: + os.chdir(os.path.join(tcldir, "win")) + if clean: + nmake("makefile.vc", "clean") + nmake("makefile.vc") + nmake("makefile.vc", "install", INSTALLDIR=dest) + + # TK + if 1: + os.chdir(os.path.join(ROOT, TK, "win")) + if clean: + nmake("makefile.vc", "clean", TCLDIR=tcldir) + nmake("makefile.vc", TCLDIR=tcldir) + nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest) + + # TIX + if 1: + # python9.mak is available at http://svn.python.org + os.chdir(os.path.join(ROOT, TIX, "win")) + if clean: + nmake("python9.mak", "clean") + nmake("python9.mak", MACHINE=machine) + nmake("python9.mak", "install") + +def main(): + if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "x64"): + print("%s Win32|x64" % sys.argv[0]) + sys.exit(1) + + if "-c" in sys.argv: + clean = True + else: + clean = False + + build(sys.argv[1], clean) + + +if __name__ == '__main__': + main() diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj index d86d325..2c16eb0 100644 --- a/PCbuild/bz2.vcproj +++ b/PCbuild/bz2.vcproj @@ -1,270 +1,544 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="bz2" + ProjectGUID="{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" RootNamespace="bz2" - SccProjectName="bz2" - SccLocalPath=".."> + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\bz2" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Debug\libbz2.lib exit 0
if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Debug
nmake /nologo /f makefile.msc clean
" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib" - OutputFile="./bz2_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="msvcrt,libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./bz2_d.pdb" - SubSystem="2" - BaseAddress="0x1D170000" - ImportLibrary=".\./bz2_d.lib" - TargetMachine="1"/> + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd ..\..\bzip2-1.0.3 -nmake /nologo /f makefile.msc -"/> + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Debug\libbz2.lib exit 0
if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Debug
nmake /nologo /f makefile.msc clean
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\bz2" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib" - OutputFile="./bz2.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./bz2.pdb" - SubSystem="2" - BaseAddress="0x1D170000" - ImportLibrary=".\./bz2.lib" - TargetMachine="1"/> + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd ..\..\bzip2-1.0.3 -nmake /nologo /f makefile.msc lib -"/> + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\bz2" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib" - OutputFile="./bz2.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./bz2.pdb" - SubSystem="2" - BaseAddress="0x1D170000" - ImportLibrary=".\./bz2.lib" - TargetMachine="0"/> + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd ..\..\bzip2-1.0.3 -nmake /nologo /f makefile.msc lib -"/> + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\bz2" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib" - OutputFile="./bz2.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./bz2.pdb" - SubSystem="2" - BaseAddress="0x1D170000" - ImportLibrary=".\./bz2.lib" - TargetMachine="0"/> + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bz2Dir)" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd ..\..\bzip2-1.0.3 -nmake /nologo /f makefile.msc lib -"/> + Description="Build libbz2" + CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\bz2module.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\bz2module.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/db.build b/PCbuild/db.build deleted file mode 100644 index 6a87f74..0000000 --- a/PCbuild/db.build +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<project> - <target name="all" description="Build all targets."> - <solution configuration="release"> - <projects> - <include name="db_static.vcproj" /> - </projects> - </solution> - </target> -</project> diff --git a/PCbuild/debug.vsprops b/PCbuild/debug.vsprops new file mode 100644 index 0000000..59acd90 --- /dev/null +++ b/PCbuild/debug.vsprops @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="debug" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_DEBUG" + /> +</VisualStudioPropertySheet>
\ No newline at end of file diff --git a/PCbuild/env.bat b/PCbuild/env.bat index 05152fe..638b16c 100644 --- a/PCbuild/env.bat +++ b/PCbuild/env.bat @@ -1,22 +1,5 @@ @echo off -rem Set these values according to where you installed the software -rem You need to install the necessary bits mentioned in: -rem http://wiki.python.org/moin/Building_Python_with_the_free_MS_C_Toolkit - -set TOOLKIT=%ProgramFiles%\Microsoft Visual C++ Toolkit 2003 -set SDK=%ProgramFiles%\Microsoft Platform SDK for Windows Server 2003 R2 -set NET=%ProgramFiles%\Microsoft Visual Studio .NET 2003 -set NANT=%ProgramFiles%\Nant - -set PATH=%TOOLKIT%\bin;%PATH%;%SDK%\Bin\Win64;%NANT%\bin;%SDK%\bin -set INCLUDE=%TOOLKIT%\include;%SDK%\Include;%INCLUDE% -set LIB=%TOOLKIT%\lib;%NET%\VC7\lib;%SDK%\lib;%LIB% - -echo Build environment for Python -echo TOOLKIT=%TOOLKIT% -echo SDK=%SDK% -echo NET=%NET% -echo NANT=%NANT% -echo Commands: -echo * build -echo * rt +set VS9=%ProgramFiles%\Microsoft Visual Studio 9.0 +echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64 +echo. +call "%VS9%\VC\vcvarsall.bat" %1 diff --git a/PCbuild/idle.bat b/PCbuild/idle.bat new file mode 100644 index 0000000..dcb0485 --- /dev/null +++ b/PCbuild/idle.bat @@ -0,0 +1,15 @@ +@echo off +rem start idle +rem Usage: idle [-d] +rem -d Run Debug build (python_d.exe). Else release build. + +setlocal +set exe=python +PATH %PATH%;..\..\tcltk\bin + +if "%1"=="-d" (set exe=python_d) & shift + +set cmd=%exe% ../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9 + +echo on +%cmd% diff --git a/PCbuild/make_buildinfo.c b/PCbuild/make_buildinfo.c index 4cebf45..22b9882 100644 --- a/PCbuild/make_buildinfo.c +++ b/PCbuild/make_buildinfo.c @@ -3,6 +3,8 @@ #include <sys/stat.h> #include <stdio.h> +#define CMD_SIZE 500 + /* This file creates the getbuildinfo.o object, by first invoking subwcrev.exe (if found), and then invoking cl.exe. As a side effect, it might generate PCBuild\getbuildinfo2.c @@ -23,7 +25,7 @@ int make_buildinfo2() { struct _stat st; HKEY hTortoise; - char command[500]; + char command[CMD_SIZE+1]; DWORD type, size; if (_stat(".svn", &st) < 0) return 0; @@ -40,11 +42,11 @@ int make_buildinfo2() type != REG_SZ) /* Registry corrupted */ return 0; - strcat(command, "bin\\subwcrev.exe"); + strcat_s(command, CMD_SIZE, "bin\\subwcrev.exe"); if (_stat(command+1, &st) < 0) /* subwcrev.exe not part of the release */ return 0; - strcat(command, "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c"); + strcat_s(command, CMD_SIZE, "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c"); puts(command); fflush(stdout); if (system(command) < 0) return 0; @@ -60,17 +62,17 @@ int main(int argc, char*argv[]) return EXIT_FAILURE; } if (strcmp(argv[1], "Release") == 0) { - strcat(command, "-MD "); + strcat_s(command, CMD_SIZE, "-MD "); } else if (strcmp(argv[1], "Debug") == 0) { - strcat(command, "-D_DEBUG -MDd "); + strcat_s(command, CMD_SIZE, "-D_DEBUG -MDd "); } else if (strcmp(argv[1], "ReleaseItanium") == 0) { - strcat(command, "-MD /USECL:MS_ITANIUM "); + strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM "); } else if (strcmp(argv[1], "ReleaseAMD64") == 0) { - strcat(command, "-MD "); - strcat(command, "-MD /USECL:MS_OPTERON "); + strcat_s(command, CMD_SIZE, "-MD "); + strcat_s(command, CMD_SIZE, "-MD /USECL:MS_OPTERON "); } else { fprintf(stderr, "unsupported configuration %s\n", argv[1]); @@ -78,14 +80,14 @@ int main(int argc, char*argv[]) } if ((do_unlink = make_buildinfo2())) - strcat(command, "getbuildinfo2.c -DSUBWCREV "); + strcat_s(command, CMD_SIZE, "getbuildinfo2.c -DSUBWCREV "); else - strcat(command, "..\\Modules\\getbuildinfo.c"); - strcat(command, " -Fogetbuildinfo.o -I..\\Include -I..\\PC"); + strcat_s(command, CMD_SIZE, "..\\Modules\\getbuildinfo.c"); + strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\Include -I..\\PC"); puts(command); fflush(stdout); result = system(command); if (do_unlink) - unlink("getbuildinfo2.c"); + _unlink("getbuildinfo2.c"); if (result < 0) return EXIT_FAILURE; return 0; diff --git a/PCbuild/make_buildinfo.vcproj b/PCbuild/make_buildinfo.vcproj index c49f0fd..c42229c 100644 --- a/PCbuild/make_buildinfo.vcproj +++ b/PCbuild/make_buildinfo.vcproj @@ -1,108 +1,146 @@ <?xml version="1.0" encoding="windows-1250"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="make_buildinfo" ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}" - Keyword="Win32Proj"> + RootNamespace="make_buildinfo" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory="." - IntermediateDirectory=".\x86-temp-release\make_buildinfo" + Name="Release|Win32" ConfigurationType="1" - CharacterSet="2"> + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="5" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + InlineFunctionExpansion="1" + PreprocessorDefinitions="_CONSOLE" + RuntimeLibrary="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" OutputFile="$(OutDir)/make_buildinfo.exe" - LinkIncremental="2" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/make_buildinfo.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="." - IntermediateDirectory=".\x86-temp-release\make_buildinfo" + Name="Release|x64" ConfigurationType="1" - CharacterSet="2"> + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" + > <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="4" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)/make_buildinfo.exe" - LinkIncremental="1" - GenerateDebugInformation="TRUE" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CONSOLE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -111,9 +149,11 @@ <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > <File - RelativePath=".\make_buildinfo.c"> + RelativePath=".\make_buildinfo.c" + > </File> </Filter> </Files> diff --git a/PCbuild/make_versioninfo.vcproj b/PCbuild/make_versioninfo.vcproj index 7bdaacc..dcb922b 100644 --- a/PCbuild/make_versioninfo.vcproj +++ b/PCbuild/make_versioninfo.vcproj @@ -1,141 +1,325 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="make_versioninfo" + ProjectGUID="{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" RootNamespace="make_versioninfo" - SccProjectName="make_versioninfo" - SccLocalPath=".."> + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\make_versioninfo" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + Description="Build PC/pythonnt_rc(_d).h" + CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\pythonnt_rc.h
" + Outputs="$(SolutionDir)..\PC\pythonnt_rc.h" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool" - CommandLine=".\make_versioninfo.exe >..\PC\pythonnt_rc.h -" - Outputs="..\PC\pythonnt_rc.h"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./make_versioninfo.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./make_versioninfo.pdb" + OutputFile="$(SolutionDir)make_versioninfo.exe" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" BaseAddress="0x1d000000" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool Name="VCPostBuildEventTool" - CommandLine="$(TargetFileName) > ..\PC\python_nt.h"/> + CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\python_nt.h
" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" + > <Tool - Name="VCPreBuildEventTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCCustomBuildTool" + Description="Build PC/pythonnt_rc(_d).h" + CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\pythonnt_rc.h
" + Outputs="$(SolutionDir)..\PC\pythonnt_rc.h" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCMIDLTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="_CONSOLE" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)make_versioninfo.exe" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\python_nt.h
" + /> </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\make_versioninfo" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + Description="Build PC/pythonnt_rc(_d).h" + CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h
" + Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - BrowseInformation="1" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool" - CommandLine=".\make_versioninfo_d.exe >..\PC\pythonnt_rc_d.h -" - Outputs="..\PC\pythonnt_rc_d.h"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./make_versioninfo_d.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./make_versioninfo_d.pdb" + OutputFile="$(SolutionDir)make_versioninfo_d.exe" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" BaseAddress="0x1d000000" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool Name="VCPostBuildEventTool" - CommandLine="$(TargetFileName) > ..\PC\python_nt_d.h"/> + CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\python_nt_d.h
" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + Description="Build PC/pythonnt_rc(_d).h" + CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h
" + Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="false" + PreprocessorDefinitions="_CONSOLE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCResourceCompilerTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCPreLinkEventTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCLinkerTool" + OutputFile="$(SolutionDir)make_versioninfo_d.exe" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\python_nt_d.h
" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\PC\make_versioninfo.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\PC\make_versioninfo.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index e44a39e..ba8b005 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -1,288 +1,471 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}" +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{324F66C2-44D0-4D50-B979-F9DAE7FD36DB}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" ProjectSection(ProjectDependencies) = postProject - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} + {F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E} + {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{59CBF474-9E06-4C50-9142-C44A118BB447}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}" + ProjectSection(SolutionItems) = preProject + ..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c + readme.txt = readme.txt EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}" ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj", "{7E551393-3C43-47F8-9F3F-5BC368A6C487}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}" ProjectSection(ProjectDependencies) = postProject - {F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E} - {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{17E1E049-C309-4D79-843F-AE483C264AEA}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{97239A56-DBC0-41D2-BC14-C87D9B97D63B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcproj", "{31FFC478-7B4A-43E8-9954-8D03E2187E9C}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcproj", "{FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj", "{51F35FAE-FB92-4B2C-9187-1542C065AD77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" ProjectSection(ProjectDependencies) = postProject + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} + {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcproj", "{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{F22F40F4-D318-40DC-96B3-88DC81CE0894}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" ProjectSection(ProjectDependencies) = postProject - {F22F40F4-D318-40DC-96B3-88DC81CE0894} = {F22F40F4-D318-40DC-96B3-88DC81CE0894} + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" +EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - ReleaseAMD64 = ReleaseAMD64 - ReleaseItanium = ReleaseItanium - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Debug.ActiveCfg = Debug|Win32 - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Debug.Build.0 = Debug|Win32 - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Release.ActiveCfg = Release|Win32 - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Release.Build.0 = Release|Win32 - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {E1DBB220-D64B-423D-A545-539A55AA7FE2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Debug.ActiveCfg = Debug|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Debug.Build.0 = Debug|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Release.ActiveCfg = Release|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Release.Build.0 = Release|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Debug.ActiveCfg = Debug|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Debug.Build.0 = Debug|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Release.ActiveCfg = Release|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Release.Build.0 = Release|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.Debug.ActiveCfg = Debug|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.Debug.Build.0 = Debug|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.Release.ActiveCfg = Release|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.Release.Build.0 = Release|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {59CBF474-9E06-4C50-9142-C44A118BB447}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Debug.ActiveCfg = Debug|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Debug.Build.0 = Debug|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Release.ActiveCfg = Release|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Release.Build.0 = Release|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.Debug.ActiveCfg = Debug|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.Debug.Build.0 = Debug|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.Release.ActiveCfg = Release|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.Release.Build.0 = Release|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {AC557788-6354-43F7-BE05-C9C8C59A344A}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug.ActiveCfg = Debug|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug.Build.0 = Debug|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release.Build.0 = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseAMD64.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseAMD64.Build.0 = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium.Build.0 = Release|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug.ActiveCfg = Debug|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug.Build.0 = Debug|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release.ActiveCfg = Release|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release.Build.0 = Release|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug.ActiveCfg = Debug|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug.Build.0 = Debug|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release.ActiveCfg = Release|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release.Build.0 = Release|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug.ActiveCfg = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug.Build.0 = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release.ActiveCfg = Release|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release.Build.0 = Release|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug.ActiveCfg = Debug|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug.Build.0 = Debug|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release.ActiveCfg = Release|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release.Build.0 = Release|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug.ActiveCfg = Debug|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug.Build.0 = Debug|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release.ActiveCfg = Release|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release.Build.0 = Release|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug.ActiveCfg = Debug|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug.Build.0 = Debug|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release.ActiveCfg = Release|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release.Build.0 = Release|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug.ActiveCfg = Debug|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug.Build.0 = Debug|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release.ActiveCfg = Release|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release.Build.0 = Release|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.ReleaseAMD64.ActiveCfg = Release|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.ReleaseItanium.ActiveCfg = Release|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug.ActiveCfg = Debug|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug.Build.0 = Debug|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release.ActiveCfg = Release|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release.Build.0 = Release|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug.ActiveCfg = Debug|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug.Build.0 = Debug|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release.ActiveCfg = Release|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release.Build.0 = Release|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug.ActiveCfg = Debug|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug.Build.0 = Debug|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release.Build.0 = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseAMD64.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseAMD64.Build.0 = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseItanium.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseItanium.Build.0 = Release|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug.ActiveCfg = Debug|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug.Build.0 = Debug|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release.ActiveCfg = Release|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release.Build.0 = Release|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug.ActiveCfg = Debug|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug.Build.0 = Debug|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.ActiveCfg = Release|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.Build.0 = Release|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.ActiveCfg = Debug|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.Build.0 = Debug|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.ActiveCfg = Release|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.Build.0 = Release|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.ActiveCfg = Debug|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.Build.0 = Debug|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release.ActiveCfg = Release|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release.Build.0 = Release|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 - EndGlobalSection - GlobalSection(SolutionItems) = postSolution - ..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c - readme.txt = readme.txt + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + PGInstrument|Win32 = PGInstrument|Win32 + PGInstrument|x64 = PGInstrument|x64 + PGUpdate|Win32 = PGUpdate|Win32 + PGUpdate|x64 = PGUpdate|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.Build.0 = Debug|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.ActiveCfg = Release|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.Build.0 = Release|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.ActiveCfg = Release|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.Build.0 = Release|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.Build.0 = Release|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.ActiveCfg = Debug|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.Build.0 = Debug|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.ActiveCfg = Debug|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.Build.0 = Debug|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.ActiveCfg = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.Build.0 = Debug|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.ActiveCfg = Release|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.Build.0 = Release|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.ActiveCfg = Release|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.Build.0 = Release|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.ActiveCfg = Debug|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.Build.0 = Debug|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.ActiveCfg = Debug|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.Build.0 = Debug|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.ActiveCfg = Release|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.Build.0 = Release|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.ActiveCfg = Release|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.Build.0 = Release|x64 + {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.ActiveCfg = Debug|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.Build.0 = Debug|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.ActiveCfg = Debug|x64 + {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.Build.0 = Debug|x64 + {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.ActiveCfg = Release|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.Build.0 = Release|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.ActiveCfg = Release|x64 + {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.Build.0 = Release|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.ActiveCfg = Debug|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.Build.0 = Debug|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.ActiveCfg = Debug|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.Build.0 = Debug|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.ActiveCfg = Release|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.Build.0 = Release|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.ActiveCfg = Release|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.Build.0 = Release|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.ActiveCfg = Debug|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.Build.0 = Debug|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.Build.0 = Debug|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.ActiveCfg = Release|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.Build.0 = Release|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.Build.0 = Release|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.ActiveCfg = Debug|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.Build.0 = Debug|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.ActiveCfg = Debug|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.Build.0 = Debug|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.ActiveCfg = Release|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.Build.0 = Release|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.ActiveCfg = Release|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.Build.0 = Release|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.ActiveCfg = Debug|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.Build.0 = Debug|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.ActiveCfg = Debug|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.Build.0 = Debug|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.ActiveCfg = Release|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.Build.0 = Release|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.ActiveCfg = Release|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.Build.0 = Release|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.ActiveCfg = Debug|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.Build.0 = Debug|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.ActiveCfg = Debug|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.Build.0 = Debug|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.ActiveCfg = Release|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.Build.0 = Release|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.ActiveCfg = Release|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.Build.0 = Release|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.Build.0 = Debug|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.ActiveCfg = Debug|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.Build.0 = Debug|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.ActiveCfg = Release|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.Build.0 = Release|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.ActiveCfg = Release|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.Build.0 = Release|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.ActiveCfg = Debug|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.Build.0 = Debug|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.ActiveCfg = Debug|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.Build.0 = Debug|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.ActiveCfg = Release|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.Build.0 = Release|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.ActiveCfg = Release|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.Build.0 = Release|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.Build.0 = Debug|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.ActiveCfg = Debug|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.Build.0 = Debug|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.ActiveCfg = Release|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.Build.0 = Release|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.ActiveCfg = Release|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.Build.0 = Release|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.Build.0 = Debug|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.ActiveCfg = Debug|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.Build.0 = Debug|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.ActiveCfg = Release|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.Build.0 = Release|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.ActiveCfg = Release|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.Build.0 = Release|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.ActiveCfg = Debug|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.Build.0 = Debug|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.ActiveCfg = Debug|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.Build.0 = Debug|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.ActiveCfg = Release|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.Build.0 = Release|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.ActiveCfg = Release|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.Build.0 = Release|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.ActiveCfg = Debug|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.Build.0 = Debug|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.ActiveCfg = Debug|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.Build.0 = Debug|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.ActiveCfg = Release|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.Build.0 = Release|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.ActiveCfg = Release|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.Build.0 = Release|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.ActiveCfg = Debug|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.Build.0 = Debug|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.ActiveCfg = Debug|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.Build.0 = Debug|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.ActiveCfg = Release|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.Build.0 = Release|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/PCbuild/pginstrument.vsprops b/PCbuild/pginstrument.vsprops new file mode 100644 index 0000000..93b9687 --- /dev/null +++ b/PCbuild/pginstrument.vsprops @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="pginstrument" + OutputDirectory="$(OutDirPGI)" + IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="false" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + EnableFiberSafeOptimizations="false" + WholeProgramOptimization="true" + StringPooling="true" + ExceptionHandling="0" + BufferSecurityCheck="false" + /> + <Tool + Name="VCLinkerTool" + OptimizeReferences="2" + EnableCOMDATFolding="2" + LinkTimeCodeGeneration="2" + ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd" + ImportLibrary="$(OutDirPGI)\$(TargetName).lib" + /> + <UserMacro + Name="OutDirPGI" + Value="$(SolutionDir)$(PlatformName)-pgi\" + /> +</VisualStudioPropertySheet> diff --git a/PCbuild/pgupdate.vsprops b/PCbuild/pgupdate.vsprops new file mode 100644 index 0000000..7ce4a3a --- /dev/null +++ b/PCbuild/pgupdate.vsprops @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="pgupdate" + OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\" + InheritedPropertySheets="$(SolutionDir)\pginstrument.vsprops" + > + <Tool + Name="VCLinkerTool" + AdditionalManifestDependencies="" + LinkTimeCodeGeneration="4" + /> +</VisualStudioPropertySheet> diff --git a/PCbuild/pyd.vsprops b/PCbuild/pyd.vsprops new file mode 100644 index 0000000..2e21a80 --- /dev/null +++ b/PCbuild/pyd.vsprops @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="pyd" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" + > + <Tool + Name="VCCLCompilerTool" + RuntimeLibrary="2" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName).pyd" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" + ImportLibrary="$(OutDir)\$(TargetName).lib" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> +</VisualStudioPropertySheet> diff --git a/PCbuild/pyd_d.vsprops b/PCbuild/pyd_d.vsprops new file mode 100644 index 0000000..b8f98f6 --- /dev/null +++ b/PCbuild/pyd_d.vsprops @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="pyd_d" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="0" + EnableIntrinsicFunctions="false" + RuntimeLibrary="3" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)_d.pyd" + LinkIncremental="1" + ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb" + ImportLibrary="$(OutDir)\$(TargetName).lib" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + <UserMacro + Name="PythonExe" + Value="$(SolutionDir)python_d.exe" + /> +</VisualStudioPropertySheet> diff --git a/PCbuild/pyexpat.vcproj b/PCbuild/pyexpat.vcproj index 1c5b3ad..2d2cd9d 100644 --- a/PCbuild/pyexpat.vcproj +++ b/PCbuild/pyexpat.vcproj @@ -1,262 +1,552 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="pyexpat" - SccProjectName="pyexpat" - SccLocalPath=".."> + ProjectGUID="{D06B6426-4762-44CC-8BAD-D79052507F2F}" + RootNamespace="pyexpat" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\pyexpat" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbccp32.lib" - OutputFile="./pyexpat_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pyexpat_d.pdb" - SubSystem="2" - BaseAddress="0x1D100000" - ImportLibrary=".\./pyexpat_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\pyexpat" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbccp32.lib" - OutputFile="./pyexpat.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pyexpat.pdb" - SubSystem="2" - BaseAddress="0x1D100000" - ImportLibrary=".\./pyexpat.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\pyexpat" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="odbccp32.lib" - OutputFile="./pyexpat.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pyexpat.pdb" - SubSystem="2" - BaseAddress="0x1D100000" - ImportLibrary=".\./pyexpat.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\pyexpat" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="odbccp32.lib" - OutputFile="./pyexpat.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pyexpat.pdb" - SubSystem="2" - BaseAddress="0x1D100000" - ImportLibrary=".\./pyexpat.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\pyexpat.c"> - </File> - <File - RelativePath="..\Modules\expat\xmlparse.c"> - </File> - <File - RelativePath="..\Modules\expat\xmlrole.c"> - </File> - <File - RelativePath="..\Modules\expat\xmltok.c"> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\expat\xmlrole.h" + > + </File> + <File + RelativePath="..\Modules\expat\xmltok.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\pyexpat.c" + > + </File> + <File + RelativePath="..\Modules\expat\xmlparse.c" + > + </File> + <File + RelativePath="..\Modules\expat\xmlrole.c" + > + </File> + <File + RelativePath="..\Modules\expat\xmltok.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops new file mode 100644 index 0000000..eaea0be --- /dev/null +++ b/PCbuild/pyproject.vsprops @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="pyproject" + OutputDirectory="$(SolutionDir)" + IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\Include; ..\PC" + PreprocessorDefinitions="_WIN32" + StringPooling="true" + ExceptionHandling="0" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="..\PC;..\Include" + /> + <UserMacro + Name="PyDllName" + Value="python26" + /> + <UserMacro + Name="PythonExe" + Value="$(SolutionDir)\python.exe" + /> + <UserMacro + Name="bsddbDir" + Value="..\..\db-4.4.20\build_win32\" + /> + <UserMacro + Name="sqlite3Dir" + Value="..\..\sqlite-source-3.3.4\" + /> + <UserMacro + Name="bz2Dir" + Value="..\..\bzip2-1.0.3\" + /> + <UserMacro + Name="opensslDir" + Value="..\..\openssl-0.9.8g\" + /> + <UserMacro + Name="tcltkDir" + Value="..\..\tcltk\" + /> + <UserMacro + Name="tcltk64Dir" + Value="..\..\tcltk64" + /> + <UserMacro + Name="tcltkLib" + Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib" + /> + <UserMacro + Name="tcltk64Lib" + Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib $(tcltk64Dir)\lib\tix8.4\tix84.lib" + /> +</VisualStudioPropertySheet> diff --git a/PCbuild/python.build b/PCbuild/python.build deleted file mode 100644 index 61bbe89..0000000 --- a/PCbuild/python.build +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<project> - <target name="all" description="Build all targets."> - <solution configuration="release"> - <projects> - <include name="make_versioninfo.vcproj" /> - </projects> - </solution> - <exec program="make_versioninfo" output="pythonnt_rc.h" /> - - <solution configuration="release" solutionfile="pcbuild.sln"> - <excludeprojects> - <include name="_tkinter.vcproj" /> - <include name="bz2.vcproj" /> - <include name="_bsddb.vcproj" /> - <include name="_sqlite3.vcproj" /> - <include name="_ssl.vcproj" /> - </excludeprojects> - </solution> - </target> -</project> diff --git a/PCbuild/python.iss b/PCbuild/python.iss deleted file mode 100644 index 480b8c1..0000000 --- a/PCbuild/python.iss +++ /dev/null @@ -1,337 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -; This is the whole ball of wax for an Inno installer for Python. -; To use, download Inno Setup from http://www.jrsoftware.org/isdl.htm/, -; install it, and double-click on this file. That launches the Inno -; script compiler. The GUI is extemely simple, and has only one button -; you may not recognize instantly: click it. You're done. It builds -; the installer into PCBuild/Python-2.2a1.exe. Size and speed of the -; installer are competitive with the Wise installer; Inno uninstall -; seems much quicker than Wise (but also feebler, and the uninstall -; log is in some un(human)readable binary format). -; -; What's Done -; ----------- -; All the usual Windows Python files are installed by this now. -; All the usual Windows Python Start menu entries are created and -; work fine. -; .py, .pyw, .pyc and .pyo extensions are registered. -; PROBLEM: Inno uninstall does not restore their previous registry -; associations (if any). Wise did. This will make life -; difficult for alpha (etc) testers. -; The Python install is fully functional for "typical" uses. -; -; What's Not Done -; --------------- -; None of "Mark Hammond's" registry entries are written. -; No installation of files is done into the system dir: -; The MS DLLs aren't handled at all by this yet. -; Python22.dll is unpacked into the main Python dir. -; -; Inno can't do different things on NT/2000 depending on whether the user -; has Admin privileges, so I don't know how to "solve" either of those, -; short of building two installers (one *requiring* Admin privs, the -; other not doing anything that needs Admin privs). -; -; Inno has no concept of variables, so lots of lines in this file need -; to be fiddled by hand across releases. Simplest way out: stick this -; file in a giant triple-quoted r-string (note that backslashes are -; required all over the place here -- forward slashes DON'T WORK in -; Inno), and use %(yadda)s string interpolation to do substitutions; i.e., -; write a very simple Python program to *produce* this script. - -[Setup] -AppName=Python and combined Win32 Extensions -AppVerName=Python 2.2.2 and combined Win32 Extensions 150 -AppId=Python 2.2.2.150 -AppVersion=2.2.2.150 -AppCopyright=Python is Copyright © 2001 Python Software Foundation. Win32 Extensions are Copyright © 1996-2001 Greg Stein and Mark Hammond. - -; Default install dir; value of {app} later (unless user overrides). -; {sd} = system root drive, probably "C:". -DefaultDirName={sd}\Python22 -;DefaultDirName={pf}\Python - -; Start menu folder name; value of {group} later (unless user overrides). -DefaultGroupName=Python 2.2 - -; Point SourceDir to one above PCBuild = src. -; means this script can run unchanged from anyone's CVS tree, no matter -; what they called the top-level directories. -SourceDir=. -OutputDir=.. -OutputBaseFilename=Python-2.2.2-Win32-150-Setup - -AppPublisher=PythonLabs at Digital Creations -AppPublisherURL=http://www.python.org -AppSupportURL=http://www.python.org -AppUpdatesURL=http://www.python.org - -AlwaysCreateUninstallIcon=true -ChangesAssociations=true -UninstallLogMode=new -AllowNoIcons=true -AdminPrivilegesRequired=true -UninstallDisplayIcon={app}\pyc.ico -WizardDebug=false - -; The fewer screens the better; leave these commented. - -Compression=bzip -InfoBeforeFile=LICENSE.txt -;InfoBeforeFile=Misc\NEWS - -; uncomment the following line if you want your installation to run on NT 3.51 too. -; MinVersion=4,3.51 - -[Types] -Name: normal; Description: Select desired components; Flags: iscustom - -[Components] -Name: main; Description: Python and Win32 Extensions; Types: normal -Name: docs; Description: Python documentation (HTML); Types: normal -Name: tk; Description: TCL/TK, tkinter, and Idle; Types: normal -Name: tools; Description: Python utility scripts (Tools\); Types: normal -Name: test; Description: Python test suite (Lib\test\); Types: normal - -[Tasks] -Name: extensions; Description: Register file associations (.py, .pyw, .pyc, .pyo); Components: main; Check: IsAdminLoggedOn - -[Files] -; Caution: Using forward slashes instead screws up in amazing ways. -; Unknown: By the time Components (and other attrs) are added to these lines, they're -; going to get awfully long. But don't see a way to continue logical lines across -; physical lines. - -Source: LICENSE.txt; DestDir: {app}; CopyMode: alwaysoverwrite -Source: README.txt; DestDir: {app}; CopyMode: alwaysoverwrite -Source: News.txt; DestDir: {app}; CopyMode: alwaysoverwrite -Source: *.ico; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main - -Source: python.exe; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main -Source: pythonw.exe; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main -Source: w9xpopen.exe; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main - - -Source: DLLs\tcl83.dll; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk -Source: DLLs\tk83.dll; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk -Source: tcl\*.*; DestDir: {app}\tcl; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs - -Source: sysdir\python22.dll; DestDir: {sys}; CopyMode: alwaysskipifsameorolder; Components: main; Flags: sharedfile restartreplace -Source: sysdir\PyWinTypes22.dll; DestDir: {sys}; CopyMode: alwaysskipifsameorolder; Components: main; Flags: restartreplace sharedfile -Source: sysdir\pythoncom22.dll; DestDir: {sys}; CopyMode: alwaysskipifsameorolder; Components: main; Flags: restartreplace sharedfile - -Source: DLLs\_socket.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\_socket.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\_sre.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\_sre.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\_symtable.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\_symtable.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\_testcapi.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\_testcapi.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\_tkinter.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk -Source: libs\_tkinter.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: tk - -Source: DLLs\bsddb.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\bsddb.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\mmap.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\mmap.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\parser.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\parser.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\pyexpat.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\pyexpat.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\select.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\select.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\unicodedata.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\unicodedata.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\_winreg.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\_winreg.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\winsound.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\winsound.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\zlib.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main -Source: libs\zlib.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: libs\python22.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main - -Source: DLLs\expat.dll; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main - - - -Source: Lib\*.py; DestDir: {app}\Lib; CopyMode: alwaysoverwrite; Components: main -Source: Lib\distutils\*.*; DestDir: {app}\Lib\distutils; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs -Source: Lib\email\*.*; DestDir: {app}\Lib\email; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs -Source: Lib\encodings\*.*; DestDir: {app}\Lib\encodings; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs -Source: Lib\lib-old\*.*; DestDir: {app}\Lib\lib-old; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs -Source: Lib\xml\*.*; DestDir: {app}\Lib\xml; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs -Source: Lib\test\*.*; DestDir: {app}\Lib\test; CopyMode: alwaysoverwrite; Components: test; Flags: recursesubdirs - -Source: Lib\site-packages\README.txt; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: main - -Source: Lib\site-packages\PyWin32.chm; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: docs -Source: Lib\site-packages\win32\*.*; DestDir: {app}\Lib\site-packages\win32; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs -Source: Lib\site-packages\win32com\*.*; DestDir: {app}\Lib\site-packages\win32com; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs -Source: Lib\site-packages\win32comext\*.*; DestDir: {app}\Lib\site-packages\win32comext; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs - -Source: Lib\lib-tk\*.py; DestDir: {app}\Lib\lib-tk; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs - -Source: include\*.h; DestDir: {app}\include; CopyMode: alwaysoverwrite; Components: main - -Source: Tools\idle\*.*; DestDir: {app}\Tools\idle; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs - -Source: Tools\pynche\*.*; DestDir: {app}\Tools\pynche; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs -Source: Tools\scripts\*.*; DestDir: {app}\Tools\Scripts; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs -Source: Tools\webchecker\*.*; DestDir: {app}\Tools\webchecker; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs -Source: Tools\versioncheck\*.*; DestDir: {app}\Tools\versioncheck; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs - -Source: Doc\*.*; DestDir: {app}\Doc; CopyMode: alwaysoverwrite; Flags: recursesubdirs; Components: docs - - -[Icons] -Name: {group}\Python (command line); Filename: {app}\python.exe; WorkingDir: {app}; Components: main -Name: {group}\Python Manuals; Filename: {app}\Doc\index.html; WorkingDir: {app}; Components: docs -Name: {group}\Win32 Extensions Help; Filename: {app}\Lib\site-packages\PyWin32.chm; WorkingDir: {app}\Lib\site-packages; Components: docs -Name: {group}\Module Docs; Filename: {app}\pythonw.exe; WorkingDir: {app}; Parameters: """{app}\Tools\Scripts\pydoc.pyw"""; Components: tools -Name: {group}\IDLE (Python GUI); Filename: {app}\pythonw.exe; WorkingDir: {app}; Parameters: """{app}\Tools\idle\idle.pyw"""; Components: tools - -[Registry] -; Register .py -Tasks: extensions; Root: HKCR; Subkey: .py; ValueType: string; ValueName: ; ValueData: Python File; Flags: uninsdeletevalue -Tasks: extensions; Root: HKCR; Subkey: .py; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: uninsdeletevalue -Tasks: extensions; Root: HKCR; Subkey: Python File; ValueType: string; ValueName: ; ValueData: Python File; Flags: uninsdeletekey -Tasks: extensions; Root: HKCR; Subkey: Python File\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\Py.ico -Tasks: extensions; Root: HKCR; Subkey: Python File\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\python.exe"" ""%1"" %*" - -; Register .pyc -Tasks: extensions; Root: HKCR; Subkey: .pyc; ValueType: string; ValueName: ; ValueData: Python CompiledFile; Flags: uninsdeletevalue -Tasks: extensions; Root: HKCR; Subkey: Python CompiledFile; ValueType: string; ValueName: ; ValueData: Compiled Python File; Flags: uninsdeletekey -Tasks: extensions; Root: HKCR; Subkey: Python CompiledFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\pyc.ico -Tasks: extensions; Root: HKCR; Subkey: Python CompiledFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\python.exe"" ""%1"" %*" - -; Register .pyo -Tasks: extensions; Root: HKCR; Subkey: .pyo; ValueType: string; ValueName: ; ValueData: Python CompiledFile; Flags: uninsdeletevalue - -; Register .pyw -Tasks: extensions; Root: HKCR; Subkey: .pyw; ValueType: string; ValueName: ; ValueData: Python NoConFile; Flags: uninsdeletevalue -Tasks: extensions; Root: HKCR; Subkey: .pyw; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: uninsdeletevalue -Tasks: extensions; Root: HKCR; Subkey: Python NoConFile; ValueType: string; ValueName: ; ValueData: Python File (no console); Flags: uninsdeletekey -Tasks: extensions; Root: HKCR; Subkey: Python NoConFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\Py.ico -Tasks: extensions; Root: HKCR; Subkey: Python NoConFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\pythonw.exe"" ""%1"" %*" - - -; Python Registry Keys -Root: HKLM; Subkey: SOFTWARE\Python; Flags: uninsdeletekeyifempty; Check: IsAdminLoggedOn -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath; ValueData: "{app}\Lib;{app}\DLLs"; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\tk; ValueData: {app}\Lib\lib-tk; Flags: uninsdeletekey; Components: tk -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\win32; ValueData: "{app}\lib\site-packages\win32;{app}\lib\site-packages\win32\lib"; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\win32com; ValueData: C:\Python\lib\site-packages; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Modules; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Modules\pythoncom; ValueData: {sys}\pythoncom22.dll; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Modules\pywintypes; ValueData: {sys}\PyWinTypes22.dll; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\InstallPath; ValueData: {app}; Flags: uninsdeletekeyifempty; ValueType: string -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\InstallPath\InstallGroup; ValueData: {group}; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Help; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Help\Main Python Documentation; ValueType: string; ValueData: {app}\Doc\index.html; Flags: uninsdeletekey; Components: docs -Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Help\Python Win32 Documentation; ValueType: string; ValueData: {app}\lib\site-packages\PyWin32.chm; Flags: uninsdeletekey; Components: docs - -[_ISTool] -EnableISX=true - - -[Code] -Program Setup; - -Function IsAdminNotLoggedOn(): Boolean; -begin - Result := Not IsAdminLoggedOn(); -end; - -begin -end. - - - - -[UninstallDelete] -Name: {app}\Lib\distutils\command\*.pyc; Type: files -Name: {app}\Lib\distutils\command\*.pyo; Type: files -Name: {app}\Lib\distutils\command; Type: dirifempty -Name: {app}\Lib\distutils\*.pyc; Type: files -Name: {app}\Lib\distutils\*.pyo; Type: files -Name: {app}\Lib\distutils; Type: dirifempty -Name: {app}\Lib\email\test\*.pyc; Type: files -Name: {app}\Lib\email\test\*.pyo; Type: files -Name: {app}\Lib\email\test; Type: dirifempty -Name: {app}\Lib\email\*.pyc; Type: files -Name: {app}\Lib\email\*.pyo; Type: files -Name: {app}\Lib\email; Type: dirifempty -Name: {app}\Lib\encodings\*.pyc; Type: files -Name: {app}\Lib\encodings\*.pyo; Type: files -Name: {app}\Lib\encodings; Type: dirifempty -Name: {app}\Lib\lib-old\*.pyc; Type: files -Name: {app}\Lib\lib-old\*.pyo; Type: files -Name: {app}\Lib\lib-old; Type: dirifempty -Name: {app}\Lib\lib-tk\*.pyc; Type: files -Name: {app}\Lib\lib-tk\*.pyo; Type: files -Name: {app}\Lib\lib-tk; Type: dirifempty -Name: {app}\Lib\test\*.pyc; Type: files -Name: {app}\Lib\test\*.pyo; Type: files -Name: {app}\Lib\test; Type: dirifempty -Name: {app}\Lib\xml\dom\*.pyc; Type: files -Name: {app}\Lib\xml\dom\*.pyo; Type: files -Name: {app}\Lib\xml\dom; Type: dirifempty -Name: {app}\Lib\xml\parsers\*.pyc; Type: files -Name: {app}\Lib\xml\parsers\*.pyo; Type: files -Name: {app}\Lib\xml\parsers; Type: dirifempty -Name: {app}\Lib\xml\sax\*.pyc; Type: files -Name: {app}\Lib\xml\sax\*.pyo; Type: files -Name: {app}\Lib\xml\sax; Type: dirifempty -Name: {app}\Lib\xml\*.pyc; Type: files -Name: {app}\Lib\xml\*.pyo; Type: files -Name: {app}\Lib\xml; Type: dirifempty - -Name: {app}\Lib\site-packages\win32; Type: filesandordirs -Name: {app}\Lib\site-packages\win32com; Type: filesandordirs -Name: {app}\Lib\site-packages\win32comext; Type: filesandordirs -Name: {app}\Lib\site-packages\pythoncom.py*; Type: files -Name: {app}\Lib\site-packages; Type: dirifempty - -Name: {app}\Lib\*.pyc; Type: files -Name: {app}\Lib; Type: dirifempty - -Name: {app}\Tools\pynche\*.pyc; Type: files -Name: {app}\Tools\pynche\*.pyo; Type: files -Name: {app}\Tools\pynche; Type: dirifempty - -Name: {app}\Tools\idle\*.pyc; Type: files -Name: {app}\Tools\idle\*.pyo; Type: files -Name: {app}\Tools\idle; Type: dirifempty - -Name: {app}\Tools\scripts\*.pyc; Type: files -Name: {app}\Tools\scripts\*.pyo; Type: files -Name: {app}\Tools\scripts; Type: dirifempty - -Name: {app}\Tools\versioncheck\*.pyc; Type: files -Name: {app}\Tools\versioncheck\*.pyo; Type: files -Name: {app}\Tools\versioncheck; Type: dirifempty - -Name: {app}\Tools\webchecker\*.pyc; Type: files -Name: {app}\Tools\webchecker\*.pyo; Type: files -Name: {app}\Tools\webchecker; Type: dirifempty - -Name: {app}\Tools; Type: dirifempty - diff --git a/PCbuild/python.vcproj b/PCbuild/python.vcproj index 8412e81..17b29a2 100644 --- a/PCbuild/python.vcproj +++ b/PCbuild/python.vcproj @@ -1,273 +1,644 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="python" - SccProjectName="python" - SccLocalPath=".."> + ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\python" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python.pdb" + OutputFile="$(OutDir)\python.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool - Name="VCPreLinkEventTool"/> + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\python" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" RuntimeLibrary="3" - UsePrecompiledHeader="2" BrowseInformation="1" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./python_d.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python_d.pdb" + OutputFile="$(OutDir)\python_d.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + RuntimeLibrary="3" + BrowseInformation="1" + CompileAs="0" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" - AdditionalIncludeDirectories="..\Include"/> + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python_d.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\python" + Name="PGInstrument|Win32" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /VSEXTCOMP_VERBOSE" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python.pdb" + OutputFile="$(OutDir)\python.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0"/> + ImportLibrary="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool - Name="VCPreLinkEventTool"/> + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\python" + Name="PGUpdate|Win32" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python.pdb" + OutputFile="$(OutDir)\python.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0"/> + ImportLibrary="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool - Name="VCMIDLTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\PC\pycon.ico"> - </File> - <File - RelativePath="..\Modules\python.c"> - </File> - <File - RelativePath="..\PC\python_exe.rc"> - </File> + <Filter + Name="Resource Files" + > + <File + RelativePath="..\PC\pycon.ico" + > + </File> + <File + RelativePath="..\PC\python_exe.rc" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\python.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse deleted file mode 100644 index da2df69..0000000 --- a/PCbuild/python20.wse +++ /dev/null @@ -1,3127 +0,0 @@ -Document Type: WSE -item: Global - Version=9.0 - Title=Python 2.4a1 - Flags=00010100 - Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - Japanese Font Name=MS Gothic - Japanese Font Size=10 - Start Gradient=0 255 0 - End Gradient=0 128 0 - Windows Flags=00000100000011010010010100001010 - Log Pathname=%MAINDIR%\INSTALL.LOG - Message Font=MS Sans Serif - Font Size=8 - Pages Modified=00010000011101000000000100000111 - Extra Pages=00000000000000000000000010110010 - Disk Filename=SETUP - Patch Flags=0000000000001001 - Patch Threshold=85 - Patch Memory=4000 - MIF PDF Version=1.0 - MIF SMS Version=2.0 - EXE Filename=Python-2.4a1.exe - Dialogs Version=8 - Version File=2.4a1 - Version Description=Python Programming Language - Version Copyright=©2001-2007 Python Software Foundation - Version Company=Python Software Foundation - Crystal Format=10111100101100000010001001001001 - Step View=&All - Variable Name1=_WISE_ - Variable Description1=WISE root directory - Variable Default1=C:\Programme\Wise Installation System - Variable Flags1=00001000 - Variable Name2=_TCLDIR_ - Variable Description2=The directory in which the Tcl/Tk installation - Variable Description2=lives. This must be a sibling of the Python - Variable Description2=directory. - Variable Default2=tcl84 - Variable Flags2=00001000 - Variable Name3=_DOC_ - Variable Description3=The unpacked HTML doc directory. - Variable Default3=..\html - Variable Flags3=00001001 - Variable Name4=_SYS_ - Variable Description4=System directory (where to find MSVCRT.DLL) - Variable Default4=C:\Windows\System - Variable Values4=C:\Windows\System - Variable Values4=C:\WINNT\System32 - Variable Values4=C:\Code\MSDLLs - Variable Values4=C:\Windows\System32 - Variable Flags4=00000010 - Variable Name5=_PYMAJOR_ - Variable Description5=Python major version number; the 2 in 2.3. - Variable Default5=2 - Variable Flags5=00001000 - Variable Name6=_PYMINOR_ - Variable Description6=Python minor version number; the 3 in 2.3 - Variable Default6=3 - Variable Flags6=00001000 - Variable Name7=_DOADMIN_ - Variable Description7=The initial value for %DOADMIN%. - Variable Description7=When 0, we never try to write under HKLM, - Variable Description7=and install the Python + MS runtime DLLs in - Variable Description7=the Python directory instead of the system dir. - Variable Default7=1 - Variable Values7=1 - Variable Values7=0 - Variable Flags7=00001010 - Variable Name8=_ALIASNAME_ - Variable Flags8=00001000 - Variable Name9=_ALIASPATH_ - Variable Flags9=00001000 - Variable Name10=_ALIASTYPE_ - Variable Flags10=00001000 -end -item: Set Variable - Variable=PYVER_STRING - Value=2.3 -end -item: Remark -end -item: Remark - Text=When the version number changes, set the compiler -end -item: Remark - Text=vrbls _PYMAJOR_ and _PYMINOR_. -end -item: Remark - Text=Nothing in the script below should need fiddling then. -end -item: Remark - Text=Other things that need fiddling: -end -item: Remark - Text= PYVER_STRING above. -end -item: Remark - Text= The "Title:" in the upper left corner of the GUI. -end -item: Remark - Text= Build Settings and Version Resource on step 6 (Finish) of the Installation Expert -end -item: Remark - Text= Be sure to select Steps->All or you may not see these! -end -item: Remark -end -item: Remark - Text=When the version of Tcl/Tk changes, the compiler vrbl -end -item: Remark - Text=_TCLDIR_ may also need to be changed. -end -item: Remark -end -item: Set Variable - Variable=APPTITLE - Value=Python %PYVER_STRING% -end -item: Remark - Text=PY_VERSION should be major.minor only; used to create the registry key; must match MS_DLL_ID in python_nt.rc -end -item: Set Variable - Variable=PY_VERSION - Value=%_PYMAJOR_%.%_PYMINOR_% -end -item: Remark - Text=GROUP is the Start menu group name; user can override. -end -item: Set Variable - Variable=GROUP - Value=Python %PY_VERSION% - Flags=10000000 -end -item: Remark - Text=MAINDIR is the app directory; user can override. -end -item: Set Variable - Variable=MAINDIR - Value=Python%_PYMAJOR_%%_PYMINOR_% -end -item: Remark -end -item: Set Variable - Variable=DOADMIN - Value=%_DOADMIN_% -end -item: Remark - Text=Give non-admin users a chance to abort. -end -item: Check Configuration - Flags=10011111 -end -item: Set Variable - Variable=DOADMIN - Value=0 -end -item: Display Message - Title=Doing non-admin install - Text=The current login does not have Administrator Privileges on this machine. Python will install its registry information into the per-user area only for the current login, instead of into the per-machine area for every account on this machine. Some advanced uses of Python may not work as a result (for example, running a Python script as a service). - Text= - Text=If this is not what you want, please click Cancel to abort this installation, log on as an Administrator, and start the installation again. - Flags=00001000 -end -item: End Block -end -item: Remark -end -item: Remark - Text=BEGIN WIZARD STUFF ----------------------------------------------------------------------------------------------------------------------------- -end -item: Remark - Text=Note from Tim: the "stop" on the next line is actually "pause". -end -item: Open/Close INSTALL.LOG - Flags=00000001 -end -item: Remark - Text=If the destination system does not have a writable Windows\System directory, system files will be written to the Windows\ directory -end -item: Check if File/Dir Exists - Pathname=%SYS% - Flags=10000100 -end -item: Set Variable - Variable=SYS - Value=%WIN% -end -item: End Block -end -item: Check Configuration - Flags=10111011 -end -item: Get Registry Key Value - Variable=COMMON - Key=SOFTWARE\Microsoft\Windows\CurrentVersion - Default=C:\Program Files\Common Files - Value Name=CommonFilesDir - Flags=00000100 -end -item: Get Registry Key Value - Variable=PROGRAM_FILES - Key=SOFTWARE\Microsoft\Windows\CurrentVersion - Default=C:\Program Files - Value Name=ProgramFilesDir - Flags=00000100 -end -item: Set Variable - Variable=EXPLORER - Value=1 -end -item: End Block -end -item: Remark - Text=Note from Tim: The Wizard hardcod "C:" at the start of the replacement text for MAINDIR. -end -item: Remark - Text=That's not appropriate if the system drive doesn't happen to be C:. -end -item: Remark - Text=I removed the "C:", and that did the right thing for two people who tested it on non-C: machines, -end -item: Remark - Text=but it's unclear whether it will always do the right thing. -end -item: Set Variable - Variable=MAINDIR - Value=\%MAINDIR% - Flags=00001100 -end -item: Remark - Text=BACKUP is the variable that holds the path that all backup files will be copied to when overwritten -end -item: Set Variable - Variable=BACKUP - Value=%MAINDIR%\BACKUP - Flags=10000000 -end -item: Remark - Text=DOBACKUP determines if a backup will be performed. The possible values are A (do backup) or B (do not do backup) -end -item: Set Variable - Variable=DOBACKUP - Value=A -end -item: Remark - Text=BRANDING determines if the installation will be branded with a name and company. By default, this is written to the INST directory (installation media). -end -item: Set Variable - Variable=BRANDING - Value=0 -end -item: If/While Statement - Variable=BRANDING - Value=1 -end -item: Read INI Value - Variable=NAME - Pathname=%INST%\CUSTDATA.INI - Section=Registration - Item=Name -end -item: Read INI Value - Variable=COMPANY - Pathname=%INST%\CUSTDATA.INI - Section=Registration - Item=Company -end -item: If/While Statement - Variable=NAME -end -item: Set Variable - Variable=DOBRAND - Value=1 -end -item: Get System Information - Variable=NAME - Flags=00000110 -end -item: Get System Information - Variable=COMPANY - Flags=00000111 -end -item: End Block -end -item: End Block -end -item: Remark - Text=END WIZARD STUFF ----------------------------------------------------------------------------------------------------------------------------- -end -item: Remark -end -item: Remark - Text=Set vrbls for the "Advanced Options" subdialog of Components. -end -item: Set Variable - Variable=SELECT_ADMIN - Value=A -end -item: If/While Statement - Variable=DOADMIN - Value=0 -end -item: Set Variable - Variable=SELECT_ADMIN - Value=B -end -item: End Block -end -item: Remark -end -item: Remark - Text=TASKS values: -end -item: Remark - Text=A: Register file extensions -end -item: Remark - Text=B: Create Start Menu shortcuts -end -item: Set Variable - Variable=TASKS - Value=AB -end -item: Remark -end -item: Remark - Text=COMPONENTS values: -end -item: Remark - Text=A: interpreter and libraries -end -item: Remark - Text=B: Tcl/Tk -end -item: Remark - Text=C: docs -end -item: Remark - Text=D: tools -end -item: Remark - Text=E: test suite -end -item: Set Variable - Variable=COMPONENTS - Value=ABCDE -end -item: Remark -end -item: Remark - Text=March thru the user GUI. -end -item: Wizard Block - Direction Variable=DIRECTION - Display Variable=DISPLAY - Bitmap Pathname=.\installer.bmp - X Position=9 - Y Position=10 - Filler Color=11173759 - Dialog=Select Destination Directory - Dialog=Backup Replaced Files - Dialog=Select Components - Dialog=Select Program Manager Group - Variable= - Variable= - Variable= - Variable=TASKS - Value= - Value= - Value= - Value=B - Compare=0 - Compare=0 - Compare=0 - Compare=3 - Flags=00000011 -end -item: If/While Statement - Variable=DISPLAY - Value=Start Installation -end -item: Set Variable - Variable=SUMMARY - Value=Install directory: %MAINDIR%%CRLF% -end -item: Remark -end -item: If/While Statement - Variable=SELECT_ADMIN - Value=A -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Doing admin install.%CRLF% - Flags=00000001 -end -item: Else Statement -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Doing non-admin install.%CRLF% - Flags=00000001 -end -item: End Block -end -item: Remark -end -item: If/While Statement - Variable=DOBACKUP - Value=A -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Make backups, into %BACKUP%%CRLF% - Flags=00000001 -end -item: Else Statement -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Don't make backups.%CRLF% - Flags=00000001 -end -item: End Block -end -item: Remark -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Components:%CRLF% - Flags=00000001 -end -item: If/While Statement - Variable=COMPONENTS - Value=A - Flags=00000010 -end -item: Set Variable - Variable=SUMMARY - Value= Python interpreter and libraries%CRLF% - Flags=00000001 -end -item: End Block -end -item: If/While Statement - Variable=COMPONENTS - Value=B - Flags=00000010 -end -item: Set Variable - Variable=SUMMARY - Value= Tcl/Tk (Tkinter, IDLE, pydoc)%CRLF% - Flags=00000001 -end -item: End Block -end -item: If/While Statement - Variable=COMPONENTS - Value=C - Flags=00000010 -end -item: Set Variable - Variable=SUMMARY - Value= Python documentation%CRLF% - Flags=00000001 -end -item: End Block -end -item: If/While Statement - Variable=COMPONENTS - Value=D - Flags=00000010 -end -item: Set Variable - Variable=SUMMARY - Value= Tool and utility scripts%CRLF% - Flags=00000001 -end -item: End Block -end -item: If/While Statement - Variable=COMPONENTS - Value=E - Flags=00000010 -end -item: Set Variable - Variable=SUMMARY - Value= Python test suite%CRLF% - Flags=00000001 -end -item: End Block -end -item: Remark -end -item: If/While Statement - Variable=TASKS - Value=A - Flags=00000010 -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Register file extensions.%CRLF% - Flags=00000001 -end -item: Else Statement -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Don't register file extensions.%CRLF% - Flags=00000001 -end -item: End Block -end -item: Remark -end -item: If/While Statement - Variable=TASKS - Value=B - Flags=00000010 -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%Start Menu group: %GROUP%%CRLF% - Flags=00000001 -end -item: Else Statement -end -item: Set Variable - Variable=SUMMARY - Value=%CRLF%No Start Menu shortcuts.%CRLF% - Flags=00000001 -end -item: End Block -end -item: End Block -end -item: Remark -end -item: Custom Dialog Set - Name=Select Destination Directory - Display Variable=DISPLAY - item: Dialog - Title=%APPTITLE% Installation - Title French=Installation de %APPTITLE% - Title German=Installation von %APPTITLE% - Title Spanish=Instalación de %APPTITLE% - Title Italian=Installazione di %APPTITLE% - Width=339 - Height=280 - Font Name=Helv - Font Size=8 - item: Push Button - Rectangle=188 234 244 253 - Variable=DIRECTION - Value=N - Create Flags=01010000000000010000000000000001 - Text=&Next > - Text French=&Suite > - Text German=&Weiter > - Text Spanish=&Siguiente > - Text Italian=&Avanti > - end - item: Push Button - Rectangle=264 234 320 253 - Action=3 - Create Flags=01010000000000010000000000000000 - Text=&Cancel - Text French=&Annuler - Text German=&Abbrechen - Text Spanish=&Cancelar - Text Italian=&Annulla - end - item: Static - Rectangle=10 225 320 226 - Action=3 - Create Flags=01010000000000000000000000000111 - end - item: Static - Rectangle=108 11 323 33 - Create Flags=01010000000000000000000000000000 - Flags=0000000000000001 - Name=Times New Roman - Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18 - Text=Select Destination Directory - Text French=Sélectionner le répertoire de destination - Text German=Zielverzeichnis wählen - Text Spanish=Seleccione el directorio de destino - Text Italian=Selezionare Directory di destinazione - end - item: Listbox - Rectangle=108 58 321 219 - Variable=MAINDIR - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000100000010000000101000001 - Flags=0000110000001010 - Text=%MAINDIR% - Text= - end - item: Static - Rectangle=108 40 313 58 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000000000000000000000 - Text=Please select a directory for the %APPTITLE% files. - end - end - item: Dialog - Title=Select Destination Directory - Title French=Sélectionner le répertoire de destination - Title German=Zielverzeichnis wählen - Title Spanish=Seleccione el directorio de destino - Title Italian=Selezionare Directory di destinazione - Width=276 - Height=216 - Font Name=Helv - Font Size=8 - item: Listbox - Rectangle=6 6 204 186 - Variable=MAINDIR - Create Flags=01010000100000010000000101000000 - Flags=0000110000100010 - Text=%MAINDIR% - Text French=%MAINDIR% - Text German=%MAINDIR% - Text Spanish=%MAINDIR% - Text Italian=%MAINDIR% - end - item: Push Button - Rectangle=209 8 265 26 - Create Flags=01010000000000010000000000000001 - Text=OK - Text French=OK - Text German=OK - Text Spanish=Aceptar - Text Italian=OK - end - item: Push Button - Rectangle=209 31 265 50 - Variable=MAINDIR - Value=%MAINDIR_SAVE% - Create Flags=01010000000000010000000000000000 - Flags=0000000000000001 - Text=Cancel - Text French=Annuler - Text German=Abbrechen - Text Spanish=Cancelar - Text Italian=Annulla - end - end -end -item: Custom Dialog Set - Name=Backup Replaced Files - Display Variable=DISPLAY - item: Dialog - Title=%APPTITLE% Installation - Title French=Fichiers de Sauvegarde Remplacés - Title German=Sicherungskopie von ersetzten Dateien erstellen - Title Portuguese=Ficheiros substituídos de segurança - Title Spanish=Copias de seguridad de los archivos reemplazados - Title Italian=Backup file sostituiti - Title Danish=Sikkerhedskopiering af erstattede filer - Title Dutch=Vervangen bestanden kopiëren - Title Norwegian=Sikkerhetskopiere erstattede filer - Title Swedish=Säkerhetskopiera utbytta filer - Width=350 - Height=280 - Font Name=Helv - Font Size=8 - item: Push Button - Rectangle=188 234 244 251 - Variable=DIRECTION - Value=N - Create Flags=01010000000000010000000000000001 - Text=&Next > - Text French=&Suivant> - Text German=&Weiter> - Text Portuguese=&Próximo> - Text Spanish=&Siguiente > - Text Italian=&Avanti > - Text Danish=&Næste> - Text Dutch=&Volgende> - Text Norwegian=&Neste> - Text Swedish=&Nästa > - end - item: Push Button - Rectangle=131 234 188 251 - Variable=DIRECTION - Value=B - Create Flags=01010000000000010000000000000000 - Text=< &Back - Text French=<&Retour - Text German=<&Zurück - Text Portuguese=<&Retornar - Text Spanish=<&Retroceder - Text Italian=< &Indietro - Text Danish=<&Tilbage - Text Dutch=<&Terug - Text Norwegian=<&Tilbake - Text Swedish=< &Tillbaka - end - item: Push Button - Rectangle=278 234 330 251 - Action=3 - Create Flags=01010000000000010000000000000000 - Text=Cancel - Text French=Annuler - Text German=Abbrechen - Text Portuguese=Cancelar - Text Spanish=Cancelar - Text Italian=Annulla - Text Danish=Annuller - Text Dutch=Annuleren - Text Norwegian=Avbryt - Text Swedish=Avbryt - end - item: Static - Rectangle=11 221 329 223 - Action=3 - Create Flags=01010000000000000000000000000111 - end - item: Static - Rectangle=108 46 320 98 - Create Flags=01010000000000000000000000000000 - Text=This installation program can create backup copies of all files replaced during the installation. These files will be used when the software is uninstalled and a rollback is requested. If backup copies are not created, you will only be able to uninstall the software and not roll the system back to a previous state. - Text= - Text=Do you want to create backups of replaced files? - Text French=Le programme d'installation peut créer des copies de sauvegarde de tous les fichiers remplacés pendant l'installation. Ces fichiers sont utilisés au cas où le logiciel est désinstallé et que l'on procède à la reprise du système. Si les copies de sauvegarde ne sont pas créées, on ne pourra que désinstaller le logiciel sans reprendre le système à un état précédent. Voulez-vous créer une sauvegarde des fichiers remplacés ? - Text German=Dieses Installationsprogramm kann Sicherungskopien von allen während der Installation ersetzten Dateien erstellen. Diese Dateien werden zur Rückgängigmachung der Installation und bei Anforderung eines Rollbacks verwendet. Ohne Sicherungskopien ist nur eine Rückgängigmachung der Installation möglich, nicht aber ein Rollback des Systems. Sicherungskopien der ersetzten Dateien erstellen? - Text Portuguese=Este programa de instalação pode criar cópias de segurança de todos os ficheiros substituídos durante a instalação. Estes ficheiros serão utilizados quando o programa for desinstalado e for requisitada uma retomada. Se as cópias de segurança não forem criadas, só poderá desinstalar o programa e não pode retomar um estado anterior do sistema. Deseja criar cópias de segurança dos ficheiros substituídos? - Text Spanish=Este programa de instalación puede crear copias de seguridad de todos los archivos reemplazados durante la instalación. Estos archivos se utilizarán cuando se desinstale el software y se solicite volver al estado anterior. Si no se crean copias de seguridad, únicamente podrá desinstalar el software y no podrá devolver el sistema al estado anterior. ¿Desea crear archivos de seguridad de los archivos reemplazados? - Text Italian=Questo programma di installazione può creare copie di backup di tutti i file sostituiti durante l’installazione. Questi file saranno usati quando il software sarà disinstallato e sarà richiesto un ritorno allo stato precedente. Se non crei le copie di backup, potrai solo disinstallare il software, ma non potrai riportare il sistema allo stato precedente. Vuoi creare i file di backup dei file sostituiti? - Text Danish=Dette installationsprogram kan oprette sikkerhedskopier af alle filer, som erstattes under installationen. Disse filer benyttes, når softwaren fjernes, og den tidligere systemkonfiguration genetableres. Hvis der ikke oprettes sikkerhedskopier, kan du kun fjerne den installerede software og ikke genetablere den tidligere systemkonfiguration. Vil du oprette sikkerhedskopier af filer, som erstattes? - Text Dutch=Dit installatieprogramma kan kopieën maken van alle bestanden die tijdens de installatie worden vervangen. Deze worden dan gebruikt als de software-installatie ongedaan wordt gemaakt en u het systeem wilt laten terugkeren naar de oorspronkelijke staat. Als er geen back-up kopieën worden gemaakt, kunt u de software enkel verwijderen maar het systeem niet in de oorspronkelijke staat terugbrengen. Wilt u een back-up maken van de vervangen bestanden? - Text Norwegian=Dette installasjonsprogrammet kan lage sikkerhetskopier av alle filer som blir erstattet under installasjonen. Disse filene vil tas i bruk når programvaren er avinstallert og det er behov for tilbakestilling. Hvis det ikke er laget sikkerhetskopier, kan du kun avinstallere programvaren og ikke stille systemet tilbake til tidligere status. Ønsker du å lage sikkerhetskopier av de filene som blir erstattet nå? - Text Swedish=Installationsprogrammet kan skapa säkerhetskopior av alla filer som byts ut under installationen. Dessa filer kan sedan användas när programvaran avinstalleras och du begär rollback. Om du då inte har några säkerhetskopior kan du bara avinstallera programvaran, inte återskapa systemet i dess tidigare skick. Vill du göra säkerhetskopior av de ersatta filerna? - end - item: Radio Button - Rectangle=141 106 265 136 - Variable=DOBACKUP - Create Flags=01010000000000010000000000001001 - Text=&Yes, make backups - Text=N&o, do not make backups - Text= - Text French=&Oui - Text French=N&on - Text French= - Text German=&Ja - Text German=N&ein - Text German= - Text Portuguese=&Sim - Text Portuguese=Nã&o - Text Portuguese= - Text Spanish=&Sí - Text Spanish=N&o - Text Spanish= - Text Italian=&Sì - Text Italian=N&o - Text Italian= - Text Danish=&Ja - Text Danish=&Nej - Text Danish= - Text Dutch=&Ja - Text Dutch=N&ee - Text Dutch= - Text Norwegian=&Ja - Text Norwegian=&Nei - Text Norwegian= - Text Swedish=&Ja - Text Swedish=N&ej - Text Swedish= - end - item: Static - Control Name=BACK2 - Rectangle=108 173 320 208 - Action=1 - Create Flags=01010000000000000000000000000111 - Text=Backup File Destination Directory - Text French=Répertoire de destination des fichiers de sauvegarde - Text German=Zielverzeichnis für die Sicherungsdatei - Text Portuguese=Directório de destino de ficheiro de segurança - Text Spanish=Directorio de Destino de los Archivos de Seguridad - Text Italian=Directory di destinazione dei file di backup - Text Danish=Destinationsbibliotek til sikkerhedskopier - Text Dutch=Doeldirectory backup-bestand - Text Norwegian=Målkatalog for sikkerhetskopier - Text Swedish=Katalog för säkerhetskopierade filer - end - item: Push Button - Control Name=BACK3 - Rectangle=265 185 318 203 - Variable=BACKUP_SAVE - Value=%BACKUP% - Destination Dialog=1 - Action=2 - Create Flags=01010000000000010000000000000000 - Text=B&rowse... - Text French=P&arcourir - Text German=B&lättern... - Text Portuguese=P&rocurar - Text Spanish=V&isualizar... - Text Italian=Sfoglia... - Text Danish=&Gennemse... - Text Dutch=B&laderen... - Text Norwegian=Bla igjennom - Text Swedish=&Bläddra - end - item: Static - Control Name=BACK4 - Rectangle=129 188 254 200 - Destination Dialog=2 - Create Flags=01010000000000000000000000000000 - Text=%BACKUP% - Text French=%BACKUP% - Text German=%BACKUP% - Text Portuguese=%BACKUP% - Text Spanish=%BACKUP% - Text Italian=%BACKUP% - Text Danish=%BACKUP% - Text Dutch=%BACKUP% - Text Norwegian=%BACKUP% - Text Swedish=%BACKUP% - end - item: Static - Rectangle=108 11 323 36 - Create Flags=01010000000000000000000000000000 - Flags=0000000000000001 - Name=Times New Roman - Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18 - Text=Backup Replaced Files - Text French=Sélectionner les composants - Text German=Komponenten auswählen - Text Spanish=Seleccione componentes - Text Italian=Selezionare i componenti - end - item: If/While Statement - Variable=DOBACKUP - Value=B - end - item: Set Control Attribute - Control Name=BACK3 - Operation=1 - end - item: Set Control Attribute - Control Name=BACK4 - Operation=1 - end - item: Else Statement - end - item: Set Control Attribute - Control Name=BACK3 - end - item: Set Control Attribute - Control Name=BACK4 - end - item: End Block - end - end - item: Dialog - Title=Select Destination Directory - Title French=Choisissez le répertoire de destination - Title German=Zielverzeichnis wählen - Title Portuguese=Seleccionar Directório de Destino - Title Spanish=Seleccione el Directorio de Destino - Title Italian=Seleziona Directory di destinazione - Title Danish=Vælg Destinationsbibliotek - Title Dutch=Kies Doeldirectory - Title Norwegian=Velg målkatalog - Title Swedish=Välj destinationskalatog - Width=276 - Height=216 - Font Name=Helv - Font Size=8 - item: Listbox - Rectangle=6 3 200 186 - Variable=BACKUP - Create Flags=01010000100000010000000101000000 - Flags=0000110000100010 - Text=%BACKUP% - Text= - Text French=%BACKUP% - Text French= - Text German=%BACKUP% - Text German= - Text Portuguese=%BACKUP% - Text Portuguese= - Text Spanish=%BACKUP% - Text Spanish= - Text Italian=%BACKUP% - Text Italian= - Text Danish=%BACKUP% - Text Danish= - Text Dutch=%BACKUP% - Text Dutch= - Text Norwegian=%BACKUP% - Text Norwegian= - Text Swedish=%BACKUP% - Text Swedish= - end - item: Push Button - Rectangle=209 8 265 26 - Create Flags=01010000000000010000000000000001 - Text=OK - Text French=OK - Text German=OK - Text Portuguese=OK - Text Spanish=ACEPTAR - Text Italian=OK - Text Danish=OK - Text Dutch=OK - Text Norwegian=OK - Text Swedish=OK - end - item: Push Button - Rectangle=209 31 265 50 - Variable=BACKUP - Value=%BACKUP_SAVE% - Create Flags=01010000000000010000000000000000 - Flags=0000000000000001 - Text=Cancel - Text French=Annuler - Text German=Abbrechen - Text Portuguese=Cancelar - Text Spanish=Cancelar - Text Italian=Annulla - Text Danish=Slet - Text Dutch=Annuleren - Text Norwegian=Avbryt - Text Swedish=Avbryt - end - end -end -item: Custom Dialog Set - Name=Select Components - Display Variable=DISPLAY - item: Dialog - Title=%APPTITLE% Installation - Title French=Installation de %APPTITLE% - Title German=Installation von %APPTITLE% - Title Spanish=Instalación de %APPTITLE% - Title Italian=Installazione di %APPTITLE% - Width=339 - Height=280 - Font Name=Helv - Font Size=8 - item: Push Button - Rectangle=188 234 244 253 - Variable=DIRECTION - Value=N - Create Flags=01010000000000010000000000000001 - Text=&Next > - Text French=&Suite > - Text German=&Weiter > - Text Spanish=&Siguiente > - Text Italian=&Avanti > - end - item: Push Button - Rectangle=131 234 188 253 - Variable=DIRECTION - Value=B - Create Flags=01010000000000010000000000000000 - Text=< &Back - Text French=< &Retour - Text German=< &Zurück - Text Spanish=< &Atrás - Text Italian=< &Indietro - end - item: Push Button - Rectangle=264 234 320 253 - Action=3 - Create Flags=01010000000000010000000000000000 - Text=&Cancel - Text French=&Annuler - Text German=&Abbrechen - Text Spanish=&Cancelar - Text Italian=&Annulla - end - item: Checkbox - Rectangle=108 66 313 156 - Variable=COMPONENTS - Create Flags=01010000000000010000000000000011 - Flags=0000000000000110 - Text=Python interpreter and libraries - Text=Tcl/Tk (Tkinter, IDLE, pydoc) - Text=Python HTML docs - Text=Python utility scripts (Tools/) - Text=Python test suite (Lib/test/) - Text= - Text French=Python interpreter, library and IDLE - Text French=Python HTML docs - Text French=Python utility scripts (Tools/) - Text French=Python test suite (Lib/test/) - Text French= - Text German=Python interpreter, library and IDLE - Text German=Python HTML docs - Text German=Python utility scripts (Tools/) - Text German=Python test suite (Lib/test/) - Text German= - Text Spanish=Python interpreter, library and IDLE - Text Spanish=Python HTML docs - Text Spanish=Python utility scripts (Tools/) - Text Spanish=Python test suite (Lib/test/) - Text Spanish= - Text Italian=Python interpreter, library and IDLE - Text Italian=Python HTML docs - Text Italian=Python utility scripts (Tools/) - Text Italian=Python test suite (Lib/test/) - Text Italian= - end - item: Static - Rectangle=108 45 320 63 - Create Flags=01010000000000000000000000000000 - Text=Choose which components to install by checking the boxes below. - Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous. - Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken. - Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo. - Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti. - end - item: Push Button - Rectangle=188 203 269 220 - Destination Dialog=1 - Action=2 - Enabled Color=00000000000000000000000011111111 - Create Flags=01010000000000010000000000000000 - Text=Advanced Options ... - end - item: Static - Rectangle=10 225 320 226 - Action=3 - Create Flags=01010000000000000000000000000111 - end - item: Static - Rectangle=108 10 323 43 - Create Flags=01010000000000000000000000000000 - Flags=0000000000000001 - Name=Times New Roman - Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18 - Text=Select Components - Text French=Sélectionner les composants - Text German=Komponenten auswählen - Text Spanish=Seleccione componentes - Text Italian=Selezionare i componenti - end - item: Static - Rectangle=251 180 311 193 - Variable=COMPONENTS - Value=MAINDIR - Create Flags=01010000000000000000000000000010 - end - item: Static - Rectangle=251 168 311 179 - Variable=COMPONENTS - Create Flags=01010000000000000000000000000010 - end - item: Static - Rectangle=123 168 234 181 - Create Flags=01010000000000000000000000000000 - Text=Disk Space Required: - Text French=Espace disque requis : - Text German=Notwendiger Speicherplatz: - Text Spanish=Espacio requerido en el disco: - Text Italian=Spazio su disco necessario: - end - item: Static - Rectangle=123 180 234 193 - Create Flags=01010000000000000000000000000000 - Text=Disk Space Remaining: - Text French=Espace disque disponible : - Text German=Verbleibender Speicherplatz: - Text Spanish=Espacio en disco disponible: - Text Italian=Spazio su disco disponibile: - end - item: Static - Rectangle=108 158 320 196 - Action=1 - Create Flags=01010000000000000000000000000111 - end - item: If/While Statement - Variable=DLG_EVENT_TYPE - Value=VERIFY - end - item: Remark - Text=If they're installing Tcl/Tk, Tools, or the test suite, doesn't make much sense unless they're installing Python too. - end - item: If/While Statement - Variable=COMPONENTS - Value=BDE - Flags=00001010 - end - item: If/While Statement - Variable=COMPONENTS - Value=A - Flags=00000011 - end - item: Display Message - Title=Are you sure? - Text=Installing Tcl/Tk, Tools or the test suite doesn't make much sense unless you install the Python interpreter and libraries too. - Text= - Text=Click Yes if that's really what you want. - Flags=00101101 - end - item: Remark - Text=Nothing -- just proceed to the next dialog. - end - item: Else Statement - end - item: Remark - Text=Return to the dialog. - end - item: Set Variable - Variable=DLG_EVENT_TYPE - end - item: End Block - end - item: End Block - end - item: End Block - end - item: End Block - end - end - item: Dialog - Title=Advanced Options - Width=339 - Height=213 - Font Name=Helv - Font Size=8 - item: Radio Button - Control Name=ADMIN2 - Rectangle=11 46 90 76 - Variable=SELECT_ADMIN - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000010000000000001001 - Text=Admin install - Text=Non-Admin installl - Text= - end - item: Push Button - Rectangle=188 170 244 189 - Variable=DIRECTION - Value=N - Create Flags=01010000000000010000000000000001 - Text=OK - Text French=&Suite > - Text German=&Weiter > - Text Spanish=&Siguiente > - Text Italian=&Avanti > - end - item: Static - Rectangle=5 3 326 83 - Action=1 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000000000000000000111 - end - item: Static - Control Name=ADMIN1 - Rectangle=11 11 321 45 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000000000000000000000 - Text=By default, the install records settings in the per-machine area of the registry (HKLM), and installs the Python and C runtime DLLs to %SYS32%. Choose "Non-Admin install" if you would prefer settings made in the per-user registry (HKCU), and DLLs installed in %MAINDIR%. - end - item: Static - Rectangle=5 90 326 157 - Action=1 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000000000000000000111 - end - item: Checkbox - Rectangle=11 121 243 151 - Variable=TASKS - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000010000000000000011 - Text=Register file extensions (.py, .pyw, .pyc, .pyo) - Text=Create Start Menu shortcuts - Text= - end - item: Static - Rectangle=11 103 320 121 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000000000000000000000 - Text=Choose tasks to perform by checking the boxes below. - end - item: If/While Statement - Variable=DLG_EVENT_TYPE - Value=INIT - end - item: If/While Statement - Variable=DOADMIN - Value=1 - end - item: Set Control Attribute - Control Name=ADMIN2 - end - item: Else Statement - end - item: Set Control Text - Control Name=ADMIN1 - Control Text=This section is available only if logged in to an account with Administrator privileges. - end - item: Set Control Attribute - Control Name=ADMIN2 - Operation=1 - end - item: End Block - end - item: End Block - end - end -end -item: Custom Dialog Set - Name=Select Program Manager Group - Display Variable=DISPLAY - item: Dialog - Title=%APPTITLE% Installation - Title French=Installation de %APPTITLE% - Title German=Installation von %APPTITLE% - Title Spanish=Instalación de %APPTITLE% - Title Italian=Installazione di %APPTITLE% - Width=339 - Height=280 - Font Name=Helv - Font Size=8 - item: Push Button - Rectangle=188 234 244 253 - Variable=DIRECTION - Value=N - Create Flags=01010000000000010000000000000001 - Text=&Next > - Text French=&Suite > - Text German=&Weiter > - Text Spanish=&Siguiente > - Text Italian=&Avanti > - end - item: Push Button - Rectangle=131 234 188 253 - Variable=DIRECTION - Value=B - Create Flags=01010000000000010000000000000000 - Flags=0000000000000001 - Text=< &Back - Text French=< &Retour - Text German=< &Zurück - Text Spanish=< &Atrás - Text Italian=< &Indietro - end - item: Push Button - Rectangle=264 234 320 253 - Action=3 - Create Flags=01010000000000010000000000000000 - Text=&Cancel - Text French=&Annuler - Text German=&Abbrechen - Text Spanish=&Cancelar - Text Italian=&Annulla - end - item: Static - Rectangle=10 225 320 226 - Action=3 - Create Flags=01010000000000000000000000000111 - end - item: Static - Rectangle=108 10 323 53 - Create Flags=01010000000000000000000000000000 - Flags=0000000000000001 - Name=Times New Roman - Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18 - Text=Select Start Menu Group - Text French=Sélectionner le groupe du Gestionnaire de programme - Text German=Bestimmung der Programm-Managergruppe - Text Spanish=Seleccione grupo del Administrador de programas - Text Italian=Selezionare il gruppo ProgMan - end - item: Static - Rectangle=108 35 320 65 - Create Flags=01010000000000000000000000000000 - Text=Enter the name of the Start Menu program group to which to add the %APPTITLE% icons: - Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les icônes de %APPTITLE% : - Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugefügt werden soll: - Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%: - Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a: - end - item: Combobox - Rectangle=108 56 320 219 - Variable=GROUP - Create Flags=01010000001000010000001100000001 - Flags=0000000000000001 - Text=%GROUP% - Text= - Text French=%GROUP% - Text German=%GROUP% - Text Spanish=%GROUP% - Text Italian=%GROUP% - end - end -end -item: Custom Dialog Set - Name=Start Installation - Display Variable=DISPLAY - item: Dialog - Title=%APPTITLE% Installation - Title French=Installation de %APPTITLE% - Title German=Installation von %APPTITLE% - Title Spanish=Instalación de %APPTITLE% - Title Italian=Installazione di %APPTITLE% - Width=339 - Height=280 - Font Name=Helv - Font Size=8 - item: Push Button - Rectangle=188 234 244 253 - Variable=DIRECTION - Value=N - Create Flags=01010000000000010000000000000001 - Text=&Next > - Text French=&Suite > - Text German=&Weiter > - Text Spanish=&Siguiente > - Text Italian=&Avanti > - end - item: Push Button - Rectangle=131 234 188 253 - Variable=DIRECTION - Value=B - Create Flags=01010000000000010000000000000000 - Text=< &Back - Text French=< &Retour - Text German=< &Zurück - Text Spanish=< &Atrás - Text Italian=< &Indietro - end - item: Push Button - Rectangle=264 234 320 253 - Action=3 - Create Flags=01010000000000010000000000000000 - Text=&Cancel - Text French=&Annuler - Text German=&Abbrechen - Text Spanish=&Cancelar - Text Italian=&Annulla - end - item: Static - Rectangle=10 225 320 226 - Action=3 - Create Flags=01010000000000000000000000000111 - end - item: Static - Rectangle=108 10 323 53 - Create Flags=01010000000000000000000000000000 - Flags=0000000000000001 - Name=Times New Roman - Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18 - Text=Ready to Install! - Text French=Prêt à installer ! - Text German=Installationsbereit! - Text Spanish=¡Preparado para la instalación! - Text Italian=Pronto per l'installazione! - end - item: Static - Rectangle=108 40 320 62 - Create Flags=01010000000000000000000000000000 - Text=Click the Next button to install %APPTITLE%, or the Back button to change choices: - Text French=Vous êtes maintenant prêt à installer les fichiers %APPTITLE%. - Text French= - Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation à nouveau. - Text German=Sie können %APPTITLE% nun installieren. - Text German= - Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zurück", um die Installationsinformationen neu einzugeben. - Text Spanish=Ya está listo para instalar %APPTITLE%. - Text Spanish= - Text Spanish=Presione el botón Siguiente para comenzar la instalación o presione Atrás para volver a ingresar la información para la instalación. - Text Italian=Ora è possibile installare %APPTITLE%. - Text Italian= - Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione. - end - item: Editbox - Rectangle=108 66 324 219 - Help Context=16711681 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000100000000001100011000100 - Text=%SUMMARY% - end - end -end -item: Remark -end -item: If/While Statement - Variable=DISPLAY - Value=Select Destination Directory -end -item: Remark - Text=User may have changed MAINDIR, so reset BACKUP to match. -end -item: Set Variable - Variable=BACKUP - Value=%MAINDIR%\BACKUP -end -item: End Block -end -item: Remark -end -item: End Block -end -item: Remark -end -item: Remark - Text=BEGIN WIZARD STUFF ----------------------------------------------------------------------------------------------------------------------------- -end -item: Remark - Text=When the BACKUP feature is enabled, the BACKUPDIR is initialized -end -item: If/While Statement - Variable=DOBACKUP - Value=A -end -item: Set Variable - Variable=BACKUPDIR - Value=%BACKUP% -end -item: End Block -end -item: Remark - Text=The BRANDING information is written to the INI file on the installation media. -end -item: If/While Statement - Variable=BRANDING - Value=1 -end -item: If/While Statement - Variable=DOBRAND - Value=1 -end -item: Edit INI File - Pathname=%INST%\CUSTDATA.INI - Settings=[Registration] - Settings=NAME=%NAME% - Settings=COMPANY=%COMPANY% - Settings= -end -item: End Block -end -item: End Block -end -item: Remark - Text=Begin writing to the INSTALL.LOG -end -item: Open/Close INSTALL.LOG -end -item: Remark - Text=Check free disk space calculates free disk space as well as component sizes. -end -item: Remark - Text=It should be located before all Install File actions. -end -item: Check Disk Space - Component=COMPONENTS -end -item: Remark - Text=This include script allows uninstall support -end -item: Remark - Text=Note from Tim: this is our own Uninstal.wse, a copy of Wise's except -end -item: Remark - Text=it writes to HKCU (instead of HKLM) if the user doesn't have admin privs. -end -item: Include Script - Pathname=.\Uninstal.wse -end -item: Remark - Text=Note from Tim: these seeming no-ops actually convert to short filenames. -end -item: Set Variable - Variable=COMMON - Value=%COMMON% - Flags=00010100 -end -item: Set Variable - Variable=MAINDIR - Value=%MAINDIR% - Flags=00010100 -end -item: Remark - Text=This IF/THEN/ELSE reads the correct registry entries for shortcut/icon placement -end -item: Check Configuration - Flags=10111011 -end -item: Get Registry Key Value - Variable=STARTUPDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%WIN%\Start Menu\Programs\StartUp - Value Name=StartUp - Flags=00000010 -end -item: Get Registry Key Value - Variable=DESKTOPDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%WIN%\Desktop - Value Name=Desktop - Flags=00000010 -end -item: Get Registry Key Value - Variable=STARTMENUDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%WIN%\Start Menu - Value Name=Start Menu - Flags=00000010 -end -item: Get Registry Key Value - Variable=GROUPDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%WIN%\Start Menu\Programs - Value Name=Programs - Flags=00000010 -end -item: Get Registry Key Value - Variable=CSTARTUPDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%STARTUPDIR% - Value Name=Common Startup - Flags=00000100 -end -item: Get Registry Key Value - Variable=CDESKTOPDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%DESKTOPDIR% - Value Name=Common Desktop - Flags=00000100 -end -item: Get Registry Key Value - Variable=CSTARTMENUDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%STARTMENUDIR% - Value Name=Common Start Menu - Flags=00000100 -end -item: Get Registry Key Value - Variable=CGROUPDIR - Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders - Default=%GROUPDIR% - Value Name=Common Programs - Flags=00000100 -end -item: Else Statement -end -item: Remark - Text=Note from Tim: the Wizard left this block empty! -end -item: Remark - Text=Perhaps it's only relevant on Windows 3.1. -end -item: End Block -end -item: Remark - Text=END WIZARD STUFF ----------------------------------------------------------------------------------------------------------------------------- -end -item: Remark -end -item: If/While Statement - Variable=SELECT_ADMIN - Value=B -end -item: Remark - Text=The user chose a non-admin install in "Advanced Options". -end -item: Remark - Text=This should come after the include of Uninstal.wse above, because -end -item: Remark - Text=writing uninstall info to HKCU is ineffective except under Win2K. -end -item: Set Variable - Variable=DOADMIN - Value=0 -end -item: End Block -end -item: Remark -end -item: Set Variable - Variable=CGROUP_SAVE - Value=%GROUP% -end -item: If/While Statement - Variable=TASKS - Value=B - Flags=00000010 -end -item: If/While Statement - Variable=DOADMIN - Value=1 -end -item: Set Variable - Variable=GROUP - Value=%CGROUPDIR%\%GROUP% -end -item: Else Statement -end -item: Set Variable - Variable=GROUP - Value=%GROUPDIR%\%GROUP% -end -item: End Block -end -item: End Block -end -item: Remark -end -item: Remark - Text=Long section to install files. -end -item: Remark -end -item: If/While Statement - Variable=DOADMIN - Value=1 -end -item: Set Variable - Variable=DLLDEST - Value=%SYS32% -end -item: Else Statement -end -item: Set Variable - Variable=DLLDEST - Value=%MAINDIR% -end -item: End Block -end -item: Remark -end -item: Remark - Text=Install the license even if they deselect everything <wink>. -end -item: Install File - Source=..\license - Destination=%MAINDIR%\LICENSE.txt - Flags=0000000000000010 -end -item: Install File - Source=..\readme - Destination=%MAINDIR%\README.txt - Flags=0000000000000010 -end -item: Install File - Source=..\misc\news - Destination=%MAINDIR%\NEWS.txt - Flags=0000000000000010 -end -item: Remark - Text=Icons -- always install so that the uninstaller can use them for its own display. -end -item: Install File - Source=..\pc\pycon.ico - Destination=%MAINDIR%\pycon.ico - Flags=0000000010000010 -end -item: Install File - Source=..\pc\pyc.ico - Destination=%MAINDIR%\pyc.ico - Flags=0000000010000010 -end -item: Install File - Source=..\pc\py.ico - Destination=%MAINDIR%\py.ico - Flags=0000000010000010 -end -item: Remark -end -item: Remark - Text=These arrange to (recursively!) delete all .pyc and .pyo files at uninstall time. -end -item: Remark - Text=This "does the right thing": any directories left empty at the end are removed. -end -item: Add Text to INSTALL.LOG - Text=File Tree: %MAINDIR%\*.pyc -end -item: Add Text to INSTALL.LOG - Text=File Tree: %MAINDIR%\*.pyo -end -item: Remark -end -item: Remark - Text=A: interpreter and libraries -end -item: If/While Statement - Variable=COMPONENTS - Value=A - Flags=00000010 -end -item: Remark - Text=Executables -end -item: Install File - Source=.\python.exe - Destination=%MAINDIR%\python.exe - Flags=0000000000000010 -end -item: Install File - Source=.\pythonw.exe - Destination=%MAINDIR%\pythonw.exe - Flags=0000000000000010 -end -item: Install File - Source=.\w9xpopen.exe - Destination=%MAINDIR%\w9xpopen.exe - Flags=0000000000000010 -end -item: Remark -end -item: Remark - Text=Extension module DLLs (.pyd); keep in synch with libs directory next -end -item: Install File - Source=.\_winreg.pyd - Destination=%MAINDIR%\DLLs\_winreg.pyd - Description=Extension modules - Flags=0000000000000010 -end -item: Install File - Source=.\_csv.pyd - Destination=%MAINDIR%\DLLs\_csv.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\_sre.pyd - Destination=%MAINDIR%\DLLs\_sre.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\_ssl.pyd - Destination=%MAINDIR%\DLLs\_ssl.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\_symtable.pyd - Destination=%MAINDIR%\DLLs\_symtable.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\_testcapi.pyd - Destination=%MAINDIR%\DLLs\_testcapi.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\_tkinter.pyd - Destination=%MAINDIR%\DLLs\_tkinter.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\_socket.pyd - Destination=%MAINDIR%\DLLs\_socket.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\_bsddb.pyd - Destination=%MAINDIR%\DLLs\_bsddb.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\bz2.pyd - Destination=%MAINDIR%\DLLs\bz2.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\datetime.pyd - Destination=%MAINDIR%\DLLs\datetime.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\mmap.pyd - Destination=%MAINDIR%\DLLs\mmap.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\parser.pyd - Destination=%MAINDIR%\DLLs\parser.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\pyexpat.pyd - Destination=%MAINDIR%\DLLs\pyexpat.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\select.pyd - Destination=%MAINDIR%\DLLs\select.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\unicodedata.pyd - Destination=%MAINDIR%\DLLs\unicodedata.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\winsound.pyd - Destination=%MAINDIR%\DLLs\winsound.pyd - Flags=0000000000000010 -end -item: Install File - Source=.\zlib.pyd - Destination=%MAINDIR%\DLLs\zlib.pyd - Flags=0000000000000010 -end -item: Remark -end -item: Remark - Text=Link libraries (.lib); keep in synch with DLLs above, except that the Python lib lives here. -end -item: Install File - Source=.\_winreg.lib - Destination=%MAINDIR%\libs\_winreg.lib - Description=Link library files - Flags=0000000000000010 -end -item: Install File - Source=.\_csv.lib - Destination=%MAINDIR%\libs\_csv.lib - Flags=0000000000000010 -end -item: Install File - Source=.\_sre.lib - Destination=%MAINDIR%\libs\_sre.lib - Flags=0000000000000010 -end -item: Install File - Source=.\_ssl.lib - Destination=%MAINDIR%\libs\_ssl.lib - Flags=0000000000000010 -end -item: Install File - Source=.\_symtable.lib - Destination=%MAINDIR%\libs\_symtable.lib - Flags=0000000000000010 -end -item: Install File - Source=.\_testcapi.lib - Destination=%MAINDIR%\libs\_testcapi.lib - Flags=0000000000000010 -end -item: Install File - Source=.\_tkinter.lib - Destination=%MAINDIR%\libs\_tkinter.lib - Description=Extension modules - Flags=0000000000000010 -end -item: Install File - Source=.\_socket.lib - Destination=%MAINDIR%\libs\_socket.lib - Flags=0000000000000010 -end -item: Install File - Source=.\_bsddb.lib - Destination=%MAINDIR%\libs\_bsddb.lib - Flags=0000000000000010 -end -item: Install File - Source=.\bz2.lib - Destination=%MAINDIR%\libs\bz2.lib - Flags=0000000000000010 -end -item: Install File - Source=.\datetime.lib - Destination=%MAINDIR%\libs\datetime.lib - Flags=0000000000000010 -end -item: Install File - Source=.\mmap.lib - Destination=%MAINDIR%\libs\mmap.lib - Flags=0000000000000010 -end -item: Install File - Source=.\parser.lib - Destination=%MAINDIR%\libs\parser.lib - Flags=0000000000000010 -end -item: Install File - Source=.\pyexpat.lib - Destination=%MAINDIR%\libs\pyexpat.lib - Flags=0000000000000010 -end -item: Install File - Source=.\select.lib - Destination=%MAINDIR%\libs\select.lib - Flags=0000000000000010 -end -item: Install File - Source=.\unicodedata.lib - Destination=%MAINDIR%\libs\unicodedata.lib - Flags=0000000000000010 -end -item: Install File - Source=.\winsound.lib - Destination=%MAINDIR%\libs\winsound.lib - Flags=0000000000000010 -end -item: Install File - Source=.\zlib.lib - Destination=%MAINDIR%\libs\zlib.lib - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=.\python%_pymajor_%%_pyminor_%.lib - Destination=%MAINDIR%\libs\python%_PYMAJOR_%%_PYMINOR_%.lib - Flags=0000000000000010 -end -item: Remark -end -item: Remark - Text=Main Python DLL -end -item: Remark - Text=Tell Wise it's OK to delete the Python DLL at uninstall time, -end -item: Remark - Text=despite that we (may) write it into a system directory. -end -item: Add Text to INSTALL.LOG - Text=Non-System File: -end -item: Install File - Source=.\python%_pymajor_%%_pyminor_%.dll - Destination=%DLLDEST%\python%_PYMAJOR_%%_PYMINOR_%.dll - Flags=0000000000000010 -end -item: Remark -end -item: Remark - Text=Libraries (Lib/) -end -item: Install File - Source=..\lib\*.py - Destination=%MAINDIR%\Lib - Description=Library Modules - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\bsddb\*.py - Destination=%MAINDIR%\Lib\bsddb - Description=Berkeley database package - Flags=0000000100000010 -end -item: Remark -end -item: Install File - Source=..\lib\compiler\*.py - Destination=%MAINDIR%\Lib\compiler - Description=Python compiler written in Python - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\distutils\*.py - Destination=%MAINDIR%\Lib\distutils - Description=Distribution utility modules - Flags=0000000000000010 -end -item: Install File - Source=..\lib\distutils\readme - Destination=%MAINDIR%\Lib\distutils\README.txt - Flags=0000000000000010 -end -item: Install File - Source=..\lib\distutils\command\*.py - Destination=%MAINDIR%\Lib\distutils\command - Flags=0000000000000010 -end -item: Install File - Source=..\lib\distutils\command\wininst.exe - Destination=%MAINDIR%\Lib\distutils\command\wininst.exe - Flags=0000000000000010 -end -item: Install File - Source=..\lib\distutils\command\command_template - Destination=%MAINDIR%\Lib\distutils\command\command_template - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\email\*.py - Destination=%MAINDIR%\Lib\email - Description=Library email package - Flags=0000000000000010 -end -item: Install File - Source=..\lib\email\test\*.py - Destination=%MAINDIR%\Lib\email\test - Description=email tests - Flags=0000000000000010 -end -item: Install File - Source=..\lib\email\test\data\*.txt - Destination=%MAINDIR%\Lib\email\test\data - Description=email test data - Flags=0000000000000010 -end -item: Install File - Source=..\lib\email\test\data\*.gif - Destination=%MAINDIR%\Lib\email\test\data - Description=email test data - Flags=0000000000000010 -end -item: Install File - Source=..\lib\email\test\data\*.au - Destination=%MAINDIR%\Lib\email\test\data - Description=email test data - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\encodings\*.py - Destination=%MAINDIR%\Lib\encodings - Description=Unicode encoding tables - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\lib-old\*.py - Destination=%MAINDIR%\Lib\lib-old - Description=Obsolete modules - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\lib-tk\*.py - Destination=%MAINDIR%\Lib\lib-tk - Description=Tkinter related library modules - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\logging\*.py - Destination=%MAINDIR%\Lib\logging - Description=Logging package - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\site-packages\readme - Destination=%MAINDIR%\Lib\site-packages\README.txt - Description=Site packages - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\xml\*.py - Destination=%MAINDIR%\Lib\xml - Description=XML support packages - Flags=0000000000000010 -end -item: Install File - Source=..\lib\xml\dom\*.py - Destination=%MAINDIR%\Lib\xml\dom - Flags=0000000000000010 -end -item: Install File - Source=..\lib\xml\parsers\*.py - Destination=%MAINDIR%\Lib\xml\parsers - Flags=0000000000000010 -end -item: Install File - Source=..\lib\xml\sax\*.py - Destination=%MAINDIR%\Lib\xml\sax - Flags=0000000000000010 -end -item: Remark -end -item: Remark - Text=C Include files -end -item: Install File - Source=..\include\*.h - Destination=%MAINDIR%\include - Description=Header files - Flags=0000000000000010 -end -item: Install File - Source=..\pc\pyconfig.h - Destination=%MAINDIR%\include\pyconfig.h - Description=Header files (pyconfig.h) - Flags=0000000000000010 -end -item: Remark -end -item: Remark - Text=Microsoft C runtime libraries -end -item: Install File - Source=%_SYS_%\MSVCIRT.DLL - Destination=%DLLDEST%\MSVCIRT.DLL - Description=Visual C++ Runtime DLLs - Flags=0000011000010011 -end -item: Install File - Source=%_SYS_%\MSVCRT.DLL - Destination=%DLLDEST%\MSVCRT.DLL - Description=Visual C++ Runtime DLLs - Flags=0000011000010011 -end -item: End Block -end -item: Remark -end -item: Remark - Text=B: Tcl/Tk (Tkinter, IDLE, pydoc) -end -item: If/While Statement - Variable=COMPONENTS - Value=B - Flags=00000010 -end -item: Remark - Text=Tcl/Tk -end -item: Install File - Source=..\..\%_tcldir_%\bin\*.dll - Destination=%MAINDIR%\DLLs - Description=Tcl/Tk binaries and libraries - Flags=0000000000000010 -end -item: Install File - Source=..\..\%_tcldir_%\lib\*.* - Destination=%MAINDIR%\tcl - Description=Tcl/Tk binaries and libraries - Flags=0000000100000010 -end -item: Remark -end -item: Remark - Text=IDLE -end -item: Install File - Source=..\Lib\idlelib\*.py - Destination=%MAINDIR%\Lib\idlelib - Description=Integrated DeveLopment Environment for Python - Flags=0000000000000010 -end -item: Install File - Source=..\Lib\idlelib\*.txt - Destination=%MAINDIR%\Lib\idlelib - Description=Integrated DeveLopment Environment for Python - Flags=0000000000000010 -end -item: Install File - Source=..\Lib\idlelib\*.def - Destination=%MAINDIR%\Lib\idlelib - Description=Integrated DeveLopment Environment for Python - Flags=0000000000000010 -end -item: Install File - Source=..\Lib\idlelib\Icons\* - Destination=%MAINDIR%\Lib\idlelib\Icons - Description=Integrated DeveLopment Environment for Python - Flags=0000000000000010 -end -item: Install File - Source=..\Tools\scripts\idle - Destination=%MAINDIR%\Lib\idlelib\idle.pyw - Description=IDLE bootstrap script - Flags=0000000000000010 -end -item: Remark -end -item: Remark - Text=Windows pydoc driver -end -item: Install File - Source=..\tools\scripts\*.pyw - Destination=%MAINDIR%\Tools\Scripts - Description=Windows pydoc driver - Flags=0000000000000010 -end -item: End Block -end -item: Remark -end -item: Remark - Text=C: docs -end -item: If/While Statement - Variable=COMPONENTS - Value=C - Flags=00000010 -end -item: Install File - Source=%_DOC_%\*.* - Destination=%MAINDIR%\Doc - Description=Python Documentation (HTML) - Flags=0000000100000010 -end -item: End Block -end -item: Remark -end -item: Remark - Text=D: tools -end -item: If/While Statement - Variable=COMPONENTS - Value=D - Flags=00000010 -end -item: Install File - Source=..\tools\scripts\*.py - Destination=%MAINDIR%\Tools\Scripts - Description=Utility Scripts - Flags=0000000000000010 -end -item: Install File - Source=..\tools\scripts\*.doc - Destination=%MAINDIR%\Tools\Scripts - Description=Utility Scripts - Flags=0000000000000010 -end -item: Install File - Source=..\tools\scripts\readme - Destination=%MAINDIR%\Tools\Scripts\README.txt - Description=Utility Scripts - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\tools\webchecker\*.py - Destination=%MAINDIR%\Tools\webchecker - Description=Web checker tool - Flags=0000000000000010 -end -item: Install File - Source=..\tools\webchecker\readme - Destination=%MAINDIR%\Tools\webchecker\README.txt - Description=Web checker tool - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\tools\versioncheck\*.py - Destination=%MAINDIR%\Tools\versioncheck - Description=Version checker tool - Flags=0000000000000010 -end -item: Install File - Source=..\tools\versioncheck\readme - Destination=%MAINDIR%\Tools\versioncheck\README.txt - Description=Version checker tool - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\tools\pynche\*.py - Destination=%MAINDIR%\Tools\pynche - Description=pynche color editor - Flags=0000000000000010 -end -item: Install File - Source=..\tools\pynche\*.txt - Destination=%MAINDIR%\Tools\pynche - Description=pynche color editor - Flags=0000000000000010 -end -item: Install File - Source=..\tools\pynche\x\*.txt - Destination=%MAINDIR%\Tools\pynche\X - Description=pynche color editor - X files - Flags=0000000000000010 -end -item: Install File - Source=..\tools\pynche\readme - Destination=%MAINDIR%\Tools\pynche\README.txt - Description=pynche color editor - README - Flags=0000000100000010 -end -item: Install File - Source=..\tools\pynche\pynche - Destination=%MAINDIR%\Tools\pynche\pynche.py - Description=pynche color editor - main - Flags=0000000100000010 -end -item: Install File - Source=..\tools\pynche\pynche.pyw - Destination=%MAINDIR%\Tools\pynche\pynche.pyw - Description=pynche color editor - noconsole main - Flags=0000000100000010 -end -item: Remark -end -item: Install File - Source=..\tools\i18n\*.py - Destination=%MAINDIR%\Tools\i18n - Description=Internationalization helpers - Flags=0000000000000010 -end -item: End Block -end -item: Remark -end -item: Remark - Text=E: test suite -end -item: If/While Statement - Variable=COMPONENTS - Value=E - Flags=00000010 -end -item: Install File - Source=..\lib\test\audiotest.au - Destination=%MAINDIR%\Lib\test\audiotest.au - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.uue - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.py - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.xml - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.out - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.bz2 - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.tar - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.gz - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Install File - Source=..\lib\test\*.txt - Destination=%MAINDIR%\Lib\test - Description=Python Test files - Flags=0000000000000010 -end -item: Remark -end -item: Install File - Source=..\lib\test\output\*.* - Destination=%MAINDIR%\Lib\test\output - Description=Python Test output files - Flags=0000000000000010 -end -item: End Block -end -item: Remark -end -item: Remark - Text=DONE with file copying. -end -item: Remark - Text=The rest is registry and Start Menu fiddling. -end -item: Remark -end -item: If/While Statement - Variable=COMPONENTS - Value=A - Flags=00000010 -end -item: If/While Statement - Variable=TASKS - Value=A - Flags=00000010 -end -item: Remark - Text=Register file extensions. As usual, Admin privs get in the way, but with a twist: -end -item: Remark - Text=You don't need admin privs to write to HKEY_CLASSES_ROOT *except* under Win2K. -end -item: Remark - Text=On Win2K, a user without Admin privs has to register extensions under HKCU\Software\CLASSES instead. -end -item: Remark - Text=But while you can *do* that under other flavors of Windows too, it has no useful effect except in Win2K. -end -item: Set Variable - Variable=USE_HKCR - Value=1 -end -item: Check Configuration - Flags=11110010 -end -item: If/While Statement - Variable=DOADMIN - Value=0 -end -item: Set Variable - Variable=USE_HKCR - Value=0 -end -item: End Block -end -item: End Block -end -item: If/While Statement - Variable=USE_HKCR - Value=1 -end -item: Remark - Text=File types. -end -item: Edit Registry - Total Keys=1 - Key=Python.File - New Value=Python File -end -item: Edit Registry - Total Keys=1 - Key=Python.File\shell\open\command - New Value=%MAINDIR%\python.exe "%%1" %%* -end -item: Edit Registry - Total Keys=1 - Key=Python.File\DefaultIcon - New Value=%MAINDIR%\Py.ico -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=Python.NoConFile - New Value=Python File (no console) -end -item: Edit Registry - Total Keys=1 - Key=Python.NoConFile\shell\open\command - New Value=%MAINDIR%\pythonw.exe "%%1" %%* -end -item: Edit Registry - Total Keys=1 - Key=Python.NoConFile\DefaultIcon - New Value=%MAINDIR%\Py.ico -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=Python.CompiledFile - New Value=Compiled Python File -end -item: Edit Registry - Total Keys=1 - Key=Python.CompiledFile\shell\open\command - New Value=%MAINDIR%\python.exe "%%1" %%* -end -item: Edit Registry - Total Keys=1 - Key=Python.CompiledFile\DefaultIcon - New Value=%MAINDIR%\pyc.ico -end -item: Remark -end -item: Remark - Text=File extensions. -end -item: Edit Registry - Total Keys=1 - Key=.py - New Value=Python.File -end -item: Edit Registry - Total Keys=1 - Key=.py - New Value=text/plain - Value Name=Content Type -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=.pyw - New Value=Python.NoConFile -end -item: Edit Registry - Total Keys=1 - Key=.pyw - New Value=text/plain - Value Name=Content Type -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=.pyc - New Value=Python.CompiledFile -end -item: Edit Registry - Total Keys=1 - Key=.pyo - New Value=Python.CompiledFile -end -item: Else Statement -end -item: Remark - Text=File types. -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.File - New Value=Python File - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.File\shell\open\command - New Value=%MAINDIR%\python.exe "%%1" %%* - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.File\DefaultIcon - New Value=%MAINDIR%\Py.ico - Root=1 -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.NoConFile - New Value=Python File (no console) - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.NoConFile\shell\open\command - New Value=%MAINDIR%\pythonw.exe "%%1" %%* - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.NoConFile\DefaultIcon - New Value=%MAINDIR%\Py.ico - Root=1 -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.CompiledFile - New Value=Compiled Python File - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.CompiledFile\shell\open\command - New Value=%MAINDIR%\python.exe "%%1" %%* - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.CompiledFile\DefaultIcon - New Value=%MAINDIR%\pyc.ico - Root=1 -end -item: Remark -end -item: Remark - Text=File extensions. -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\.py - New Value=Python.File - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\.py - New Value=text/plain - Value Name=Content Type - Root=1 -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\.pyw - New Value=Python.NoConFile - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\.pyw - New Value=text/plain - Value Name=Content Type - Root=1 -end -item: Remark -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\.pyc - New Value=Python.CompiledFile - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\.pyo - New Value=Python.CompiledFile - Root=1 -end -item: End Block -end -item: Remark -end -item: Remark - Text=If we're installing IDLE, also set an Edit context menu action to use IDLE, for .py and .pyw files. -end -item: If/While Statement - Variable=COMPONENTS - Value=B - Flags=00000010 -end -item: If/While Statement - Variable=USE_HKCR - Value=1 -end -item: Edit Registry - Total Keys=1 - Key=Python.NoConFile\shell\Edit with IDLE\command - New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1" -end -item: Edit Registry - Total Keys=1 - Key=Python.File\shell\Edit with IDLE\command - New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1" -end -item: Else Statement -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.NoConFile\shell\Edit with IDLE\command - New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1" - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\CLASSES\Python.File\shell\Edit with IDLE\command - New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1" - Root=1 -end -item: End Block -end -item: End Block -end -item: End Block -end -item: Remark -end -item: Remark - Text=Register Python paths. -end -item: Remark - Text=Write to HKLM for admin, else HKCU. Keep these blocks otherwise identical! -end -item: If/While Statement - Variable=DOADMIN - Value=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\CurrentVersion - Root=130 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath - New Value=%MAINDIR% - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\InstallGroup - New Value=%CGROUP_SAVE% - New Value= - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath - New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk - New Value= - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\Modules - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe - New Value=%MAINDIR%\Python.exe - Root=2 -end -item: Else Statement -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\CurrentVersion - Root=129 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath - New Value=%MAINDIR% - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\InstallGroup - New Value=%CGROUP_SAVE% - New Value= - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath - New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk - New Value= - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\Modules - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe - New Value=%MAINDIR%\Python.exe - Root=1 -end -item: End Block -end -item: End Block -end -item: Remark -end -item: Remark - Text=Registry fiddling for docs. -end -item: Remark - Text=Write to HKLM for admin, else HKCU. Keep these blocks otherwise identical! -end -item: If/While Statement - Variable=COMPONENTS - Value=C - Flags=00000010 -end -item: If/While Statement - Variable=DOADMIN - Value=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation - New Value=%MAINDIR%\Doc\index.html - Root=2 -end -item: Else Statement -end -item: Edit Registry - Total Keys=1 - Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation - New Value=%MAINDIR%\Doc\index.html - Root=1 -end -item: End Block -end -item: End Block -end -item: Remark -end -item: Remark - Text=Set the app publisher and URL entries for Win2K add/remove. -end -item: Remark - Text=It doesn't hurt on other systems. -end -item: Remark - Text=As usual, write to HKLM or HKCU depending on Admin privs. -end -item: Remark - Text=CAUTION: If you set this info on the "Windows 2000" page (step 6) of the -end -item: Remark - Text=Installation Expert, it only shows up in the "If" block below. Keep in synch! -end -item: If/While Statement - Variable=DOADMIN - Value=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=http://www.python.org/ - Value Name=HelpLink - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=PythonLabs at Zope Corporation - Value Name=Publisher - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=http://www.python.org/ - Value Name=URLInfoAbout - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%PYVER_STRING% - Value Name=DisplayVersion - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%MAINDIR%\py.ico,-0 - Value Name=DisplayIcon - Root=2 -end -item: Else Statement -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=http://www.python.org/ - Value Name=HelpLink - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=PythonLabs at Zope Corporation - Value Name=Publisher - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=http://www.python.org/ - Value Name=URLInfoAbout - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%PYVER_STRING% - Value Name=DisplayVersion - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%MAINDIR%\py.ico,-0 - Value Name=DisplayIcon - Root=1 -end -item: End Block -end -item: Remark -end -item: Remark - Text=Populate Start Menu group -end -item: If/While Statement - Variable=TASKS - Value=B - Flags=00000010 -end -item: Remark - Text=Shortcut to installer no matter what. -end -item: Create Shortcut - Source=%MAINDIR%\unwise.exe - Destination=%GROUP%\Uninstall Python.lnk - Working Directory=%MAINDIR% - Key Type=1536 - Flags=00000001 -end -item: Remark -end -item: If/While Statement - Variable=COMPONENTS - Value=A - Flags=00000010 -end -item: Create Shortcut - Source=%MAINDIR%\python.exe - Destination=%GROUP%\Python (command line).lnk - Working Directory=%MAINDIR% - Icon Pathname=%MAINDIR%\pycon.ico - Key Type=1536 - Flags=00000001 -end -item: End Block -end -item: Remark -end -item: If/While Statement - Variable=COMPONENTS - Value=B - Flags=00000010 -end -item: Create Shortcut - Source=%MAINDIR%\pythonw.exe - Destination=%GROUP%\IDLE (Python GUI).lnk - Command Options="%MAINDIR%\Lib\idlelib\idle.pyw" - Working Directory=%MAINDIR% - Key Type=1536 - Flags=00000001 -end -item: Create Shortcut - Source=%MAINDIR%\pythonw.exe - Destination=%GROUP%\Module Docs.lnk - Command Options="%MAINDIR%\Tools\Scripts\pydocgui.pyw" - Working Directory=%MAINDIR% - Key Type=1536 - Flags=00000001 -end -item: End Block -end -item: Remark -end -item: If/While Statement - Variable=COMPONENTS - Value=C - Flags=00000010 -end -item: Create Shortcut - Source=%MAINDIR%\Doc\index.html - Destination=%GROUP%\Python Manuals.lnk - Working Directory=%MAINDIR% - Key Type=1536 - Flags=00000001 -end -item: End Block -end -item: End Block -end -item: Remark -end -item: Remark - Text=I don't think we need this, but have always done it. -end -item: Self-Register OCXs/DLLs - Description=Updating System Configuration, Please Wait... -end -item: Remark -end -remarked item: Remark - Text=Don't enable "Delete in-use files". Here's what happens: -end -remarked item: Remark - Text=Install Python; uninstall Python; install Python again. Reboot the machine. -end -remarked item: Remark - Text=Now UNWISE.EXE is missing. I think this is a Wise bug, but so it goes. -end -remarked item: Add Text to INSTALL.LOG - Text=Delete in-use files: On -end -item: Remark -end -item: Wizard Block - Direction Variable=DIRECTION - Display Variable=DISPLAY - Bitmap Pathname=.\installer.bmp - X Position=9 - Y Position=10 - Filler Color=11173759 - Flags=00000011 -end -item: Custom Dialog Set - Name=Finished - Display Variable=DISPLAY - item: Dialog - Title=%APPTITLE% Installation - Title French=Installation de %APPTITLE% - Title German=Installation von %APPTITLE% - Title Spanish=Instalación de %APPTITLE% - Title Italian=Installazione di %APPTITLE% - Width=339 - Height=280 - Font Name=Helv - Font Size=8 - item: Push Button - Rectangle=188 234 244 253 - Variable=DIRECTION - Value=N - Create Flags=01010000000000010000000000000001 - Text=&Finish - Text French=&Fin - Text German=&Weiter - Text Spanish=&Terminar - Text Italian=&Fine - end - item: Push Button - Rectangle=264 234 320 253 - Variable=DISABLED - Value=! - Action=3 - Create Flags=01010000000000010000000000000000 - Text=&Cancel - Text French=&Annuler - Text German=&Abbrechen - Text Spanish=&Cancelar - Text Italian=&Annulla - end - item: Static - Rectangle=108 10 323 48 - Create Flags=01010000000000000000000000000000 - Flags=0000000000000001 - Name=Times New Roman - Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18 - Text=Installation Completed! - Text French=Installation terminée ! - Text German=Die Installation ist abgeschlossen! - Text Spanish=¡Instalación terminada! - Text Italian=Installazione completata! - end - item: Static - Rectangle=108 44 320 82 - Create Flags=01010000000000000000000000000000 - Text=%APPTITLE% has been successfully installed. - Text= - Text=Press the Finish button to exit this installation. - Text French=%APPTITLE% est maintenant installé. - Text French= - Text French=Cliquez sur le bouton Fin pour quitter l'installation. - Text German=%APPTITLE% wurde erfolgreich installiert. - Text German= - Text German=Klicken Sie auf "Weiter", um die Installation zu beenden. - Text Spanish=%APPTITLE% se ha instalado con éxito. - Text Spanish= - Text Spanish=Presione el botón Terminar para salir de esta instalación. - Text Italian=L'installazione %APPTITLE% è stata portata a termine con successo. - Text Italian= - Text Italian=Premere il pulsante Fine per uscire dall'installazione. - end - item: Static - Rectangle=10 225 320 226 - Action=3 - Create Flags=01010000000000000000000000000111 - end - item: Static - Rectangle=106 105 312 210 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000000000000000000000 - Text=Special Windows thanks to: - Text= - Text=Wise Solutions, for the use of InstallMaster 8.1. - Text= http://www.wisesolutions.com/ - Text= - Text= - Text=LettError, Erik van Blokland, for the Python for Windows graphic. - Text= http://www.letterror.com/ - Text= - Text= - Text=Mark Hammond, without whose years of freely shared Windows expertise, Python for Windows would still be Python for DOS. - end - item: Static - Rectangle=106 95 312 96 - Action=3 - Enabled Color=00000000000000001111111111111111 - Create Flags=01010000000000000000000000001001 - end - end -end -item: End Block -end -item: New Event - Name=Cancel -end -item: Remark - Text=This include script supports a rollback to preinstallation state if the user chooses to cancel before the installation is complete. -end -item: Include Script - Pathname=%_WISE_%\INCLUDE\rollback.wse -end diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index 9f2fa00..ff27052 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -1,805 +1,1772 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="pythoncore" ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" RootNamespace="pythoncore" - SccProjectName="pythoncore" - SccLocalPath=".."> + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\pythoncore" ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT" - StringPooling="TRUE" + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine=""$(SolutionDir)make_buildinfo.exe" $(ConfigurationName)" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" + OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30.pdb" - SubSystem="2" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" BaseAddress="0x1e000000" - ImportLibrary=".\./python30.lib" - TargetMachine="1"/> + ImportLibrary="$(OutDir)$(PyDllName).lib" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="make_buildinfo.exe $(ConfigurationName)"/> + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" + RuntimeLibrary="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" - AdditionalIncludeDirectories="..\Include"/> + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="getbuildinfo.o" + OutputFile="$(OutDir)\$(PyDllName).dll" + IgnoreDefaultLibraryNames="libc" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDir)$(PyDllName).lib" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\pythoncore" ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS" + InlineFunctionExpansion="0" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine=""$(SolutionDir)make_buildinfo.exe" $(ConfigurationName)" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30_d.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" + OutputFile="$(OutDir)\$(PyDllName)_d.dll" IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30_d.pdb" - SubSystem="2" + ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" BaseAddress="0x1e000000" - ImportLibrary=".\./python30_d.lib" - TargetMachine="1"/> + ImportLibrary="$(OutDir)$(PyDllName)_d.lib" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="make_buildinfo.exe $(ConfigurationName)"/> + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + Optimization="0" + InlineFunctionExpansion="0" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" + RuntimeLibrary="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" - AdditionalIncludeDirectories="..\Include"/> + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="getbuildinfo.o" + OutputFile="$(OutDir)\$(PyDllName)_d.dll" + IgnoreDefaultLibraryNames="libc" + ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDir)$(PyDllName)_d.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\pythoncore" + Name="PGInstrument|Win32" ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalOptions="/Zm200 " + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine="$(SolutionDir)make_buildinfo.exe Release" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" - LinkIncremental="1" - SuppressStartupBanner="FALSE" + OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30.pdb" - SubSystem="2" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" BaseAddress="0x1e000000" - ImportLibrary=".\./python30.lib" - TargetMachine="0"/> + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="make_buildinfo.exe $(ConfigurationName)"/> + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" + RuntimeLibrary="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" - AdditionalIncludeDirectories="..\Include"/> + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="getbuildinfo.o" + OutputFile="$(OutDir)\$(PyDllName).dll" + IgnoreDefaultLibraryNames="libc" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" + TargetMachine="17" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="./." - IntermediateDirectory=".\amd64-temp-release\pythoncore" + Name="PGUpdate|Win32" ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/Zm200 /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalOptions="/Zm200 " + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine="$(SolutionDir)make_buildinfo.exe Release" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" + OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30.pdb" - SubSystem="2" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" BaseAddress="0x1e000000" - ImportLibrary=".\./python30.lib" - TargetMachine="0"/> + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="make_buildinfo.exe $(ConfigurationName)"/> + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" + RuntimeLibrary="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" - AdditionalIncludeDirectories="..\Include"/> + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="getbuildinfo.o" + OutputFile="$(OutDir)\$(PyDllName).dll" + IgnoreDefaultLibraryNames="libc" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> <Filter - Name="zlib" - Filter=""> + Name="Include" + > + <File + RelativePath="..\Include\abstract.h" + > + </File> + <File + RelativePath="..\Include\asdl.h" + > + </File> + <File + RelativePath="..\Include\ast.h" + > + </File> + <File + RelativePath="..\Include\bitset.h" + > + </File> + <File + RelativePath="..\Include\boolobject.h" + > + </File> + <File + RelativePath="..\Include\bufferobject.h" + > + </File> + <File + RelativePath="..\Include\cellobject.h" + > + </File> + <File + RelativePath="..\Include\ceval.h" + > + </File> + <File + RelativePath="..\Include\classobject.h" + > + </File> + <File + RelativePath="..\Include\cobject.h" + > + </File> + <File + RelativePath="..\Include\code.h" + > + </File> + <File + RelativePath="..\Include\codecs.h" + > + </File> + <File + RelativePath="..\Include\compile.h" + > + </File> + <File + RelativePath="..\Include\complexobject.h" + > + </File> + <File + RelativePath="..\Include\cStringIO.h" + > + </File> + <File + RelativePath="..\Include\datetime.h" + > + </File> + <File + RelativePath="..\Include\descrobject.h" + > + </File> + <File + RelativePath="..\Include\dictobject.h" + > + </File> + <File + RelativePath="..\Include\enumobject.h" + > + </File> + <File + RelativePath="..\Include\errcode.h" + > + </File> + <File + RelativePath="..\Include\eval.h" + > + </File> + <File + RelativePath="..\Include\fileobject.h" + > + </File> + <File + RelativePath="..\Include\floatobject.h" + > + </File> + <File + RelativePath="..\Include\frameobject.h" + > + </File> + <File + RelativePath="..\Include\funcobject.h" + > + </File> + <File + RelativePath="..\Include\genobject.h" + > + </File> + <File + RelativePath="..\Include\graminit.h" + > + </File> + <File + RelativePath="..\Include\grammar.h" + > + </File> + <File + RelativePath="..\Include\import.h" + > + </File> + <File + RelativePath="..\Include\intobject.h" + > + </File> + <File + RelativePath="..\Include\intrcheck.h" + > + </File> + <File + RelativePath="..\Include\iterobject.h" + > + </File> + <File + RelativePath="..\Include\listobject.h" + > + </File> + <File + RelativePath="..\Include\longintrepr.h" + > + </File> + <File + RelativePath="..\Include\longobject.h" + > + </File> + <File + RelativePath="..\Include\marshal.h" + > + </File> + <File + RelativePath="..\Include\memoryobject.h" + > + </File> + <File + RelativePath="..\Include\metagrammar.h" + > + </File> + <File + RelativePath="..\Include\methodobject.h" + > + </File> + <File + RelativePath="..\Include\modsupport.h" + > + </File> + <File + RelativePath="..\Include\moduleobject.h" + > + </File> + <File + RelativePath="..\Include\node.h" + > + </File> + <File + RelativePath="..\Include\object.h" + > + </File> + <File + RelativePath="..\Include\objimpl.h" + > + </File> + <File + RelativePath="..\Include\opcode.h" + > + </File> + <File + RelativePath="..\Include\osdefs.h" + > + </File> + <File + RelativePath="..\Include\parsetok.h" + > + </File> + <File + RelativePath="..\Include\patchlevel.h" + > + </File> + <File + RelativePath="..\Include\pgen.h" + > + </File> + <File + RelativePath="..\Include\pgenheaders.h" + > + </File> + <File + RelativePath="..\Include\py_curses.h" + > + </File> + <File + RelativePath="..\Include\pyarena.h" + > + </File> + <File + RelativePath="..\Include\pydebug.h" + > + </File> + <File + RelativePath="..\Include\pyerrors.h" + > + </File> + <File + RelativePath="..\Include\pyexpat.h" + > + </File> + <File + RelativePath="..\Include\pyfpe.h" + > + </File> + <File + RelativePath="..\Include\pygetopt.h" + > + </File> + <File + RelativePath="..\Include\pymactoolbox.h" + > + </File> + <File + RelativePath="..\Include\pymem.h" + > + </File> + <File + RelativePath="..\Include\pyport.h" + > + </File> + <File + RelativePath="..\Include\pystate.h" + > + </File> + <File + RelativePath="..\Include\pystrcmp.h" + > + </File> + <File + RelativePath="..\Include\pystrtod.h" + > + </File> + <File + RelativePath="..\Include\Python-ast.h" + > + </File> + <File + RelativePath="..\Include\Python.h" + > + </File> + <File + RelativePath="..\Include\pythonrun.h" + > + </File> + <File + RelativePath="..\Include\pythread.h" + > + </File> + <File + RelativePath="..\Include\rangeobject.h" + > + </File> + <File + RelativePath="..\Include\setobject.h" + > + </File> + <File + RelativePath="..\Include\sliceobject.h" + > + </File> + <File + RelativePath="..\Include\stringobject.h" + > + </File> + <File + RelativePath="..\Include\structmember.h" + > + </File> + <File + RelativePath="..\Include\structseq.h" + > + </File> + <File + RelativePath="..\Include\symtable.h" + > + </File> + <File + RelativePath="..\Include\sysmodule.h" + > + </File> + <File + RelativePath="..\Include\timefuncs.h" + > + </File> + <File + RelativePath="..\Include\token.h" + > + </File> + <File + RelativePath="..\Include\traceback.h" + > + </File> + <File + RelativePath="..\Include\tupleobject.h" + > + </File> + <File + RelativePath="..\Include\ucnhash.h" + > + </File> + <File + RelativePath="..\Include\unicodeobject.h" + > + </File> + <File + RelativePath="..\Include\weakrefobject.h" + > + </File> + </Filter> + <Filter + Name="Modules" + > + <File + RelativePath="..\Modules\_bisectmodule.c" + > + </File> + <File + RelativePath="..\Modules\_codecsmodule.c" + > + </File> + <File + RelativePath="..\Modules\_collectionsmodule.c" + > + </File> + <File + RelativePath="..\Modules\_csv.c" + > + </File> + <File + RelativePath="..\Modules\_functoolsmodule.c" + > + </File> + <File + RelativePath="..\Modules\_heapqmodule.c" + > + </File> + <File + RelativePath="..\Modules\_hotshot.c" + > + </File> + <File + RelativePath="..\Modules\_localemodule.c" + > + </File> + <File + RelativePath="..\Modules\_lsprof.c" + > + </File> + <File + RelativePath="..\Modules\_randommodule.c" + > + </File> + <File + RelativePath="..\Modules\_sre.c" + > + </File> + <File + RelativePath="..\Modules\_struct.c" + > + </File> + <File + RelativePath="..\Modules\_typesmodule.c" + > + </File> + <File + RelativePath="..\Modules\_weakref.c" + > + </File> + <File + RelativePath="..\Modules\arraymodule.c" + > + </File> + <File + RelativePath="..\Modules\audioop.c" + > + </File> + <File + RelativePath="..\Modules\binascii.c" + > + </File> + <File + RelativePath="..\Modules\cmathmodule.c" + > + </File> + <File + RelativePath="..\Modules\cPickle.c" + > + </File> + <File + RelativePath="..\Modules\cStringIO.c" + > + </File> + <File + RelativePath="..\Modules\datetimemodule.c" + > + </File> + <File + RelativePath="..\Modules\errnomodule.c" + > + </File> + <File + RelativePath="..\Modules\gcmodule.c" + > + </File> + <File + RelativePath="..\Modules\imageop.c" + > + </File> + <File + RelativePath="..\Modules\itertoolsmodule.c" + > + </File> + <File + RelativePath="..\Modules\main.c" + > + </File> + <File + RelativePath="..\Modules\mathmodule.c" + > + </File> + <File + RelativePath="..\Modules\md5.c" + > + </File> + <File + RelativePath="..\Modules\md5.h" + > + </File> + <File + RelativePath="..\Modules\md5module.c" + > + </File> + <File + RelativePath="..\Modules\mmapmodule.c" + > + </File> + <File + RelativePath="..\Modules\operator.c" + > + </File> + <File + RelativePath="..\Modules\parsermodule.c" + > + </File> + <File + RelativePath="..\Modules\posixmodule.c" + > + </File> + <File + RelativePath="..\Modules\rotatingtree.c" + > + </File> <File - RelativePath="..\Modules\zlib\adler32.c"> + RelativePath="..\Modules\rotatingtree.h" + > </File> <File - RelativePath="..\Modules\zlib\compress.c"> + RelativePath="..\Modules\sha256module.c" + > </File> <File - RelativePath="..\Modules\zlib\crc32.c"> + RelativePath="..\Modules\sha512module.c" + > </File> <File - RelativePath="..\Modules\zlib\deflate.c"> + RelativePath="..\Modules\shamodule.c" + > </File> <File - RelativePath="..\Modules\zlib\gzio.c"> + RelativePath="..\Modules\signalmodule.c" + > </File> <File - RelativePath="..\Modules\zlib\infback.c"> + RelativePath="..\Modules\stropmodule.c" + > </File> <File - RelativePath="..\Modules\zlib\inffast.c"> + RelativePath="..\Modules\symtablemodule.c" + > </File> <File - RelativePath="..\Modules\zlib\inflate.c"> + RelativePath="..\Modules\threadmodule.c" + > </File> <File - RelativePath="..\Modules\zlib\inftrees.c"> + RelativePath="..\Modules\timemodule.c" + > </File> <File - RelativePath="..\Modules\zlib\trees.c"> + RelativePath="..\Modules\xxsubtype.c" + > </File> <File - RelativePath="..\Modules\zlib\uncompr.c"> + RelativePath="..\Modules\yuv.h" + > </File> <File - RelativePath="..\Modules\zlibmodule.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\zlib"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\zlib"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\zlib"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseAMD64|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\zlib"/> - </FileConfiguration> + RelativePath="..\Modules\yuvconvert.c" + > </File> <File - RelativePath="..\Modules\zlib\zutil.c"> + RelativePath="..\Modules\zipimport.c" + > </File> + <File + RelativePath="..\Modules\zlibmodule.c" + > + </File> + <Filter + Name="zlib" + > + <File + RelativePath="..\Modules\zlib\adler32.c" + > + </File> + <File + RelativePath="..\Modules\zlib\compress.c" + > + </File> + <File + RelativePath="..\Modules\zlib\crc32.c" + > + </File> + <File + RelativePath="..\Modules\zlib\crc32.h" + > + </File> + <File + RelativePath="..\Modules\zlib\deflate.c" + > + </File> + <File + RelativePath="..\Modules\zlib\deflate.h" + > + </File> + <File + RelativePath="..\Modules\zlib\gzio.c" + > + </File> + <File + RelativePath="..\Modules\zlib\infback.c" + > + </File> + <File + RelativePath="..\Modules\zlib\inffast.c" + > + </File> + <File + RelativePath="..\Modules\zlib\inffast.h" + > + </File> + <File + RelativePath="..\Modules\zlib\inffixed.h" + > + </File> + <File + RelativePath="..\Modules\zlib\inflate.c" + > + </File> + <File + RelativePath="..\Modules\zlib\inflate.h" + > + </File> + <File + RelativePath="..\Modules\zlib\inftrees.c" + > + </File> + <File + RelativePath="..\Modules\zlib\inftrees.h" + > + </File> + <File + RelativePath="..\Modules\zlib\trees.c" + > + </File> + <File + RelativePath="..\Modules\zlib\trees.h" + > + </File> + <File + RelativePath="..\Modules\zlib\uncompr.c" + > + </File> + <File + RelativePath="..\Modules\zlib\zconf.h" + > + </File> + <File + RelativePath="..\Modules\zlib\zconf.in.h" + > + </File> + <File + RelativePath="..\Modules\zlib\zlib.h" + > + </File> + <File + RelativePath="..\Modules\zlib\zutil.c" + > + </File> + <File + RelativePath="..\Modules\zlib\zutil.h" + > + </File> + </Filter> + <Filter + Name="cjkcodecs" + > + <File + RelativePath="..\Modules\cjkcodecs\_codecs_cn.c" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\_codecs_hk.c" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\_codecs_iso2022.c" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\_codecs_jp.c" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\_codecs_kr.c" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\_codecs_tw.c" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\alg_jisx0201.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\cjkcodecs.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\emu_jisx0213_2000.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\mappings_cn.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\mappings_hk.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\mappings_jisx0213_pair.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\mappings_jp.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\mappings_kr.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\mappings_tw.h" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\multibytecodec.c" + > + </File> + <File + RelativePath="..\Modules\cjkcodecs\multibytecodec.h" + > + </File> + </Filter> </Filter> - <File - RelativePath="..\Modules\_bisectmodule.c"> - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_cn.c"> - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_hk.c"> - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_iso2022.c"> - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_jp.c"> - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_kr.c"> - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_tw.c"> - </File> - <File - RelativePath="..\Modules\_codecsmodule.c"> - </File> - <File - RelativePath="..\Modules\_collectionsmodule.c"> - </File> - <File - RelativePath="..\Modules\_csv.c"> - </File> - <File - RelativePath="..\Modules\_fileio.c"> - </File> - <File - RelativePath="..\Modules\_functoolsmodule.c"> - </File> - <File - RelativePath="..\Modules\_heapqmodule.c"> - </File> - <File - RelativePath="..\Modules\_localemodule.c"> - </File> - <File - RelativePath="..\Modules\_lsprof.c"> - </File> - <File - RelativePath="..\Modules\_randommodule.c"> - </File> - <File - RelativePath="..\Modules\_sre.c"> - </File> - <File - RelativePath="..\Modules\_struct.c"> - </File> - <File - RelativePath="..\Pc\_subprocess.c"> - </File> - <File - RelativePath="..\Modules\_typesmodule.c"> - </File> - <File - RelativePath="..\Modules\_weakref.c"> - </File> - <File - RelativePath="..\Pc\_winreg.c"> - </File> - <File - RelativePath="..\Objects\abstract.c"> - </File> - <File - RelativePath="..\Parser\acceler.c"> - </File> - <File - RelativePath="..\Modules\arraymodule.c"> - </File> - <File - RelativePath="..\Python\asdl.c"> - </File> - <File - RelativePath="..\Python\ast.c"> - </File> - <File - RelativePath="..\Modules\atexitmodule.c"> - </File> - <File - RelativePath="..\Modules\audioop.c"> - </File> - <File - RelativePath="..\Modules\binascii.c"> - </File> - <File - RelativePath="..\Parser\bitset.c"> - </File> - <File - RelativePath="..\Python\bltinmodule.c"> - </File> - <File - RelativePath="..\Objects\boolobject.c"> - </File> - <File - RelativePath="..\Objects\bytes_methods.c"> - </File> - <File - RelativePath="..\Objects\bytesobject.c"> - </File> - <File - RelativePath="..\Objects\cellobject.c"> - </File> - <File - RelativePath="..\Python\ceval.c"> - </File> - <File - RelativePath="..\Objects\classobject.c"> - </File> - <File - RelativePath="..\Modules\cmathmodule.c"> - </File> - <File - RelativePath="..\Objects\cobject.c"> - </File> - <File - RelativePath="..\Python\codecs.c"> - </File> - <File - RelativePath="..\Objects\codeobject.c"> - </File> - <File - RelativePath="..\Python\compile.c"> - </File> - <File - RelativePath="..\Objects\complexobject.c"> - </File> - <File - RelativePath="..\PC\config.c"> - </File> - <File - RelativePath="..\Modules\cStringIO.c"> - </File> - <File - RelativePath="..\Modules\datetimemodule.c"> - </File> - <File - RelativePath="..\Objects\descrobject.c"> - </File> - <File - RelativePath="..\Objects\dictobject.c"> - </File> - <!--File - RelativePath="..\Objects\doubledigits.c"> - </File--> - <File - RelativePath="..\Objects\doubledigits.c"> - </File> - <File - RelativePath="..\PC\dl_nt.c"> - </File> - <File - RelativePath="..\Python\dynload_win.c"> - </File> - <File - RelativePath="..\Objects\memoryobject.c"> - </File> - <File - RelativePath="..\Objects\enumobject.c"> - </File> - <File - RelativePath="..\Modules\errnomodule.c"> - </File> - <File - RelativePath="..\Python\errors.c"> - </File> - <File - RelativePath="..\Objects\exceptions.c"> - </File> - <File - RelativePath="..\Objects\fileobject.c"> - </File> - <File - RelativePath="..\Parser\firstsets.c"> - </File> - <File - RelativePath="..\Objects\floatobject.c"> - </File> - <File - RelativePath="..\Objects\frameobject.c"> - </File> - <File - RelativePath="..\Python\frozen.c"> - </File> - <File - RelativePath="..\Objects\funcobject.c"> - </File> - <File - RelativePath="..\Python\future.c"> - </File> - <File - RelativePath="..\Modules\gcmodule.c"> - </File> - <File - RelativePath="..\Objects\genobject.c"> - </File> - <File - RelativePath="..\Python\getargs.c"> - </File> - <File - RelativePath="..\Python\getcompiler.c"> - </File> - <File - RelativePath="..\Python\getcopyright.c"> - </File> - <File - RelativePath="..\Python\getmtime.c"> - </File> - <File - RelativePath="..\Python\getopt.c"> - </File> - <File - RelativePath="..\PC\getpathp.c"> - </File> - <File - RelativePath="..\Python\getplatform.c"> - </File> - <File - RelativePath="..\Python\getversion.c"> - </File> - <File - RelativePath="..\Python\graminit.c"> - </File> - <File - RelativePath="..\Parser\grammar.c"> - </File> - <File - RelativePath="..\Parser\grammar1.c"> - </File> - <File - RelativePath="..\Python\import.c"> - </File> - <File - RelativePath="..\PC\import_nt.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Python"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Python"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Python"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseAMD64|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Python"/> - </FileConfiguration> - </File> - <File - RelativePath="..\Python\importdl.c"> - </File> - <File - RelativePath="..\Objects\iterobject.c"> - </File> - <File - RelativePath="..\Modules\itertoolsmodule.c"> - </File> - <File - RelativePath="..\Parser\listnode.c"> - </File> - <File - RelativePath="..\Objects\listobject.c"> - </File> - <File - RelativePath="..\Objects\longobject.c"> - </File> - <File - RelativePath="..\Modules\main.c"> - </File> - <File - RelativePath="..\Python\marshal.c"> - </File> - <File - RelativePath="..\Modules\mathmodule.c"> - </File> - <File - RelativePath="..\Parser\metagrammar.c"> - </File> - <File - RelativePath="..\Objects\methodobject.c"> - </File> - <File - RelativePath="..\Modules\md5module.c"> - </File> - <File - RelativePath="..\Modules\mmapmodule.c"> - </File> - <File - RelativePath="..\Python\modsupport.c"> - </File> - <File - RelativePath="..\Objects\moduleobject.c"> - </File> - <File - RelativePath="..\PC\msvcrtmodule.c"> - </File> - <File - RelativePath="..\Modules\cjkcodecs\multibytecodec.c"> - </File> - <File - RelativePath="..\Parser\myreadline.c"> - </File> - <File - RelativePath="..\Python\mysnprintf.c"> - </File> - <File - RelativePath="..\Python\mystrtoul.c"> - </File> - <File - RelativePath="..\Parser\node.c"> - </File> - <File - RelativePath="..\Objects\object.c"> - </File> - <File - RelativePath="..\Objects\obmalloc.c"> - </File> - <File - RelativePath="..\Modules\operator.c"> - </File> - <File - RelativePath="..\Parser\parser.c"> - </File> - <File - RelativePath="..\Modules\parsermodule.c"> - </File> - <File - RelativePath="..\Parser\parsetok.c"> - </File> - <File - RelativePath="..\Python\peephole.c"> - </File> - <File - RelativePath="..\Modules\posixmodule.c"> - </File> - <File - RelativePath="..\Python\pyarena.c"> - </File> - <File - RelativePath="..\Python\pyfpe.c"> - </File> - <File - RelativePath="..\Python\pystate.c"> - </File> - <File - RelativePath="..\Python\pystrcmp.c" + <Filter + Name="Objects" > - </File> - <File - RelativePath="..\Python\pystrtod.c"> - </File> - <File - RelativePath="..\Python\formatter_unicode.c"> - </File> - <File - RelativePath="..\Python\Python-ast.c"> - </File> - <File - RelativePath="..\PC\python_nt.rc"> - </File> - <File - RelativePath="..\Python\pythonrun.c"> - </File> - <File - RelativePath="..\Objects\rangeobject.c"> - </File> - <File - RelativePath="..\Modules\rotatingtree.c"> - </File> - <File - RelativePath="..\Objects\setobject.c"> - </File> - <File - RelativePath="..\Modules\sha1module.c"> - </File> - <File - RelativePath="..\Modules\sha256module.c"> - </File> - <File - RelativePath="..\Modules\sha512module.c"> - </File> - <File - RelativePath="..\Modules\signalmodule.c"> - </File> - <File - RelativePath="..\Objects\sliceobject.c"> - </File> - <File - RelativePath="..\Objects\stringobject.c"> - </File> - <File - RelativePath="..\Python\structmember.c"> - </File> - <File - RelativePath="..\Objects\structseq.c"> - </File> - <File - RelativePath="..\Python\symtable.c"> - </File> - <File - RelativePath="..\Modules\symtablemodule.c"> - </File> - <File - RelativePath="..\Python\sysmodule.c"> - </File> - <File - RelativePath="..\Python\thread.c"> - </File> - <File - RelativePath="..\Modules\threadmodule.c"> - </File> - <File - RelativePath="..\Modules\timemodule.c"> - </File> - <File - RelativePath="..\Parser\tokenizer.c"> - </File> - <File - RelativePath="..\Python\traceback.c"> - </File> - <File - RelativePath="..\Objects\tupleobject.c"> - </File> - <File - RelativePath="..\Objects\typeobject.c"> - </File> - <File - RelativePath="..\Objects\unicodectype.c"> - </File> - <File - RelativePath="..\Objects\unicodeobject.c"> - </File> - <File - RelativePath="..\Objects\weakrefobject.c"> - </File> - <File - RelativePath="..\Modules\xxsubtype.c"> - </File> - <File - RelativePath="..\Modules\yuvconvert.c"> - </File> - <File - RelativePath="..\Modules\zipimport.c"> - </File> + <File + RelativePath="..\Objects\abstract.c" + > + </File> + <File + RelativePath="..\Objects\boolobject.c" + > + </File> + <File + RelativePath="..\Objects\bufferobject.c" + > + </File> + <File + RelativePath="..\Objects\cellobject.c" + > + </File> + <File + RelativePath="..\Objects\classobject.c" + > + </File> + <File + RelativePath="..\Objects\cobject.c" + > + </File> + <File + RelativePath="..\Objects\codeobject.c" + > + </File> + <File + RelativePath="..\Objects\complexobject.c" + > + </File> + <File + RelativePath="..\Objects\stringlib\count.h" + > + </File> + <File + RelativePath="..\Objects\descrobject.c" + > + </File> + <File + RelativePath="..\Objects\dictobject.c" + > + </File> + <!--File + RelativePath="..\Objects\doubledigits.c" + > + </File--> + <File + RelativePath="..\Objects\enumobject.c" + > + </File> + <File + RelativePath="..\Objects\exceptions.c" + > + </File> + <File + RelativePath="..\Objects\stringlib\fastsearch.h" + > + </File> + <File + RelativePath="..\Objects\fileobject.c" + > + </File> + <File + RelativePath="..\Objects\stringlib\find.h" + > + </File> + <File + RelativePath="..\Objects\floatobject.c" + > + </File> + <File + RelativePath="..\Objects\frameobject.c" + > + </File> + <File + RelativePath="..\Objects\funcobject.c" + > + </File> + <File + RelativePath="..\Objects\genobject.c" + > + </File> + <File + RelativePath="..\Objects\intobject.c" + > + </File> + <File + RelativePath="..\Objects\iterobject.c" + > + </File> + <File + RelativePath="..\Objects\listobject.c" + > + </File> + <File + RelativePath="..\Objects\longobject.c" + > + </File> + <File + RelativePath="..\Objects\methodobject.c" + > + </File> + <File + RelativePath="..\Objects\moduleobject.c" + > + </File> + <File + RelativePath="..\Objects\object.c" + > + </File> + <File + RelativePath="..\Objects\obmalloc.c" + > + </File> + <File + RelativePath="..\Objects\stringlib\partition.h" + > + </File> + <File + RelativePath="..\Objects\rangeobject.c" + > + </File> + <File + RelativePath="..\Objects\setobject.c" + > + </File> + <File + RelativePath="..\Objects\sliceobject.c" + > + </File> + <File + RelativePath="..\Objects\stringobject.c" + > + </File> + <File + RelativePath="..\Objects\structseq.c" + > + </File> + <File + RelativePath="..\Objects\tupleobject.c" + > + </File> + <File + RelativePath="..\Objects\typeobject.c" + > + </File> + <File + RelativePath="..\Objects\unicodectype.c" + > + </File> + <File + RelativePath="..\Objects\unicodeobject.c" + > + </File> + <File + RelativePath="..\Objects\unicodetype_db.h" + > + </File> + <File + RelativePath="..\Objects\weakrefobject.c" + > + </File> + </Filter> + <Filter + Name="Parser" + > + <File + RelativePath="..\Parser\acceler.c" + > + </File> + <File + RelativePath="..\Parser\bitset.c" + > + </File> + <File + RelativePath="..\Parser\firstsets.c" + > + </File> + <File + RelativePath="..\Parser\grammar.c" + > + </File> + <File + RelativePath="..\Parser\grammar1.c" + > + </File> + <File + RelativePath="..\Parser\listnode.c" + > + </File> + <File + RelativePath="..\Parser\metagrammar.c" + > + </File> + <File + RelativePath="..\Parser\myreadline.c" + > + </File> + <File + RelativePath="..\Parser\node.c" + > + </File> + <File + RelativePath="..\Parser\parser.c" + > + </File> + <File + RelativePath="..\Parser\parser.h" + > + </File> + <File + RelativePath="..\Parser\parsetok.c" + > + </File> + <File + RelativePath="..\Parser\tokenizer.c" + > + </File> + <File + RelativePath="..\Parser\tokenizer.h" + > + </File> + </Filter> + <Filter + Name="PC" + > + <File + RelativePath="..\PC\_subprocess.c" + > + </File> + <File + RelativePath="..\PC\_winreg.c" + > + </File> + <File + RelativePath="..\PC\config.c" + > + </File> + <File + RelativePath="..\PC\dl_nt.c" + > + </File> + <File + RelativePath="..\PC\errmap.h" + > + </File> + <File + RelativePath="..\PC\getpathp.c" + > + </File> + <File + RelativePath="..\PC\import_nt.c" + > + </File> + <File + RelativePath="..\PC\msvcrtmodule.c" + > + </File> + <File + RelativePath="..\PC\pyconfig.h" + > + </File> + </Filter> + <Filter + Name="Python" + > + <File + RelativePath="..\Python\asdl.c" + > + </File> + <File + RelativePath="..\Python\ast.c" + > + </File> + <File + RelativePath="..\Python\atof.c" + > + </File> + <File + RelativePath="..\Python\bltinmodule.c" + > + </File> + <File + RelativePath="..\Python\ceval.c" + > + </File> + <File + RelativePath="..\Python\codecs.c" + > + </File> + <File + RelativePath="..\Python\compile.c" + > + </File> + <File + RelativePath="..\Python\dynload_win.c" + > + </File> + <File + RelativePath="..\Python\errors.c" + > + </File> + <File + RelativePath="..\Python\frozen.c" + > + </File> + <File + RelativePath="..\Python\future.c" + > + </File> + <File + RelativePath="..\Python\getargs.c" + > + </File> + <File + RelativePath="..\Python\getcompiler.c" + > + </File> + <File + RelativePath="..\Python\getcopyright.c" + > + </File> + <File + RelativePath="..\Python\getmtime.c" + > + </File> + <File + RelativePath="..\Python\getopt.c" + > + </File> + <File + RelativePath="..\Python\getplatform.c" + > + </File> + <File + RelativePath="..\Python\getversion.c" + > + </File> + <File + RelativePath="..\Python\graminit.c" + > + </File> + <File + RelativePath="..\Python\import.c" + > + </File> + <File + RelativePath="..\Python\importdl.c" + > + </File> + <File + RelativePath="..\Python\importdl.h" + > + </File> + <File + RelativePath="..\Python\marshal.c" + > + </File> + <File + RelativePath="..\Python\modsupport.c" + > + </File> + <File + RelativePath="..\Python\mysnprintf.c" + > + </File> + <File + RelativePath="..\Python\mystrtoul.c" + > + </File> + <File + RelativePath="..\Python\peephole.c" + > + </File> + <File + RelativePath="..\Python\pyarena.c" + > + </File> + <File + RelativePath="..\Python\pyfpe.c" + > + </File> + <File + RelativePath="..\Python\pystate.c" + > + </File> + <File + RelativePath="..\Python\pystrcmp.c" + > + </File> + <File + RelativePath="..\Python\pystrtod.c" + > + </File> + <File + RelativePath="..\Python\Python-ast.c" + > + </File> + <File + RelativePath="..\Python\pythonrun.c" + > + </File> + <File + RelativePath="..\Python\structmember.c" + > + </File> + <File + RelativePath="..\Python\symtable.c" + > + </File> + <File + RelativePath="..\Python\sysmodule.c" + > + </File> + <File + RelativePath="..\Python\thread.c" + > + </File> + <File + RelativePath="..\Python\thread_nt.h" + > + </File> + <File + RelativePath="..\Python\traceback.c" + > + </File> + </Filter> + <Filter + Name="Resource Files" + > + <File + RelativePath="..\PC\python_nt.rc" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/pythonw.vcproj b/PCbuild/pythonw.vcproj index d00142f..add4684 100644 --- a/PCbuild/pythonw.vcproj +++ b/PCbuild/pythonw.vcproj @@ -1,260 +1,617 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="pythonw" - SccProjectName="pythonw" - SccLocalPath="..\pc"> + ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\pythonw" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./pythonw_d.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pythonw_d.pdb" - SubSystem="2" + OutputFile="$(OutDir)\pythonw_d.exe" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1"/> + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" + RuntimeLibrary="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\pythonw_d.exe" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\pythonw" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" + StringPooling="true" RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile=".\./pythonw.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pythonw.pdb" - SubSystem="2" + OutputFile="$(OutDir)\pythonw.exe" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1"/> + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\pythonw.exe" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\pythonw" + Name="PGInstrument|Win32" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" + StringPooling="true" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - OutputFile=".\./pythonw.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pythonw.pdb" - SubSystem="2" + OutputFile="$(OutDir)\pythonw.exe" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0"/> + ImportLibrary="" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\pythonw.exe" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\pythonw" + Name="PGUpdate|Win32" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" + StringPooling="true" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - OutputFile=".\./pythonw.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./pythonw.pdb" - SubSystem="2" + OutputFile="$(OutDir)\pythonw.exe" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0"/> + ImportLibrary="" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > <Tool - Name="VCMIDLTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\pythonw.exe" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\PC\python_exe.rc"> - </File> - <File - RelativePath="..\PC\WinMain.c"> - </File> + <Filter + Name="Resource Files" + > + <File + RelativePath="..\PC\python_exe.rc" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\PC\WinMain.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 2e34312..fe264e3 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -1,31 +1,41 @@ -Building Python using VC++ 7.1 -------------------------------------- +Building Python using VC++ 9.0 +------------------------------ This directory is used to build Python for Win32 platforms, e.g. Windows -95, 98 and NT. It requires Microsoft Visual C++ 7.1 -(a.k.a. Visual Studio .NET 2003). +2000, XP and Vista. It requires Microsoft Visual C++ 9.0 +(a.k.a. Visual Studio .NET 2008). (For other Windows platforms and compilers, see ../PC/readme.txt.) -All you need to do is open the workspace "pcbuild.sln" in MSVC++, select -the Debug or Release setting (using "Solution Configuration" from -the "Standard" toolbar"), and build the projects. +All you need to do is open the workspace "pcbuild.sln" in Visual Studio, +select the desired combination of configuration and platform and eventually +build the solution. Unless you are going to debug a problem in the core or +you are going to create an optimized build you want to select "Release" as +configuration. -The proper order to build subprojects: +The PCbuild directory is compatible with all versions of Visual Studio from +VS C++ Express Edition over the standard edition up to the professional +edition. However the express edition does support features like solution +folders or profile guided optimization (PGO). The missing bits and pieces +won't stop you from building Python. -1) pythoncore (this builds the main Python DLL and library files, - python30.{dll, lib} in Release mode) +The solution is configured to build the projects in the correct order. "Build +Solution" or F6 takes care of dependencies except for x64 builds. To make +cross compiling x64 builds on a 32bit OS possible the x64 builds require a +32bit version of Python. -2) python (this builds the main Python executable, - python.exe in Release mode) -3) the other subprojects, as desired or needed (note: you probably don't - want to build most of the other subprojects, unless you're building an - entire Python distribution from scratch, or specifically making changes - to the subsystems they implement, or are running a Python core buildbot - test slave; see SUBPROJECTS below) +NOTE: + You probably don't want to build most of the other subprojects, unless + you're building an entire Python distribution from scratch, or + specifically making changes to the subsystems they implement, or are + running a Python core buildbot test slave; see SUBPROJECTS below) When using the Debug setting, the output files have a _d added to their name: python30_d.dll, python_d.exe, parser_d.pyd, and so on. +The 32bit builds end up in the solution folder PCbuild while the x64 builds +land in the amd64 subfolder. The PGI and PGO builds for profile guided +optimization end up in their own folders, too. + SUBPROJECTS ----------- These subprojects should build out of the box. Subprojects other than the @@ -54,29 +64,40 @@ unicodedata winsound play sounds (typically .wav files) under Windows -The following subprojects will generally NOT build out of the box. They +The following subprojects will generally NOT build out of the box. They wrap code Python doesn't control, and you'll need to download the base packages first and unpack them into siblings of PCbuilds's parent -directory; for example, if your PCbuild is .......\dist\src\PCbuild\, -unpack into new subdirectories of dist\. +directory; for example, if your PCbuild is ..\dist\py3k\PCbuild\, +unpack into new subdirectories of ..\dist\. _tkinter Python wrapper for the Tk windowing system. Requires building - Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.12. + Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.16. + + NOTE: The 64 build builds must land in tcltk64 instead of tcltk. Get source ---------- In the dist directory, run - svn export http://svn.python.org/projects/external/tcl8.4.12 - svn export http://svn.python.org/projects/external/tk8.4.12 + svn export http://svn.python.org/projects/external/tcl8.4.16 + svn export http://svn.python.org/projects/external/tk8.4.16 svn export http://svn.python.org/projects/external/tix-8.4.0 - Build Tcl first (done here w/ MSVC 7.1 on Windows XP) + Build with build_tkinter.py + --------------------------- + The PCbuild directory contains a Python script which automates all + steps. Run the script in a Visual Studio 2009 command prompt with + + python build_tkinter.py Win32 + + Use x64 instead of Win32 for the x64 platform. + + Build Tcl first --------------- - Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003 - -> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt" + Use "Start -> All Programs -> Microsoft Visual Studio 2008 + -> Visual Studio Tools -> Visual Studio 2008 Command Prompt" to get a shell window with the correct environment settings - cd dist\tcl8.4.12\win + cd dist\tcl8.4.16\win nmake -f makefile.vc nmake -f makefile.vc INSTALLDIR=..\..\tcltk install @@ -91,9 +112,9 @@ _tkinter Build Tk -------- - cd dist\tk8.4.12\win - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install + cd dist\tk8.4.16\win + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.16 + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install XXX Should we compile with OPTS=threads? @@ -101,7 +122,7 @@ _tkinter XXX directory. Is all of that really needed for Python use of Tcl/Tk? Optional: run tests, via - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 test + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.16 test On WinXP Pro, wholly up to date as of 30-Aug-2004: all.tcl: Total 8420 Passed 6826 Skipped 1581 Failed 13 @@ -111,8 +132,8 @@ _tkinter Built Tix --------- cd dist\tix-8.4.0\win - nmake -f python.mak - nmake -f python.mak install + nmake -f python9.mak + nmake -f python9.mak install bz2 Python wrapper for the libbz2 compression library. Homepage @@ -129,28 +150,25 @@ bz2 bzip2-1.0.3\ when you do a clean, so if you want to rebuild bzip2.lib you need to clean up bzip2-1.0.3\ by hand. - The build step shouldn't yield any warnings or errors, and should end - by displaying 6 blocks each terminated with - FC: no differences encountered - - All of this managed to build bzip2-1.0.3\libbz2.lib, which the Python - project links in. + All of this managed to build libbz2.lib in + bzip2-1.0.3\$platform-$configuration\, which the Python project links in. _bsddb To use the version of bsddb that Python is built with by default, invoke (in the dist directory) - svn export http://svn.python.org/projects/external/db-4.4.20 - - - Then open a VS.NET 2003 shell, and invoke: - - devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static + svn export http://svn.python.org/projects/external/db-4.4.20 - and do that a second time for a Debug build too: - - devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static + Next open the solution file db-4.4.20\build_win32\Berkeley_DB.sln with + Visual Studio and convert the projects to the new format. The standard + and professional version of VS 2008 builds the necessary libraries + in a pre-link step of _bsddb. However the express edition is missing + some pieces and you have to build the libs yourself. + + The _bsddb subprojects depends only on the db_static project of + Berkeley DB. You have to choose either "Release", "Release AMD64", "Debug" + or "Debug AMD64" as configuration. Alternatively, if you want to start with the original sources, go to Sleepycat's download page: @@ -168,7 +186,7 @@ _bsddb Now apply any patches that apply to your version. Open - dist\db-4.4.20\docs\index.html + db-4.4.20\docs\ref\build_win\intro.html and follow the "Windows->Building Berkeley DB with Visual C++ .NET" instructions for building the Sleepycat @@ -178,40 +196,6 @@ _bsddb To run extensive tests, pass "-u bsddb" to regrtest.py. test_bsddb3.py is then enabled. Running in verbose mode may be helpful. - XXX The test_bsddb3 tests don't always pass, on Windows (according to - XXX me) or on Linux (according to Barry). (I had much better luck - XXX on Win2K than on Win98SE.) The common failure mode across platforms - XXX is - XXX DBAgainError: (11, 'Resource temporarily unavailable -- unable - XXX to join the environment') - XXX - XXX and it appears timing-dependent. On Win2K I also saw this once: - XXX - XXX test02_SimpleLocks (bsddb.test.test_thread.HashSimpleThreaded) ... - XXX Exception in thread reader 1: - XXX Traceback (most recent call last): - XXX File "C:\Code\python\lib\threading.py", line 411, in __bootstrap - XXX self.run() - XXX File "C:\Code\python\lib\threading.py", line 399, in run - XXX self.__target(*self.__args, **self.__kwargs) - XXX File "C:\Code\python\lib\bsddb\test\test_thread.py", line 268, in - XXX readerThread - XXX rec = c.next() - XXX DBLockDeadlockError: (-30996, 'DB_LOCK_DEADLOCK: Locker killed - XXX to resolve a deadlock') - XXX - XXX I'm told that DBLockDeadlockError is expected at times. It - XXX doesn't cause a test to fail when it happens (exceptions in - XXX threads are invisible to unittest). - - Building for Win64: - - open a VS.NET 2003 command prompt - - run the SDK setenv.cmd script, passing /RETAIL and the target - architecture (/SRV64 for Itanium, /X64 for AMD64) - - build BerkeleyDB with the solution configuration matching the - target ("Release IA64" for Itanium, "Release AMD64" for AMD64), e.g. - devenv db-4.4.20\build_win32\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv - _sqlite3 Python wrapper for SQLite library. @@ -220,22 +204,35 @@ _sqlite3 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 To use the extension module in a Python build tree, copy sqlite3.dll into - the PCbuild folder. + the PCbuild folder. The source directory in svn also contains a .def file + from the binary release of sqlite3. _ssl Python wrapper for the secure sockets library. Get the source code through - svn export http://svn.python.org/projects/external/openssl-0.9.8a + svn export http://svn.python.org/projects/external/openssl-0.9.8g Alternatively, get the latest version from http://www.openssl.org. You can (theoretically) use any version of OpenSSL you like - the build process will automatically select the latest version. - You must also install ActivePerl from + You must install the NASM assembler from + http://www.kernel.org/pub/software/devel/nasm/binaries/win32/ + for x86 builds. Put nasmw.exe anywhere in your PATH. + + You can also install ActivePerl from http://www.activestate.com/Products/ActivePerl/ - as this is used by the OpenSSL build process. Complain to them <wink>. + if you like to use the official sources instead of the files from + python's subversion repository. The svn version contains pre-build + makefiles and assembly files. + + The build process makes sure that no patented algorithms are included. + For now RC5, MDC2 and IDEA are excluded from the build. You may have + to manually remove $(OBJ_D)\i_*.obj from ms\nt.mak if the build process + complains about missing files or forbidden IDEA. Again the files provided + in the subversion repository are already fixed. The MSVC project simply invokes PCBuild/build_ssl.py to perform the build. This Python script locates and builds your OpenSSL @@ -255,6 +252,10 @@ _ssl Building for Itanium -------------------- +NOTE: +Official support for Itanium builds have been dropped from the build. Please +contact as and provide patches if you are interested in Itanium builds. + The project files support a ReleaseItanium configuration which creates Win64/Itanium binaries. For this to work, you need to install the Platform SDK, in particular the 64-bit support. This includes an Itanium compiler @@ -267,158 +268,67 @@ accordingly. The project files require atleast version 0.9. Building for AMD64 ------------------ -The build process for the ReleaseAMD64 configuration is very similar -to the Itanium configuration; make sure you use the latest version of -vsextcomp. +The build process for AMD64 / x64 is very similar to standard builds. You just +have to set x64 as platform. Building Python Using the free MS Toolkit Compiler -------------------------------------------------- -The build process for Visual C++ can be used almost unchanged with the free MS -Toolkit Compiler. This provides a way of building Python using freely -available software. - -Note that Microsoft have withdrawn the free MS Toolkit Compiler, so this can -no longer be considered a supported option. The instructions are still -correct, but you need to already have a copy of the compiler in order to use -them. Microsoft now supply Visual C++ 2005 Express Edition for free, but this -is NOT compatible with Visual C++ 7.1 (it uses a different C runtime), and so -cannot be used to build a version of Python compatible with the standard -python.org build. If you are interested in using Visual C++ 2005 Express -Edition, however, you should look at the PCBuild8 directory. - -Requirements - - To build Python, the following tools are required: - - * The Visual C++ Toolkit Compiler - no longer available for download - see above - * A recent Platform SDK - from http://www.microsoft.com/downloads/details.aspx?FamilyID=484269e2-3b89-47e3-8eb7-1f2be6d7123a - * The .NET 1.1 SDK - from http://www.microsoft.com/downloads/details.aspx?FamilyID=9b3a2ca6-3647-4070-9f41-a333c6b9181d - - [Does anyone have better URLs for the last 2 of these?] - - The toolkit compiler is needed as it is an optimising compiler (the - compiler supplied with the .NET SDK is a non-optimising version). The - platform SDK is needed to provide the Windows header files and libraries - (the Windows 2003 Server SP1 edition, typical install, is known to work - - other configurations or versions are probably fine as well). The .NET 1.1 - SDK is needed because it contains a version of msvcrt.dll which links to - the msvcr71.dll CRT. Note that the .NET 2.0 SDK is NOT acceptable, as it - references msvcr80.dll. - - All of the above items should be installed as normal. - - If you intend to build the openssl (needed for the _ssl extension) you - will need the C runtime sources installed as part of the platform SDK. - - In addition, you will need Nant, available from - http://nant.sourceforge.net. The 0.85 release candidate 3 version is known - to work. This is the latest released version at the time of writing. Later - "nightly build" versions are known NOT to work - it is not clear at - present whether future released versions will work. - -Setting up the environment - - Start a platform SDK "build environment window" from the start menu. The - "Windows XP 32-bit retail" version is known to work. - - Add the following directories to your PATH: - * The toolkit compiler directory - * The SDK "Win64" binaries directory - * The Nant directory - Add to your INCLUDE environment variable: - * The toolkit compiler INCLUDE directory - Add to your LIB environment variable: - * The toolkit compiler LIB directory - * The .NET SDK Visual Studio 2003 VC7\lib directory - - The following commands should set things up as you need them: - - rem Set these values according to where you installed the software - set TOOLKIT=C:\Program Files\Microsoft Visual C++ Toolkit 2003 - set SDK=C:\Program Files\Microsoft Platform SDK - set NET=C:\Program Files\Microsoft Visual Studio .NET 2003 - set NANT=C:\Utils\Nant - - set PATH=%TOOLKIT%\bin;%PATH%;%SDK%\Bin\win64;%NANT%\bin - set INCLUDE=%TOOLKIT%\include;%INCLUDE% - set LIB=%TOOLKIT%\lib;%NET%\VC7\lib;%LIB% - - The "win64" directory from the SDK is added to supply executables such as - "cvtres" and "lib", which are not available elsewhere. The versions in the - "win64" directory are 32-bit programs, so they are fine to use here. - - That's it. To build Python (the core only, no binary extensions which - depend on external libraries) you just need to issue the command - - nant -buildfile:python.build all - - from within the PCBuild directory. - -Extension modules - - To build those extension modules which require external libraries - (_tkinter, bz2, _bsddb, _sqlite3, _ssl) you can follow the instructions - for the Visual Studio build above, with a few minor modifications. These - instructions have only been tested using the sources in the Python - subversion repository - building from original sources should work, but - has not been tested. - - For each extension module you wish to build, you should remove the - associated include line from the excludeprojects section of pc.build. - - The changes required are: - - _tkinter - The tix makefile (tix-8.4.0\win\makefile.vc) must be modified to - remove references to TOOLS32. The relevant lines should be changed to - read: - cc32 = cl.exe - link32 = link.exe - include32 = - The remainder of the build instructions will work as given. - - bz2 - No changes are needed - - _bsddb - The file db.build should be copied from the Python PCBuild directory - to the directory db-4.4.20\build_win32. - - The file db_static.vcproj in db-4.4.20\build_win32 should be edited to - remove the string "$(SolutionDir)" - this occurs in 2 places, only - relevant for 64-bit builds. (The edit is required as otherwise, nant - wants to read the solution file, which is not in a suitable form). - - The bsddb library can then be build with the command - nant -buildfile:db.build all - run from the db-4.4.20\build_win32 directory. - - _sqlite3 - No changes are needed. However, in order for the tests to succeed, a - copy of sqlite3.dll must be downloaded, and placed alongside - python.exe. - - _ssl - The documented build process works as written. However, it needs a - copy of the file setargv.obj, which is not supplied in the platform - SDK. However, the sources are available (in the crt source code). To - build setargv.obj, proceed as follows: - - Copy setargv.c, cruntime.h and internal.h from %SDK%\src\crt to a - temporary directory. - Compile using "cl /c /I. /MD /D_CRTBLD setargv.c" - Copy the resulting setargv.obj to somewhere on your LIB environment - (%SDK%\lib is a reasonable place). - - With setargv.obj in place, the standard build process should work - fine. +Microsoft has withdrawn the free MS Toolkit Compiler, so this can no longer +be considered a supported option. Instead you can use the free VS C++ Express +Edition. + +Profile Guided Optimization +--------------------------- + +The solution has two configurations for PGO. The PGInstrument configuration +must be build first. The PGInstrument binaries are lniked against a profiling +library and contain extra debug information. The PGUpdate configuration takes the profiling data and generates optimized binaries. + +The build_pgo.bat script automates the creation of optimized binaries. It +creates the PGI files, runs the unit test suite or PyBench with the PGI +python and finally creates the optimized files. + +http://msdn2.microsoft.com/en-us/library/e7k32f4k(VS.90).aspx + +Static library +-------------- + +The solution has no configuration for static libraries. However it is easy +it build a static library instead of a DLL. You simply have to set the +"Configuration Type" to "Static Library (.lib)" and alter the preprocessor +macro "Py_ENABLE_SHARED" to "Py_NO_ENABLE_SHARED". You may also have to +change the "Runtime Library" from "Multi-threaded DLL (/MD)" to +"Multi-threaded (/MT)". + +Visual Studio properties +------------------------ + +The PCbuild solution makes heavy use of Visual Studio property files +(*.vsprops). The properties can be viewed and altered in the Property +Manager (View -> Other Windows -> Property Manager). + + * debug (debug macro: _DEBUG) + * pginstrument (PGO) + * pgupdate (PGO) + +-- pginstrument + * pyd (python extension, release build) + +-- release + +-- pyproject + * pyd_d (python extension, debug build) + +-- debug + +-- pyproject + * pyproject (base settings for all projects, user macros like PyDllName) + * release (release macro: NDEBUG) + * x64 (AMD64 / x64 platform specific settings) + +The pyproject propertyfile defines _WIN32 and x64 defines _WIN64 and _M_X64 +although the macros are set by the compiler, too. The GUI doesn't always know +about the macros and confuse the user with false information. YOUR OWN EXTENSION DLLs ----------------------- + If you want to create your own extension module DLL, there's an example with easy-to-follow instructions in ../PC/example/; read the file readme.txt there first. diff --git a/PCbuild/release.vsprops b/PCbuild/release.vsprops new file mode 100644 index 0000000..4bbda68 --- /dev/null +++ b/PCbuild/release.vsprops @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="release" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="NDEBUG" + /> +</VisualStudioPropertySheet> diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat index 8e386c5..8e386c5 100755..100644 --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj index 615cc0f..b97cb4d 100644 --- a/PCbuild/select.vcproj +++ b/PCbuild/select.vcproj @@ -1,257 +1,536 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="select" - SccProjectName="select" - SccLocalPath=".."> + ProjectGUID="{18CAE28C-B454-46C1-87A0-493D91D97F03}" + RootNamespace="select" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\select" + Name="Debug|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" - OutputFile="./select.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./select.pdb" - SubSystem="2" BaseAddress="0x1D110000" - ImportLibrary=".\./select.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCLinkerTool" + AdditionalDependencies="wsock32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\select" + Name="Release|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" - OutputFile="./select_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc,msvcrt" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./select_d.pdb" - SubSystem="2" + IgnoreDefaultLibraryNames="libc" BaseAddress="0x1D110000" - ImportLibrary=".\./select_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="wsock32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\select" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="wsock32.lib" - OutputFile="./select.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./select.pdb" - SubSystem="2" BaseAddress="0x1D110000" - ImportLibrary=".\./select.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCLinkerTool" + AdditionalDependencies="wsock32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" + TargetMachine="17" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\select" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="wsock32.lib" - OutputFile="./select.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./select.pdb" - SubSystem="2" BaseAddress="0x1D110000" - ImportLibrary=".\./select.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="wsock32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\selectmodule.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\selectmodule.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/unicodedata.vcproj b/PCbuild/unicodedata.vcproj index cc23da1..084161af 100644 --- a/PCbuild/unicodedata.vcproj +++ b/PCbuild/unicodedata.vcproj @@ -1,246 +1,532 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="unicodedata" - SccProjectName="unicodedata" - SccLocalPath=".."> + ProjectGUID="{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" + RootNamespace="unicodedata" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\unicodedata" + Name="Debug|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./unicodedata.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./unicodedata.pdb" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\unicodedata" + Name="Release|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./unicodedata_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./unicodedata_d.pdb" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\unicodedata" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - OutputFile="./unicodedata.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./unicodedata.pdb" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\unicodedata" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - OutputFile="./unicodedata.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./unicodedata.pdb" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\Modules\unicodedata.c"> - </File> + <Filter + Name="Header Files" + > + <File + RelativePath="..\Modules\unicodedata_db.h" + > + </File> + <File + RelativePath="..\Modules\unicodename_db.h" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\unicodedata.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/w9xpopen.vcproj b/PCbuild/w9xpopen.vcproj index 9015500..9fcff7b 100644 --- a/PCbuild/w9xpopen.vcproj +++ b/PCbuild/w9xpopen.vcproj @@ -1,120 +1,575 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="w9xpopen" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" + RootNamespace="w9xpopen" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\w9xpopen" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3"/> + RuntimeLibrary="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile="./w9xpopen_d.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./w9xpopen_d.pdb" - TargetMachine="1"/> + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCCLCompilerTool" + Optimization="0" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\w9xpopen" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="false" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE"/> + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - OutputFile=".\./w9xpopen.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./w9xpopen.pdb" - TargetMachine="1"/> + GenerateDebugInformation="false" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="false" + SubSystem="1" + ImportLibrary="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="false" + SubSystem="1" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="false" + SubSystem="1" + ImportLibrary="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="false" + SubSystem="1" + ImportLibrary="" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\PC\w9xpopen.c"> - </File> + <Filter + Name="Source Files" + > + <File + RelativePath="..\PC\w9xpopen.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/winsound.vcproj b/PCbuild/winsound.vcproj index 6736ad7..b6da131 100644 --- a/PCbuild/winsound.vcproj +++ b/PCbuild/winsound.vcproj @@ -1,250 +1,522 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="winsound" - SccProjectName="winsound" - SccLocalPath="..\pc"> + ProjectGUID="{28B5D777-DDF2-4B6B-B34F-31D938813856}" + RootNamespace="winsound" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\winsound" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd_d.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib" - OutputFile="./winsound_d.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./winsound_d.pdb" - BaseAddress="0x1D160000" - ImportLibrary=".\./winsound_d.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\winsound" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib" - OutputFile="./winsound.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./winsound.pdb" - BaseAddress="0x1D160000" - ImportLibrary=".\./winsound.lib" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\winsound" + Name="PGInstrument|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="winmm.lib" - OutputFile="./winsound.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./winsound.pdb" - BaseAddress="0x1D160000" - ImportLibrary=".\./winsound.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\winsound" + Name="PGUpdate|Win32" ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" - StringPooling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="winmm.lib" - OutputFile="./winsound.pyd" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\./winsound.pdb" - BaseAddress="0x1D160000" - ImportLibrary=".\./winsound.lib" - TargetMachine="0"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" + TargetMachine="17" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCResourceCompilerTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\PC\winsound.c"> - </File> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\PC\winsound.c" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild/x64.vsprops b/PCbuild/x64.vsprops new file mode 100644 index 0000000..c7eabbe --- /dev/null +++ b/PCbuild/x64.vsprops @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="amd64" + OutputDirectory="$(SolutionDir)\amd64\" + IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\" + > + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/USECL:MS_OPTERON /GS-" + PreprocessorDefinitions="_WIN64;_M_X64" + /> + <Tool + Name="VCLinkerTool" + TargetMachine="17" + /> +</VisualStudioPropertySheet> |