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
39abba46
Commit
39abba46
authored
Feb 09, 2015
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #17896: Update msi.py to new externals dir.
parent
833d1925
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
Tools/msi/msi.py
Tools/msi/msi.py
+4
-4
No files found.
Tools/msi/msi.py
View file @
39abba46
...
...
@@ -929,9 +929,9 @@ def generate_license():
(
"Tk"
,
"tk8*"
,
"license.terms"
),
(
"Tix"
,
"tix-*"
,
"license.terms"
)):
out
.
write
(
"
\
n
This copy of Python includes a copy of %s, which is licensed under the following terms:
\
n
\
n
"
%
name
)
dirs
=
glob
.
glob
(
srcdir
+
"/
..
/"
+
pat
)
dirs
=
glob
.
glob
(
srcdir
+
"/
externals
/"
+
pat
)
if
not
dirs
:
raise
ValueError
,
"Could not find "
+
srcdir
+
"/
..
/"
+
pat
raise
ValueError
,
"Could not find "
+
srcdir
+
"/
externals
/"
+
pat
if
len
(
dirs
)
>
2
and
not
snapshot
:
raise
ValueError
,
"Multiple copies of "
+
pat
dir
=
dirs
[
0
]
...
...
@@ -1115,7 +1115,7 @@ def add_files(db):
lib
.
start_component
(
"TkDLLs"
,
tcltk
)
lib
.
add_file
(
"_tkinter.pyd"
)
dlls
.
append
(
"_tkinter.pyd"
)
tcldir
=
os
.
path
.
normpath
(
srcdir
+
(
"/
..
/tcltk%s/bin"
%
tclsuffix
))
tcldir
=
os
.
path
.
normpath
(
srcdir
+
(
"/
externals
/tcltk%s/bin"
%
tclsuffix
))
for
f
in
glob
.
glob1
(
tcldir
,
"*.dll"
):
lib
.
add_file
(
f
,
src
=
os
.
path
.
join
(
tcldir
,
f
))
# check whether there are any unknown extensions
...
...
@@ -1140,7 +1140,7 @@ def add_files(db):
lib
.
add_file
(
'libpython%s%s.a'
%
(
major
,
minor
))
if
have_tcl
:
# Add Tcl/Tk
tcldirs
=
[(
root
,
'
..
/tcltk%s/lib'
%
tclsuffix
,
'tcl'
)]
tcldirs
=
[(
root
,
'
externals
/tcltk%s/lib'
%
tclsuffix
,
'tcl'
)]
tcltk
.
set_current
()
while
tcldirs
:
parent
,
phys
,
dir
=
tcldirs
.
pop
()
...
...
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