[Python-checkins] r43639 - in python/trunk: PCbuild/_sqlite3.vcproj Tools/msi/msi.py
martin.v.loewis
python-checkins at python.org
Tue Apr 4 18:28:14 CEST 2006
Author: martin.v.loewis
Date: Tue Apr 4 18:28:14 2006
New Revision: 43639
Modified:
python/trunk/PCbuild/_sqlite3.vcproj
python/trunk/Tools/msi/msi.py
Log:
Adjust sqlite3 build process to Win64.
Modified: python/trunk/PCbuild/_sqlite3.vcproj
==============================================================================
--- python/trunk/PCbuild/_sqlite3.vcproj (original)
+++ python/trunk/PCbuild/_sqlite3.vcproj Tue Apr 4 18:28:14 2006
@@ -152,7 +152,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
+ AdditionalDependencies="..\..\sqlite-source-3.3.4\ia64\sqlite3.lib"
OutputFile="./_sqlite3.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -214,7 +214,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
- AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
+ AdditionalDependencies="..\..\sqlite-source-3.3.4\amd64\sqlite3.lib"
OutputFile="./_sqlite3.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Modified: python/trunk/Tools/msi/msi.py
==============================================================================
--- python/trunk/Tools/msi/msi.py (original)
+++ python/trunk/Tools/msi/msi.py Tue Apr 4 18:28:14 2006
@@ -967,7 +967,13 @@
for f in glob.glob1(tcldir, "*.dll"):
lib.add_file(f, src=os.path.join(tcldir, f))
# Add sqlite
- lib.add_file(srcdir+"/"+sqlite_dir+"/sqlite3.dll")
+ if msilib.msi_type=="Intel64;1033":
+ sqlite_arch = "/ia64"
+ elif msilib.msi_type=="x64;1033":
+ sqlite_arch = "/amd64"
+ else:
+ sqlite_arch = ""
+ lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
# check whether there are any unknown extensions
for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"):
if f.endswith("_d.pyd"): continue # debug version
More information about the Python-checkins
mailing list