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
313dab43
Commit
313dab43
authored
Sep 28, 2010
by
Hirokazu Yamamoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Now perl path with spaces can be used.
parent
57b41630
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
PC/VS8.0/build_ssl.py
PC/VS8.0/build_ssl.py
+6
-6
PCbuild/build_ssl.py
PCbuild/build_ssl.py
+4
-4
No files found.
PC/VS8.0/build_ssl.py
View file @
313dab43
...
...
@@ -8,7 +8,7 @@
# directory. It is likely you will already find the zlib library and
# any other external packages there.
# * Install ActivePerl and ensure it is somewhere on your path.
# * Run this script from the PC
Build
directory.
# * Run this script from the PC
/VS8.0
directory.
#
# it should configure and build SSL, then build the _ssl and _hashlib
# Python extensions without intervention.
...
...
@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None):
# is available.
def
find_working_perl
(
perls
):
for
perl
in
perls
:
fh
=
os
.
popen
(
perl
+
' -e "use Win32;"'
)
fh
=
os
.
popen
(
'"%s" -e "use Win32;"'
%
perl
)
fh
.
read
()
rc
=
fh
.
close
()
if
rc
:
...
...
@@ -196,12 +196,12 @@ def main():
# as "well known" locations
perls
=
find_all_on_path
(
"perl.exe"
,
[
"
\
\
perl
\
\
bin"
,
"C:
\
\
perl
\
\
bin"
])
perl
=
find_working_perl
(
perls
)
if
perl
is
None
:
if
perl
:
print
(
"Found a working perl at '%s'"
%
(
perl
,))
else
:
print
(
"No Perl installation was found. Existing Makefiles are used."
)
print
(
"Found a working perl at '%s'"
%
(
perl
,))
sys
.
stdout
.
flush
()
# Look for SSL
2 levels up from pcbuild
- ie, same place zlib etc all live.
# Look for SSL
3 levels up from PC/VS8.0
- ie, same place zlib etc all live.
ssl_dir
=
find_best_ssl_dir
((
"..
\
\
..
\
\
.."
,))
if
ssl_dir
is
None
:
sys
.
exit
(
1
)
...
...
PCbuild/build_ssl.py
View file @
313dab43
...
...
@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None):
# is available.
def
find_working_perl
(
perls
):
for
perl
in
perls
:
fh
=
os
.
popen
(
perl
+
' -e "use Win32;"'
)
fh
=
os
.
popen
(
'"%s" -e "use Win32;"'
%
perl
)
fh
.
read
()
rc
=
fh
.
close
()
if
rc
:
...
...
@@ -196,10 +196,10 @@ def main():
# as "well known" locations
perls
=
find_all_on_path
(
"perl.exe"
,
[
"
\
\
perl
\
\
bin"
,
"C:
\
\
perl
\
\
bin"
])
perl
=
find_working_perl
(
perls
)
if
perl
is
None
:
if
perl
:
print
(
"Found a working perl at '%s'"
%
(
perl
,))
else
:
print
(
"No Perl installation was found. Existing Makefiles are used."
)
print
(
"Found a working perl at '%s'"
%
(
perl
,))
sys
.
stdout
.
flush
()
# Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
ssl_dir
=
find_best_ssl_dir
((
"..
\
\
.."
,))
...
...
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