Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
88ef6377
Commit
88ef6377
authored
Jul 06, 2006
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
Fixes #1517388.
parent
a12aa88f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
Misc/NEWS
Misc/NEWS
+3
-0
Tools/msi/msi.py
Tools/msi/msi.py
+8
-8
No files found.
Misc/NEWS
View file @
88ef6377
...
...
@@ -89,6 +89,9 @@ Extension Modules
Build
-----
- Bug #1517388: sqlite3.dll is now installed on Windows independent
of Tcl/Tk.
- Bug #1513032: '
make
install
' failed on FreeBSD 5.3 due to lib-old
trying to be installed even though it'
s
empty
.
...
...
Tools/msi/msi.py
View file @
88ef6377
...
...
@@ -962,6 +962,14 @@ def add_files(db):
continue
dlls.append(f)
lib.add_file(f)
# Add sqlite
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
")
if have_tcl:
if not os.path.exists(srcdir+"
/
PCBuild
/
_tkinter
.
pyd
"):
print "
WARNING
:
Missing
_tkinter
.
pyd
"
...
...
@@ -972,14 +980,6 @@ def add_files(db):
tcldir = os.path.normpath(srcdir+"
/
..
/
tcltk
/
bin
")
for f in glob.glob1(tcldir, "
*
.
dll
"):
lib.add_file(f, src=os.path.join(tcldir, f))
# Add sqlite
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment