traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update VS8.0 build files, using the script vs9to8.py. 

Also remove references to odbc libraries, which are not shipped with vs2003 express.
(and certainly not useful)
This commit is contained in:
Amaury Forgeot d'Arc 2008-06-12 21:58:20 +00:00
parent 3511388315
commit 6fd3321d6c
14 changed files with 498 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PC/VS8.0/_bsddb.vcproj
View File

@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -103,7 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -166,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -292,7 +292,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -355,7 +355,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -418,7 +418,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -481,7 +481,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"

408
PC/VS8.0/_bsddb44.vcproj
View File

File diff suppressed because it is too large Load Diff

8
PC/VS8.0/_elementtree.vcproj
View File

@ -56,7 +56,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -119,7 +118,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -182,7 +180,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -246,7 +243,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -309,7 +305,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -373,7 +368,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
@ -437,7 +431,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -501,7 +494,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>

16
PC/VS8.0/_sqlite3.vcproj
View File

@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
@ -166,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
@ -354,7 +354,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
@ -417,7 +417,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
@ -480,7 +480,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool

178
PC/VS8.0/kill_python.c Normal file
View File

@ -0,0 +1,178 @@
/*
* Helper program for killing lingering python[_d].exe processes before
* building, thus attempting to avoid build failures due to files being
* locked.
*/
#include <windows.h>
#include <wchar.h>
#include <tlhelp32.h>
#include <stdio.h>
#pragma comment(lib, "psapi")
#ifdef _DEBUG
#define PYTHON_EXE (L"python_d.exe")
#define PYTHON_EXE_LEN (12)
#define KILL_PYTHON_EXE (L"kill_python_d.exe")
#define KILL_PYTHON_EXE_LEN (17)
#else
#define PYTHON_EXE (L"python.exe")
#define PYTHON_EXE_LEN (10)
#define KILL_PYTHON_EXE (L"kill_python.exe")
#define KILL_PYTHON_EXE_LEN (15)
#endif
int
main(int argc, char **argv)
{
HANDLE hp, hsp, hsm; /* process, snapshot processes, snapshot modules */
DWORD dac, our_pid;
size_t len;
wchar_t path[MAX_PATH+1];
MODULEENTRY32W me;
PROCESSENTRY32W pe;
me.dwSize = sizeof(MODULEENTRY32W);
pe.dwSize = sizeof(PROCESSENTRY32W);
memset(path, 0, MAX_PATH+1);
our_pid = GetCurrentProcessId();
hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, our_pid);
if (hsm == INVALID_HANDLE_VALUE) {
printf("CreateToolhelp32Snapshot[1] failed: %d\n", GetLastError());
return 1;
}
if (!Module32FirstW(hsm, &me)) {
printf("Module32FirstW[1] failed: %d\n", GetLastError());
CloseHandle(hsm);
return 1;
}
/*
* Enumerate over the modules for the current process in order to find
* kill_process[_d].exe, then take a note of the directory it lives in.
*/
do {
if (_wcsnicmp(me.szModule, KILL_PYTHON_EXE, KILL_PYTHON_EXE_LEN))
continue;
len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;
wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
break;
} while (Module32NextW(hsm, &me));
CloseHandle(hsm);
if (path == NULL) {
printf("failed to discern directory of running process\n");
return 1;
}
/*
* Take a snapshot of system processes. Enumerate over the snapshot,
* looking for python processes. When we find one, verify it lives
* in the same directory we live in. If it does, kill it. If we're
* unable to kill it, treat this as a fatal error and return 1.
*
* The rationale behind this is that we're called at the start of the
* build process on the basis that we'll take care of killing any
* running instances, such that the build won't encounter permission
* denied errors during linking. If we can't kill one of the processes,
* we can't provide this assurance, and the build shouldn't start.
*/
hsp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
if (hsp == INVALID_HANDLE_VALUE) {
printf("CreateToolhelp32Snapshot[2] failed: %d\n", GetLastError());
return 1;
}
if (!Process32FirstW(hsp, &pe)) {
printf("Process32FirstW failed: %d\n", GetLastError());
CloseHandle(hsp);
return 1;
}
dac = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE;
do {
/*
* XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones)
* and see if any of our DLLs are loaded (i.e. python30[_d].dll),
* as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient.
*/
if (_wcsnicmp(pe.szExeFile, PYTHON_EXE, PYTHON_EXE_LEN))
/* This isn't a python process. */
continue;
/* It's a python process, so figure out which directory it's in... */
hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);
if (hsm == INVALID_HANDLE_VALUE)
/*
* If our module snapshot fails (which will happen if we don't own
* the process), just ignore it and continue. (It seems different
* versions of Windows return different values for GetLastError()
* in this situation; it's easier to just ignore it and move on vs.
* stopping the build for what could be a false positive.)
*/
continue;
if (!Module32FirstW(hsm, &me)) {
printf("Module32FirstW[2] failed: %d\n", GetLastError());
CloseHandle(hsp);
CloseHandle(hsm);
return 1;
}
do {
if (_wcsnicmp(me.szModule, PYTHON_EXE, PYTHON_EXE_LEN))
/* Wrong module, we're looking for python[_d].exe... */
continue;
if (_wcsnicmp(path, me.szExePath, len))
/* Process doesn't live in our directory. */
break;
/* Python process residing in the right directory, kill it! */
hp = OpenProcess(dac, FALSE, pe.th32ProcessID);
if (!hp) {
printf("OpenProcess failed: %d\n", GetLastError());
CloseHandle(hsp);
CloseHandle(hsm);
return 1;
}
if (!TerminateProcess(hp, 1)) {
printf("TerminateProcess failed: %d\n", GetLastError());
CloseHandle(hsp);
CloseHandle(hsm);
CloseHandle(hp);
return 1;
}
CloseHandle(hp);
break;
} while (Module32NextW(hsm, &me));
CloseHandle(hsm);
} while (Process32NextW(hsp, &pe));
CloseHandle(hsp);
return 0;
}
/* vi: set ts=8 sw=4 sts=4 expandtab */

2
PC/VS8.0/make_versioninfo.vcproj
View File

@ -67,7 +67,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@ -211,7 +210,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"

21
PC/VS8.0/pcbuild.sln
View File

@ -131,6 +131,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj",
{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
EndProject
Global
@ -537,6 +542,22 @@ Global
{A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32
{A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64
{A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.ActiveCfg = Debug|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.Build.0 = Debug|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.ActiveCfg = Debug|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.Build.0 = Debug|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.Build.0 = PGInstrument|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.Build.0 = PGUpdate|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.ActiveCfg = Release|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64
{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32
{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32
{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64

8
PC/VS8.0/pyproject.vsprops
View File

@ -94,18 +94,18 @@
/>
<UserMacro
Name="tcltkLib"
Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"
/>
<UserMacro
Name="tcltkLibDebug"
Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"
/>
<UserMacro
Name="tcltk64Lib"
Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"
/>
<UserMacro
Name="tcltk64LibDebug"
Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"
/>
</VisualStudioPropertySheet>

8
PC/VS8.0/python.vcproj
View File

@ -62,7 +62,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -136,7 +135,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -211,7 +209,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -287,7 +284,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2100000"
@ -360,7 +356,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -435,7 +430,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -510,7 +504,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -585,7 +578,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"

138
PC/VS8.0/sqlite3.vcproj
View File

@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -56,7 +56,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -118,7 +118,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -166,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -180,7 +180,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -243,7 +243,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -304,7 +304,7 @@
/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -353,7 +353,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -366,7 +366,7 @@
/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -414,7 +414,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -427,7 +427,7 @@
/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -476,7 +476,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -489,7 +489,7 @@
/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/>
<Tool
Name="VCALinkTool"
@ -521,51 +521,51 @@
Name="Header Files"
>
<File
RelativePath="$(sqlite3Dir)\btree.h"
RelativePath="..\..\..\sqlite-source-3.3.4\btree.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\hash.h"
RelativePath="..\..\..\sqlite-source-3.3.4\hash.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\keywordhash.h"
RelativePath="..\..\..\sqlite-source-3.3.4\keywordhash.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\opcodes.h"
RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\os.h"
RelativePath="..\..\..\sqlite-source-3.3.4\os.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\os_common.h"
RelativePath="..\..\..\sqlite-source-3.3.4\os_common.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\pager.h"
RelativePath="..\..\..\sqlite-source-3.3.4\pager.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\parse.h"
RelativePath="..\..\..\sqlite-source-3.3.4\parse.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\sqlite3.h"
RelativePath="..\..\..\sqlite-source-3.3.4\sqlite3.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\sqliteInt.h"
RelativePath="..\..\..\sqlite-source-3.3.4\sqliteInt.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbe.h"
RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbeInt.h"
RelativePath="..\..\..\sqlite-source-3.3.4\vdbeInt.h"
>
</File>
</Filter>
@ -573,167 +573,167 @@
Name="Source Files"
>
<File
RelativePath="$(sqlite3Dir)\alter.c"
RelativePath="..\..\..\sqlite-source-3.3.4\alter.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\analyze.c"
RelativePath="..\..\..\sqlite-source-3.3.4\analyze.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\attach.c"
RelativePath="..\..\..\sqlite-source-3.3.4\attach.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\auth.c"
RelativePath="..\..\..\sqlite-source-3.3.4\auth.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\btree.c"
RelativePath="..\..\..\sqlite-source-3.3.4\btree.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\build.c"
RelativePath="..\..\..\sqlite-source-3.3.4\build.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\callback.c"
RelativePath="..\..\..\sqlite-source-3.3.4\callback.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\complete.c"
RelativePath="..\..\..\sqlite-source-3.3.4\complete.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\date.c"
RelativePath="..\..\..\sqlite-source-3.3.4\date.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\delete.c"
RelativePath="..\..\..\sqlite-source-3.3.4\delete.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\expr.c"
RelativePath="..\..\..\sqlite-source-3.3.4\expr.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\func.c"
RelativePath="..\..\..\sqlite-source-3.3.4\func.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\hash.c"
RelativePath="..\..\..\sqlite-source-3.3.4\hash.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\insert.c"
RelativePath="..\..\..\sqlite-source-3.3.4\insert.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\legacy.c"
RelativePath="..\..\..\sqlite-source-3.3.4\legacy.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\main.c"
RelativePath="..\..\..\sqlite-source-3.3.4\main.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\opcodes.c"
RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\os.c"
RelativePath="..\..\..\sqlite-source-3.3.4\os.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\os_unix.c"
RelativePath="..\..\..\sqlite-source-3.3.4\os_unix.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\os_win.c"
RelativePath="..\..\..\sqlite-source-3.3.4\os_win.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\pager.c"
RelativePath="..\..\..\sqlite-source-3.3.4\pager.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\parse.c"
RelativePath="..\..\..\sqlite-source-3.3.4\parse.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\pragma.c"
RelativePath="..\..\..\sqlite-source-3.3.4\pragma.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\prepare.c"
RelativePath="..\..\..\sqlite-source-3.3.4\prepare.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\printf.c"
RelativePath="..\..\..\sqlite-source-3.3.4\printf.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\random.c"
RelativePath="..\..\..\sqlite-source-3.3.4\random.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\select.c"
RelativePath="..\..\..\sqlite-source-3.3.4\select.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\shell.c"
RelativePath="..\..\..\sqlite-source-3.3.4\shell.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\table.c"
RelativePath="..\..\..\sqlite-source-3.3.4\table.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\tokenize.c"
RelativePath="..\..\..\sqlite-source-3.3.4\tokenize.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\trigger.c"
RelativePath="..\..\..\sqlite-source-3.3.4\trigger.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\update.c"
RelativePath="..\..\..\sqlite-source-3.3.4\update.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\utf.c"
RelativePath="..\..\..\sqlite-source-3.3.4\utf.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\util.c"
RelativePath="..\..\..\sqlite-source-3.3.4\util.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vacuum.c"
RelativePath="..\..\..\sqlite-source-3.3.4\vacuum.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbe.c"
RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbeapi.c"
RelativePath="..\..\..\sqlite-source-3.3.4\vdbeapi.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbeaux.c"
RelativePath="..\..\..\sqlite-source-3.3.4\vdbeaux.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbefifo.c"
RelativePath="..\..\..\sqlite-source-3.3.4\vdbefifo.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbemem.c"
RelativePath="..\..\..\sqlite-source-3.3.4\vdbemem.c"
>
</File>
<File
RelativePath="$(sqlite3Dir)\where.c"
RelativePath="..\..\..\sqlite-source-3.3.4\where.c"
>
</File>
</Filter>

8
PCbuild/_elementtree.vcproj
View File

@ -56,7 +56,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -119,7 +118,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -182,7 +180,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -246,7 +243,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -309,7 +305,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -373,7 +368,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
@ -437,7 +431,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@ -501,7 +494,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>

2
PCbuild/make_versioninfo.vcproj
View File

@ -67,7 +67,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@ -211,7 +210,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"

8
PCbuild/python.vcproj
View File

@ -62,7 +62,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -136,7 +135,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -211,7 +209,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -287,7 +284,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2100000"
@ -360,7 +356,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -435,7 +430,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -510,7 +504,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@ -585,7 +578,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"

6
PCbuild/vs9to8.py
View File

@ -22,6 +22,12 @@ def vs9to8(src, dest):
lines = lines.replace('..\\', '..\\..\\')
lines = lines.replace('..\\..\\..\\..\\', '..\\..\\..\\')
# Bah. VS8.0 does not expand macros in file names.
# Replace them here.
lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-source-3.3.4')
lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..')
lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32')
with open(destname, 'wb') as fout:
lines = lines.replace("\n", "\r\n")
fout.write(lines)