You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2020/09/18 23:18:20 UTC
[openoffice] branch trunk updated (01d5ed0 -> 07327bc)
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 01d5ed0 Updated Asturian dictionary
new 26aca12 Upgrade bundled python to 2.7.18.
new 07327bc Fix intermittent parallel build breakage.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/external_deps.lst | 6 +-
main/python/makefile.mk | 2 +-
main/python/prj/d.lst | 136 ++++++++---------
...vs9-dir.patch => python-2.7.18-msvs9-dir.patch} | 4 +-
...ch => python-2.7.18-msvs9-no-host-python.patch} | 4 +-
...patch => python-2.7.18-msvs9-python-path.patch} | 4 +-
...m.patch => python-2.7.18-msvs9-subsystem.patch} | 8 +-
...atch => python-2.7.18-msvs9-win64-target.patch} | 4 +-
...win64.patch => python-2.7.18-msvs9-win64.patch} | 162 ++++++++++-----------
....7.17-msvs9.patch => python-2.7.18-msvs9.patch} | 162 ++++++++++-----------
...rdlink.patch => python-2.7.18-nohardlink.patch} | 4 +-
...7-sysbase.patch => python-2.7.18-sysbase.patch} | 6 +-
main/python/python-freebsd.patch | 18 +--
main/python/python-md5.patch | 6 +-
main/python/python-solaris.patch | 4 +-
main/python/python-solver-before-std.patch | 6 +-
main/python/python-ssl.patch | 12 +-
main/python/pyversion.mk | 2 +-
main/python/pyversion_dmake.mk | 2 +-
main/writerfilter/source/Makefile | 56 +++----
20 files changed, 304 insertions(+), 304 deletions(-)
rename main/python/{python-2.7.17-msvs9-dir.patch => python-2.7.18-msvs9-dir.patch} (64%)
rename main/python/{python-2.7.17-msvs9-no-host-python.patch => python-2.7.18-msvs9-no-host-python.patch} (59%)
rename main/python/{python-2.7.17-msvs9-python-path.patch => python-2.7.18-msvs9-python-path.patch} (61%)
rename main/python/{python-2.7.17-msvs9-subsystem.patch => python-2.7.18-msvs9-subsystem.patch} (63%)
rename main/python/{python-2.7.17-msvs9-win64-target.patch => python-2.7.18-msvs9-win64-target.patch} (96%)
rename main/python/{python-2.7.17-msvs9-win64.patch => python-2.7.18-msvs9-win64.patch} (85%)
rename main/python/{python-2.7.17-msvs9.patch => python-2.7.18-msvs9.patch} (85%)
rename main/python/{python-2.7.17-nohardlink.patch => python-2.7.18-nohardlink.patch} (76%)
rename main/python/{python-2.7.17-sysbase.patch => python-2.7.18-sysbase.patch} (66%)
[openoffice] 01/02: Upgrade bundled python to 2.7.18.
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 26aca12f509e5c739c98db9ce5641a2c5feecea7
Author: Don Lewis <tr...@apache.org>
AuthorDate: Fri Sep 18 10:28:34 2020 -0700
Upgrade bundled python to 2.7.18.
---
main/external_deps.lst | 6 +-
main/python/makefile.mk | 2 +-
main/python/prj/d.lst | 136 ++++++++---------
...vs9-dir.patch => python-2.7.18-msvs9-dir.patch} | 4 +-
...ch => python-2.7.18-msvs9-no-host-python.patch} | 4 +-
...patch => python-2.7.18-msvs9-python-path.patch} | 4 +-
...m.patch => python-2.7.18-msvs9-subsystem.patch} | 8 +-
...atch => python-2.7.18-msvs9-win64-target.patch} | 4 +-
...win64.patch => python-2.7.18-msvs9-win64.patch} | 162 ++++++++++-----------
....7.17-msvs9.patch => python-2.7.18-msvs9.patch} | 162 ++++++++++-----------
...rdlink.patch => python-2.7.18-nohardlink.patch} | 4 +-
...7-sysbase.patch => python-2.7.18-sysbase.patch} | 6 +-
main/python/python-freebsd.patch | 18 +--
main/python/python-md5.patch | 6 +-
main/python/python-solaris.patch | 4 +-
main/python/python-solver-before-std.patch | 6 +-
main/python/python-ssl.patch | 12 +-
main/python/pyversion.mk | 2 +-
main/python/pyversion_dmake.mk | 2 +-
19 files changed, 276 insertions(+), 276 deletions(-)
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 0621c53..eb2fbb6 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -199,9 +199,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = 27a7919fa8d1364bae766949aaa91a5b
- name = Python-2.7.17.tgz
- URL1 = https://www.python.org/ftp/python/2.7.17/$(name)
+ MD5 = 38c84292658ed4456157195f1c9bcbe1
+ name = Python-2.7.18.tgz
+ URL1 = https://www.python.org/ftp/python/2.7.18/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST != YES)
diff --git a/main/python/makefile.mk b/main/python/makefile.mk
index d754b99..b30cb55 100644
--- a/main/python/makefile.mk
+++ b/main/python/makefile.mk
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=27a7919fa8d1364bae766949aaa91a5b
+TARFILE_MD5=38c84292658ed4456157195f1c9bcbe1
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
diff --git a/main/python/prj/d.lst b/main/python/prj/d.lst
index 13c534e..bd3d1d7 100644
--- a/main/python/prj/d.lst
+++ b/main/python/prj/d.lst
@@ -36,52 +36,52 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
mkdir: %_DEST%\lib%_EXT%\python\unittest
mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
-..\%__SRC%\misc\build\Python-2.7.17\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.17\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.17\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.17\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.17\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
+..\%__SRC%\misc\build\Python-2.7.18\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.18\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-2.7.18\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-2.7.18\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
..\%__SRC%\misc\build\python-inst\lib\python2.7\_sysconfigdata.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
..\pyversion_dmake.mk %_DEST%\inc%_EXT%\pyversion_dmake.mk
-..\%__SRC%\misc\build\Python-2.7.17\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.18\Include\* %_DEST%\inc%_EXT%\python\*
#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.17\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\Python-2.7.18\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
@@ -92,40 +92,40 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so
#MingW ONLY !
..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.17\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-2.7.18\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
# WINDOWS ONLY !
..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
# Win64 ONLY!
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.17\PC\VS9.0\amd64\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
#linklib: libpython.so.*.*.*
diff --git a/main/python/python-2.7.17-msvs9-dir.patch b/main/python/python-2.7.18-msvs9-dir.patch
similarity index 64%
rename from main/python/python-2.7.17-msvs9-dir.patch
rename to main/python/python-2.7.18-msvs9-dir.patch
index 32e737a..a4d29eb 100644
--- a/main/python/python-2.7.17-msvs9-dir.patch
+++ b/main/python/python-2.7.18-msvs9-dir.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:37:03.303029800 +0200
-+++ misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:39:42.007110300 +0200
+--- misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:37:03.303029800 +0200
++++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:39:42.007110300 +0200
@@ -120,6 +120,7 @@
/>
<Tool
diff --git a/main/python/python-2.7.17-msvs9-no-host-python.patch b/main/python/python-2.7.18-msvs9-no-host-python.patch
similarity index 59%
rename from main/python/python-2.7.17-msvs9-no-host-python.patch
rename to main/python/python-2.7.18-msvs9-no-host-python.patch
index 61086f1..f4ef331 100644
--- a/main/python/python-2.7.17-msvs9-no-host-python.patch
+++ b/main/python/python-2.7.18-msvs9-no-host-python.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.17/PC/VS9.0/x64.vsprops 2017-09-16 19:38:35.000000000 +0200
-+++ misc/build/Python-2.7.17/PC/VS9.0/x64.vsprops 2018-03-08 07:04:52.320860000 +0200
+--- misc/build/Python-2.7.18/PC/VS9.0/x64.vsprops 2017-09-16 19:38:35.000000000 +0200
++++ misc/build/Python-2.7.18/PC/VS9.0/x64.vsprops 2018-03-08 07:04:52.320860000 +0200
@@ -15,8 +15,4 @@
Name="VCLinkerTool"
TargetMachine="17"
diff --git a/main/python/python-2.7.17-msvs9-python-path.patch b/main/python/python-2.7.18-msvs9-python-path.patch
similarity index 61%
rename from main/python/python-2.7.17-msvs9-python-path.patch
rename to main/python/python-2.7.18-msvs9-python-path.patch
index c617ac1..6c09b36 100644
--- a/main/python/python-2.7.17-msvs9-python-path.patch
+++ b/main/python/python-2.7.18-msvs9-python-path.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.17/PC/VS9.0/pyproject.vsprops 2017-09-16 19:38:35.000000000 +0200
-+++ misc/build/Python-2.7.17/PC/VS9.0/pyproject.vsprops 2018-03-08 07:10:30.002138400 +0200
+--- misc/build/Python-2.7.18/PC/VS9.0/pyproject.vsprops 2017-09-16 19:38:35.000000000 +0200
++++ misc/build/Python-2.7.18/PC/VS9.0/pyproject.vsprops 2018-03-08 07:10:30.002138400 +0200
@@ -42,7 +42,7 @@
/>
<UserMacro
diff --git a/main/python/python-2.7.17-msvs9-subsystem.patch b/main/python/python-2.7.18-msvs9-subsystem.patch
similarity index 63%
rename from main/python/python-2.7.17-msvs9-subsystem.patch
rename to main/python/python-2.7.18-msvs9-subsystem.patch
index c789347..36d82f6 100644
--- a/main/python/python-2.7.17-msvs9-subsystem.patch
+++ b/main/python/python-2.7.18-msvs9-subsystem.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 05:18:19.659192400 +0200
-+++ misc/build/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 06:06:12.776404800 +0200
+--- misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 05:18:19.659192400 +0200
++++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 06:06:12.776404800 +0200
@@ -137,6 +137,7 @@
/>
<Tool
@@ -8,8 +8,8 @@
OutputFile="$(SolutionDir)make_versioninfo.exe"
AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
/>
---- misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:21:48.081999200 +0200
-+++ misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:23:02.210741600 +0200
+--- misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:21:48.081999200 +0200
++++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:23:02.210741600 +0200
@@ -121,6 +121,7 @@
<Tool
Name="VCLinkerTool"
diff --git a/main/python/python-2.7.17-msvs9-win64-target.patch b/main/python/python-2.7.18-msvs9-win64-target.patch
similarity index 96%
rename from main/python/python-2.7.17-msvs9-win64-target.patch
rename to main/python/python-2.7.18-msvs9-win64-target.patch
index f0a5e69..9e6bff4 100644
--- a/main/python/python-2.7.17-msvs9-win64-target.patch
+++ b/main/python/python-2.7.18-msvs9-win64-target.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.17/PC/VS9.0/pcbuild.sln 2018-03-08 04:58:56.323391400 +0200
-+++ misc/build/Python-2.7.17/PC/VS9.0/pcbuild.sln 2018-03-08 05:14:36.079035700 +0200
+--- misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2018-03-08 04:58:56.323391400 +0200
++++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2018-03-08 05:14:36.079035700 +0200
@@ -162,20 +162,20 @@
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
diff --git a/main/python/python-2.7.17-msvs9-win64.patch b/main/python/python-2.7.18-msvs9-win64.patch
similarity index 85%
rename from main/python/python-2.7.17-msvs9-win64.patch
rename to main/python/python-2.7.18-msvs9-win64.patch
index 47612ed..c13b634 100644
--- a/main/python/python-2.7.17-msvs9-win64.patch
+++ b/main/python/python-2.7.18-msvs9-win64.patch
@@ -1,6 +1,6 @@
-diff -urp misc/Python-2.7.17/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.17/PC/VS9.0/_bsddb.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.17/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.17/PC/VS9.0/_ctypes.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.17/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.17/PC/VS9.0/_elementtree.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_elementtree.vcproj 2017-10-21 17:56:40.221003000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2017-10-21 17:56:40.221003000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -256,9 +256,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.17/PC/VS9.0/_hashlib.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_hashlib.vcproj 2017-10-21 17:56:40.222221000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2017-10-21 17:56:40.222221000 -0500
@@ -58,6 +58,7 @@
<Tool
Name="VCLinkerTool"
@@ -323,9 +323,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.17/PC/VS9.0/_msi.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_msi.vcproj 2017-10-21 17:56:40.223291000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj 2017-10-21 17:56:40.223291000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
@@ -390,9 +390,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.17/PC/VS
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj 2017-10-21 17:56:40.224316000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2017-10-21 17:56:40.224316000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -457,9 +457,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.17/PC/VS9.0/_socket.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_socket.vcproj 2017-10-21 17:56:40.225407000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj 2017-10-21 17:56:40.225407000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -524,9 +524,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,9 +591,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.17/PC/VS9.0/_ssl.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500
@@ -43,7 +43,7 @@
/>
<Tool
@@ -689,9 +689,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.17/PC/VS
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.17/PC/VS9.0/_testcapi.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_testcapi.vcproj 2017-10-21 17:56:40.228516000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2017-10-21 17:56:40.228516000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -756,9 +756,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.17/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.17/PC/VS9.0/_tkinter.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -823,9 +823,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj
---- misc/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj 2017-10-21 17:56:40.230806000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2017-10-21 17:56:40.230806000 -0500
@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
@@ -846,9 +846,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7
TargetMachine="17"
/>
<Tool
-diff -urp misc/Python-2.7.17/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.17/PC/VS9.0/bz2.vcproj
---- misc/Python-2.7.17/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/bz2.vcproj 2017-10-21 17:56:40.232092000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj 2017-10-21 17:56:40.232092000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -913,9 +913,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.17/PC/VS9
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.17/PC/VS9.0/kill_python.vcproj
---- misc/Python-2.7.17/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/kill_python.vcproj 2017-10-21 17:56:40.233109000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2017-10-21 17:56:40.233109000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
@@ -948,9 +948,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj
---- misc/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2017-10-21 17:56:40.233689000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2017-10-21 17:56:40.233689000 -0500
@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
@@ -967,9 +967,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj
---- misc/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj 2017-10-21 17:56:40.234324000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2017-10-21 17:56:40.234324000 -0500
@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1002,9 +1002,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.17/PC/VS9.0/pcbuild.sln
---- misc/Python-2.7.17/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pcbuild.sln 2017-10-21 17:56:40.235608000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
+--- misc/Python-2.7.18/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2017-10-21 17:56:40.235608000 -0500
@@ -38,12 +38,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
@@ -1099,9 +1099,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.17/PC/VS
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff -urp misc/Python-2.7.17/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.17/PC/VS9.0/pyexpat.vcproj
---- misc/Python-2.7.17/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -1166,9 +1166,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/python.vcproj misc/build/Python-2.7.17/PC/VS9.0/python.vcproj
---- misc/Python-2.7.17/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/python.vcproj 2017-10-21 17:56:40.237211000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/python.vcproj 2017-10-21 17:56:40.237211000 -0500
@@ -66,6 +66,7 @@
SubSystem="1"
StackReserveSize="2000000"
@@ -1233,9 +1233,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/python.vcproj misc/build/Python-2.7.17/PC/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.17/PC/VS9.0/pythoncore.vcproj
---- misc/Python-2.7.17/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500
@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1300,9 +1300,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.17
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.17/PC/VS9.0/pythonw.vcproj
---- misc/Python-2.7.17/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500
@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1367,9 +1367,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/select.vcproj misc/build/Python-2.7.17/PC/VS9.0/select.vcproj
---- misc/Python-2.7.17/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500
@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1434,9 +1434,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/select.vcproj misc/build/Python-2.7.17/PC/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.17/PC/VS9.0/sqlite3.vcproj
---- misc/Python-2.7.17/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500
@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
@@ -1501,9 +1501,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.17/PC/VS9.0/unicodedata.vcproj
---- misc/Python-2.7.17/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -1568,9 +1568,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj
---- misc/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500
@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
@@ -1635,9 +1635,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.17/PC/VS9.0/winsound.vcproj
---- misc/Python-2.7.17/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/winsound.vcproj 2017-10-21 17:56:40.244677000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj 2017-10-21 17:56:40.244677000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
diff --git a/main/python/python-2.7.17-msvs9.patch b/main/python/python-2.7.18-msvs9.patch
similarity index 85%
rename from main/python/python-2.7.17-msvs9.patch
rename to main/python/python-2.7.18-msvs9.patch
index 5fe1707..5a95434 100644
--- a/main/python/python-2.7.17-msvs9.patch
+++ b/main/python/python-2.7.18-msvs9.patch
@@ -1,6 +1,6 @@
-diff -urp misc/Python-2.7.17/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.17/PC/VS9.0/_bsddb.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.17/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.17/PC/VS9.0/_ctypes.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.17/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.17/PC/VS9.0/_elementtree.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_elementtree.vcproj 2017-10-21 17:56:40.221003000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2017-10-21 17:56:40.221003000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -256,9 +256,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.17/PC/VS9.0/_hashlib.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_hashlib.vcproj 2017-10-21 17:56:40.222221000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2017-10-21 17:56:40.222221000 -0500
@@ -58,6 +58,7 @@
<Tool
Name="VCLinkerTool"
@@ -323,9 +323,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.17/PC/VS9.0/_msi.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_msi.vcproj 2017-10-21 17:56:40.223291000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj 2017-10-21 17:56:40.223291000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
@@ -390,9 +390,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.17/PC/VS
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj 2017-10-21 17:56:40.224316000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2017-10-21 17:56:40.224316000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -457,9 +457,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.17/PC/VS9.0/_socket.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_socket.vcproj 2017-10-21 17:56:40.225407000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj 2017-10-21 17:56:40.225407000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -524,9 +524,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,9 +591,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.17/PC/VS9.0/_ssl.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500
@@ -43,7 +43,7 @@
/>
<Tool
@@ -689,9 +689,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.17/PC/VS
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.17/PC/VS9.0/_testcapi.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_testcapi.vcproj 2017-10-21 17:56:40.228516000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2017-10-21 17:56:40.228516000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -756,9 +756,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.17/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.17/PC/VS9.0/_tkinter.vcproj
---- misc/Python-2.7.17/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -823,9 +823,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj
---- misc/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj 2017-10-21 17:56:40.230806000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2017-10-21 17:56:40.230806000 -0500
@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
@@ -846,9 +846,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7
TargetMachine="17"
/>
<Tool
-diff -urp misc/Python-2.7.17/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.17/PC/VS9.0/bz2.vcproj
---- misc/Python-2.7.17/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/bz2.vcproj 2017-10-21 17:56:40.232092000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj 2017-10-21 17:56:40.232092000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -913,9 +913,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.17/PC/VS9
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.17/PC/VS9.0/kill_python.vcproj
---- misc/Python-2.7.17/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/kill_python.vcproj 2017-10-21 17:56:40.233109000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2017-10-21 17:56:40.233109000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
@@ -948,9 +948,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj
---- misc/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj 2017-10-21 17:56:40.233689000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2017-10-21 17:56:40.233689000 -0500
@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
@@ -967,9 +967,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj
---- misc/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj 2017-10-21 17:56:40.234324000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2017-10-21 17:56:40.234324000 -0500
@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1002,9 +1002,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.17/PC/VS9.0/pcbuild.sln
---- misc/Python-2.7.17/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pcbuild.sln 2017-10-21 17:56:40.235608000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
+--- misc/Python-2.7.18/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2017-10-21 17:56:40.235608000 -0500
@@ -38,12 +38,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
@@ -1099,9 +1099,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.17/PC/VS
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff -urp misc/Python-2.7.17/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.17/PC/VS9.0/pyexpat.vcproj
---- misc/Python-2.7.17/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -1166,9 +1166,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/python.vcproj misc/build/Python-2.7.17/PC/VS9.0/python.vcproj
---- misc/Python-2.7.17/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/python.vcproj 2017-10-21 17:56:40.237211000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/python.vcproj 2017-10-21 17:56:40.237211000 -0500
@@ -66,6 +66,7 @@
SubSystem="1"
StackReserveSize="2000000"
@@ -1233,9 +1233,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/python.vcproj misc/build/Python-2.7.17/PC/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.17/PC/VS9.0/pythoncore.vcproj
---- misc/Python-2.7.17/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500
@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1300,9 +1300,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.17
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.17/PC/VS9.0/pythonw.vcproj
---- misc/Python-2.7.17/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500
@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1367,9 +1367,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/select.vcproj misc/build/Python-2.7.17/PC/VS9.0/select.vcproj
---- misc/Python-2.7.17/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500
@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1434,9 +1434,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/select.vcproj misc/build/Python-2.7.17/PC/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.17/PC/VS9.0/sqlite3.vcproj
---- misc/Python-2.7.17/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500
@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
@@ -1501,9 +1501,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.17/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.17/PC/VS9.0/unicodedata.vcproj
---- misc/Python-2.7.17/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -1568,9 +1568,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj
---- misc/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500
@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
@@ -1635,9 +1635,9 @@ diff -urp misc/Python-2.7.17/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.17/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.17/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.17/PC/VS9.0/winsound.vcproj
---- misc/Python-2.7.17/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/winsound.vcproj 2017-10-21 17:56:40.244677000 -0500
+diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
+--- misc/Python-2.7.18/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj 2017-10-21 17:56:40.244677000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
diff --git a/main/python/python-2.7.17-nohardlink.patch b/main/python/python-2.7.18-nohardlink.patch
similarity index 76%
rename from main/python/python-2.7.17-nohardlink.patch
rename to main/python/python-2.7.18-nohardlink.patch
index 6021322..4405b92 100644
--- a/main/python/python-2.7.17-nohardlink.patch
+++ b/main/python/python-2.7.18-nohardlink.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.17/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.17/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
+--- misc/Python-2.7.18/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.18/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
@@ -542,7 +542,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
diff --git a/main/python/python-2.7.17-sysbase.patch b/main/python/python-2.7.18-sysbase.patch
similarity index 66%
rename from main/python/python-2.7.17-sysbase.patch
rename to main/python/python-2.7.18-sysbase.patch
index c28ceb5..da3503a 100644
--- a/main/python/python-2.7.17-sysbase.patch
+++ b/main/python/python-2.7.18-sysbase.patch
@@ -1,6 +1,6 @@
-diff -ruN misc/Python-2.7.17/configure misc/build/Python-2.7.17/configure
---- misc/Python-2.7.17/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.17/configure 2016-01-01 15:18:37.398344671 -0500
+diff -ruN misc/Python-2.7.18/configure misc/build/Python-2.7.18/configure
+--- misc/Python-2.7.18/configure 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.18/configure 2016-01-01 15:18:37.398344671 -0500
@@ -3295,7 +3295,9 @@
ac_sys_release=
else
diff --git a/main/python/python-freebsd.patch b/main/python/python-freebsd.patch
index 2d96c39..5f75bef 100644
--- a/main/python/python-freebsd.patch
+++ b/main/python/python-freebsd.patch
@@ -1,6 +1,6 @@
-diff -ruN misc/Python-2.7.17/Modules/fcntlmodule.c misc/build/Python-2.7.17/Modules/fcntlmodule.c
---- misc/Python-2.7.17/Modules/fcntlmodule.c 2019-10-19 13:38:44.000000000 -0500
-+++ misc/build/Python-2.7.17/Modules/fcntlmodule.c 2020-01-09 22:59:15.052886000 -0500
+diff -ruN misc/Python-2.7.18/Modules/fcntlmodule.c misc/build/Python-2.7.18/Modules/fcntlmodule.c
+--- misc/Python-2.7.18/Modules/fcntlmodule.c 2019-10-19 13:38:44.000000000 -0500
++++ misc/build/Python-2.7.18/Modules/fcntlmodule.c 2020-01-09 22:59:15.052886000 -0500
@@ -98,20 +98,15 @@
{
#define IOCTL_BUFSZ 1024
@@ -52,9 +52,9 @@ diff -ruN misc/Python-2.7.17/Modules/fcntlmodule.c misc/build/Python-2.7.17/Modu
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
-diff -ruN misc/Python-2.7.17/Python/thread_pthread.h misc/build/Python-2.7.17/Python/thread_pthread.h
---- misc/Python-2.7.17/Python/thread_pthread.h 2019-10-19 13:38:44.000000000 -0500
-+++ misc/build/Python-2.7.17/Python/thread_pthread.h 2020-01-09 22:59:15.053731000 -0500
+diff -ruN misc/Python-2.7.18/Python/thread_pthread.h misc/build/Python-2.7.18/Python/thread_pthread.h
+--- misc/Python-2.7.18/Python/thread_pthread.h 2019-10-19 13:38:44.000000000 -0500
++++ misc/build/Python-2.7.18/Python/thread_pthread.h 2020-01-09 22:59:15.053731000 -0500
@@ -38,13 +38,18 @@
#endif
#endif
@@ -108,9 +108,9 @@ diff -ruN misc/Python-2.7.17/Python/thread_pthread.h misc/build/Python-2.7.17/Py
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-diff -ruN misc/Python-2.7.17/configure misc/build/Python-2.7.17/configure
---- misc/Python-2.7.17/configure 2019-10-19 13:38:44.000000000 -0500
-+++ misc/build/Python-2.7.17/configure 2020-01-09 22:59:15.072666000 -0500
+diff -ruN misc/Python-2.7.18/configure misc/build/Python-2.7.18/configure
+--- misc/Python-2.7.18/configure 2019-10-19 13:38:44.000000000 -0500
++++ misc/build/Python-2.7.18/configure 2020-01-09 22:59:15.072666000 -0500
@@ -5477,7 +5477,7 @@
;;
SunOS*)
diff --git a/main/python/python-md5.patch b/main/python/python-md5.patch
index b403ceb..0cb3b7d 100644
--- a/main/python/python-md5.patch
+++ b/main/python/python-md5.patch
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.17/Modules/Setup.dist misc/build/Python-2.7.17/Modules/Setup.dist
---- misc/Python-2.7.17/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.17/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
+diff -ru misc/Python-2.7.18/Modules/Setup.dist misc/build/Python-2.7.18/Modules/Setup.dist
+--- misc/Python-2.7.18/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.18/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
@@ -252,14 +252,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
diff --git a/main/python/python-solaris.patch b/main/python/python-solaris.patch
index 7b0c409..a4d0f2a 100644
--- a/main/python/python-solaris.patch
+++ b/main/python/python-solaris.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.17/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.17/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
+--- misc/Python-2.7.18/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.18/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
@@ -640,11 +640,6 @@
in platform-specific #ifdefs.
**************************************************************************/
diff --git a/main/python/python-solver-before-std.patch b/main/python/python-solver-before-std.patch
index 979e232..ec77cc4 100644
--- a/main/python/python-solver-before-std.patch
+++ b/main/python/python-solver-before-std.patch
@@ -1,6 +1,6 @@
-diff -ur misc/Python-2.7.17/setup.py misc/build/Python-2.7.17/setup.py
---- misc/Python-2.7.17/setup.py 2016-06-25 16:49:32.000000000 -0500
-+++ misc/build/Python-2.7.17/setup.py 2016-09-02 17:09:20.687419000 -0500
+diff -ur misc/Python-2.7.18/setup.py misc/build/Python-2.7.18/setup.py
+--- misc/Python-2.7.18/setup.py 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.18/setup.py 2016-09-02 17:09:20.687419000 -0500
@@ -126,39 +126,41 @@
# system, but with only header files and libraries.
sysroot = macosx_sdk_root()
diff --git a/main/python/python-ssl.patch b/main/python/python-ssl.patch
index ea35999..04b5560 100644
--- a/main/python/python-ssl.patch
+++ b/main/python/python-ssl.patch
@@ -1,15 +1,15 @@
-diff -ur misc/Python-2.7.17/PC/VS9.0/build_ssl.py misc/build/Python-2.7.17/PC/VS9.0/build_ssl.py
---- misc/Python-2.7.17/PC/VS9.0/build_ssl.py 2020-01-10 00:33:20.903051000 -0500
-+++ misc/build/Python-2.7.17/PC/VS9.0/build_ssl.py 2020-01-10 00:33:30.274973000 -0500
+diff -ur misc/Python-2.7.18/PC/VS9.0/build_ssl.py misc/build/Python-2.7.18/PC/VS9.0/build_ssl.py
+--- misc/Python-2.7.18/PC/VS9.0/build_ssl.py 2020-01-10 00:33:20.903051000 -0500
++++ misc/build/Python-2.7.18/PC/VS9.0/build_ssl.py 2020-01-10 00:33:30.274973000 -0500
@@ -235,4 +235,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
-diff -ur misc/Python-2.7.17/setup.py misc/build/Python-2.7.17/setup.py
---- misc/Python-2.7.17/setup.py 2020-01-10 00:33:20.477509000 -0500
-+++ misc/build/Python-2.7.17/setup.py 2020-01-10 00:33:30.276902000 -0500
+diff -ur misc/Python-2.7.18/setup.py misc/build/Python-2.7.18/setup.py
+--- misc/Python-2.7.18/setup.py 2020-01-10 00:33:20.477509000 -0500
++++ misc/build/Python-2.7.18/setup.py 2020-01-10 00:33:30.276902000 -0500
@@ -854,7 +854,15 @@
depends=['socketmodule.h'],
libraries=math_libs) )
diff --git a/main/python/pyversion.mk b/main/python/pyversion.mk
index 03d75bd..d666e49 100644
--- a/main/python/pyversion.mk
+++ b/main/python/pyversion.mk
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=17
+PYMICRO=18
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
ifeq ($(GUI),UNX)
diff --git a/main/python/pyversion_dmake.mk b/main/python/pyversion_dmake.mk
index 9f10741..95544ae 100644
--- a/main/python/pyversion_dmake.mk
+++ b/main/python/pyversion_dmake.mk
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=17
+PYMICRO=18
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
[openoffice] 02/02: Fix intermittent parallel build breakage.
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 07327bc6a51e88963ef88e615603e8d41fbd62bc
Author: Don Lewis <tr...@apache.org>
AuthorDate: Fri Sep 18 10:44:22 2020 -0700
Fix intermittent parallel build breakage.
Use an order-only prerequisite to create output directories.
* This will not trigger a rebuild when the directory mtime changes.
* This removes the prerequisite from $^, allowing the latter to
be used in more places.
Add missing prerequisites for the ooxml directory. One that was missing
broke a parallel build.
Use $^ in a few more places instead of duplicating the prerequisites in
the recipies.
Remove unused prerequisites from the $(wf_GEN_model_QNameToStr_cxx) rule.
Add a prerequisite to the $(wf_GEN_doctok_ResourceIds_hxx) rule that was
in the old makefile.mk.
---
main/writerfilter/source/Makefile | 56 +++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/main/writerfilter/source/Makefile b/main/writerfilter/source/Makefile
index 9dd9458..4ea6ae1 100644
--- a/main/writerfilter/source/Makefile
+++ b/main/writerfilter/source/Makefile
@@ -44,17 +44,17 @@ wf_GEN_doctok_ResourceIds_hxx=doctok/resourceids.hxx
wf_GEN_doctok_Resources_hxx=doctok/resources.hxx
wf_GEN_doctok_Resources_cxx=resources.cxx
-$(wf_GEN_doctok_SprmIds_hxx) : doctok $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)) > $@
+$(wf_GEN_doctok_SprmIds_hxx) : $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model) | doctok
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_doctok_ResourceIds_hxx) : doctok $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)
+$(wf_GEN_doctok_ResourceIds_hxx) : $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl) | doctok
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)) > $@
-$(wf_GEN_doctok_Resources_hxx) : doctok $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)) > $@
+$(wf_GEN_doctok_Resources_hxx) : $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model) | doctok
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_doctok_Resources_cxx) : doctok $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model)) > $@
+$(wf_GEN_doctok_Resources_cxx) : $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl) | doctok
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
# ooxml
@@ -102,10 +102,10 @@ $(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt
| sed "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
$(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter
- cat $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter > $@
+ cat $^ > $@
-$(wf_GEN_ooxml_FastTokens_hxx) : $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)) > $@
+$(wf_GEN_ooxml_FastTokens_hxx) : $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml) | ooxml
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_ooxml_Factory_hxx) : $(WFDIR)ooxml/factoryinc.xsl $(wf_GEN_ooxml_Model_processed)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@
@@ -120,37 +120,37 @@ OOXMLFactory%.hxx : $(WFDIR)ooxml/factory_ns.xsl $(wf_GEN_ooxml_Model_processed)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_FactoryValues_hxx) : $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_ooxml_FactoryValues_cxx) : $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_ooxml_ResourceIds_hxx) : ooxml $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)
+$(wf_GEN_ooxml_ResourceIds_hxx) : $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed) $(wf_SRC_ooxml_FactoryTools_xsl) | ooxml
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
-$(wf_GEN_ooxml_NamespaceIds_hxx) : $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+$(wf_GEN_ooxml_NamespaceIds_hxx) : $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed) | ooxml
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)) \
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) \
| tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
-$(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model)
+$(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model) | ooxml
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_ooxml_Status_stage1) : $(wf_GEN_ooxml_Model_analyzed) $(wf_SRC_ooxml_stage1_sh)
+$(wf_GEN_ooxml_Status_stage1) : $(wf_GEN_ooxml_Model_analyzed) $(wf_SRC_ooxml_stage1_sh) | ooxml
$(wf_SRC_ooxml_Status_stage1_sh) $(wf_GEN_ooxml_Model_analyzed) $(WFDIR)dmapper > $@
-$(wf_GEN_ooxml_Status_stage2) : $(wf_SRC_ooxml_Status_stage2_xsl) $(wf_GEN_ooxml_Status_stage1)
+$(wf_GEN_ooxml_Status_stage2) : $(wf_SRC_ooxml_Status_stage2_xsl) $(wf_GEN_ooxml_Status_stage1) | ooxml
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_ooxml_Status_stage3) : $(wf_SRC_ooxml_Status_stage3_xsl) $(wf_GEN_ooxml_Status_stage2)
+$(wf_GEN_ooxml_Status_stage3) : $(wf_SRC_ooxml_Status_stage3_xsl) $(wf_GEN_ooxml_Status_stage2) | ooxml
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_ooxml_Status_todo) : $(wf_SRC_ooxml_Status_todo_xsl) $(wf_GEN_ooxml_Status_stage3)
+$(wf_GEN_ooxml_Status_todo) : $(wf_SRC_ooxml_Status_todo_xsl) $(wf_GEN_ooxml_Status_stage3) | ooxml
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_ooxml_Status_efforts) : $(wf_SRC_ooxml_Status_efforts_xsl) $(wf_GEN_ooxml_Status_todo)
+$(wf_GEN_ooxml_Status_efforts) : $(wf_SRC_ooxml_Status_efforts_xsl) $(wf_GEN_ooxml_Status_todo) | ooxml
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
# rtftok
@@ -180,16 +180,16 @@ wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt
wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl
$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-$(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrheader $(WFDIR)resourcemodel/qnametostrfooter $(wf_SRC_ooxml_FactoryTools_xsl) $(wf_SRC_doctok_ResourceTools_xsl)
- cat $(WFDIR)resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrfooter > $@
+$(wf_GEN_model_QNameToStr_cxx): $(WFDIR)resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrfooter
+ cat $^ > $@
$(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_model_SprmCodeToStr_cxx): $(WFDIR)resourcemodel/sprmcodetostrheader $(wf_GEN_model_SprmCodeToStr_tmp) $(WFDIR)resourcemodel/sprmcodetostrfooter
cat $^ > $@
@@ -198,7 +198,7 @@ $(wf_GEN_ooxml_Namespacesmap_xsl) : $(wf_SRC_ooxml_Model) $(wf_DEP_ooxml_namespa
$(PERL) $(wf_SRC_model_NamespacePreprocess) $(wf_DEP_ooxml_namespaces_txt) > $@
$(wf_GEN_ooxml_preprocess_xsl) : $(wf_SRC_ooxml_Preprocess_xsl)
- cp -f $(wf_SRC_ooxml_Preprocess_xsl) $@
+ cp -f $^ $@
$(wf_GEN_ooxml_Model_processed) : $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_GEN_ooxml_preprocess_xsl) $(wf_SRC_ooxml_Model)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_SRC_ooxml_Model)) > $@