mirror of
https://github.com/python/cpython
synced 2024-10-07 09:01:00 +00:00
Issue #17896: Move Windows external lib sources from .. to externals.
This commit is contained in:
commit
740e1dcdc2
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -80,4 +80,5 @@ tags
|
||||||
TAGS
|
TAGS
|
||||||
.coverage
|
.coverage
|
||||||
coverage/
|
coverage/
|
||||||
|
externals/
|
||||||
htmlcov/
|
htmlcov/
|
||||||
|
|
|
@ -93,6 +93,7 @@ Programs/_freeze_importlib
|
||||||
Programs/_testembed
|
Programs/_testembed
|
||||||
.coverage
|
.coverage
|
||||||
coverage/
|
coverage/
|
||||||
|
externals/
|
||||||
htmlcov/
|
htmlcov/
|
||||||
*.gcda
|
*.gcda
|
||||||
*.gcno
|
*.gcno
|
||||||
|
|
|
@ -48,8 +48,8 @@ def convert_path(s):
|
||||||
|
|
||||||
prefix = os.path.join(sys.base_prefix,"tcl")
|
prefix = os.path.join(sys.base_prefix,"tcl")
|
||||||
if not os.path.exists(prefix):
|
if not os.path.exists(prefix):
|
||||||
# devdir/../tcltk/lib
|
# devdir/externals/tcltk/lib
|
||||||
prefix = os.path.join(sys.base_prefix, os.path.pardir, "tcltk", "lib")
|
prefix = os.path.join(sys.base_prefix, "externals", "tcltk", "lib")
|
||||||
prefix = os.path.abspath(prefix)
|
prefix = os.path.abspath(prefix)
|
||||||
# if this does not exist, no further search is needed
|
# if this does not exist, no further search is needed
|
||||||
if os.path.exists(prefix):
|
if os.path.exists(prefix):
|
||||||
|
|
|
@ -1385,6 +1385,9 @@ Tools/Demos
|
||||||
Windows
|
Windows
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #17896: The Windows build scripts now expect external library sources
|
||||||
|
to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``.
|
||||||
|
|
||||||
- Issue #17717: The Windows build scripts now use a copy of NASM pulled from
|
- Issue #17717: The Windows build scripts now use a copy of NASM pulled from
|
||||||
svn.python.org to build OpenSSL.
|
svn.python.org to build OpenSSL.
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
setlocal
|
setlocal
|
||||||
rem Simple script to fetch source for external libraries
|
rem Simple script to fetch source for external libraries
|
||||||
|
|
||||||
pushd "%~dp0..\.."
|
if not exist "%~dp0..\externals" mkdir "%~dp0..\externals"
|
||||||
|
pushd "%~dp0..\externals"
|
||||||
|
|
||||||
if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/
|
if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<PyDllName>python35$(PyDebugExt)</PyDllName>
|
<PyDllName>python35$(PyDebugExt)</PyDllName>
|
||||||
<PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
|
<PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
|
||||||
<KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
|
<KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
|
||||||
<externalsDir>..\..</externalsDir>
|
<externalsDir>..\externals</externalsDir>
|
||||||
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
|
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
|
||||||
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
|
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
|
||||||
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
|
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
|
||||||
|
|
|
@ -278,7 +278,7 @@ painless as possible, called "get_externals.bat" and located in this
|
||||||
directory. This script extracts all the external sub-projects from
|
directory. This script extracts all the external sub-projects from
|
||||||
http://svn.python.org/projects/external
|
http://svn.python.org/projects/external
|
||||||
via Subversion (so you'll need svn.exe on your PATH) and places them
|
via Subversion (so you'll need svn.exe on your PATH) and places them
|
||||||
in ..\.. (relative to this directory).
|
in ..\externals (relative to this directory).
|
||||||
|
|
||||||
It is also possible to download sources from each project's homepage,
|
It is also possible to download sources from each project's homepage,
|
||||||
though you may have to change folder names or pass the names to MSBuild
|
though you may have to change folder names or pass the names to MSBuild
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
setlocal
|
setlocal
|
||||||
rem The following line should be removed before #20035 is closed
|
rem The following line should be removed before #20035 is closed
|
||||||
set TCL_LIBRARY=%~dp0..\..\..\tcltk64\lib\tcl8.6
|
set TCL_LIBRARY=%~dp0..\..\externals\tcltk64\lib\tcl8.6
|
||||||
|
|
||||||
call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %*
|
call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %*
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
setlocal
|
setlocal
|
||||||
rem The following line should be removed before #20035 is closed
|
rem The following line should be removed before #20035 is closed
|
||||||
set TCL_LIBRARY=%~dp0..\..\..\tcltk\lib\tcl8.6
|
set TCL_LIBRARY=%~dp0..\..\externals\tcltk\lib\tcl8.6
|
||||||
|
|
||||||
call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %*
|
call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %*
|
||||||
|
|
Loading…
Reference in a new issue