From 31bf50b6cb8ddaa7c87bfcd0411b7bedfefd801e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 29 Jul 2014 17:08:01 +0300 Subject: Make python3 build with VS2013 This time use a patch to mangle the project files a bit so that msbuild likes them. Change-Id: I1293f4a92164ec6431b96c39f118cbdedbe5fe32 --- external/python3/UnpackedTarball_python3.mk | 8 + external/python3/python-vc2013.patch.1 | 1213 +++++++++++++++++++++++++++ 2 files changed, 1221 insertions(+) create mode 100644 external/python3/python-vc2013.patch.1 (limited to 'external/python3') diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 41725c3bba68..01c2202be018 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -46,4 +46,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ )) endif +ifeq ($(OS)-$(COM),WNT-MSC) +ifneq ($(filter 120,$(VCVER)),) +$(eval $(call gb_UnpackedTarball_add_patches,python3,\ + external/python3/python-vc2013.patch.1 \ +)) +endif +endif + # vim: set noet sw=4 ts=4: diff --git a/external/python3/python-vc2013.patch.1 b/external/python3/python-vc2013.patch.1 new file mode 100644 index 000000000000..c7eb30759d1f --- /dev/null +++ b/external/python3/python-vc2013.patch.1 @@ -0,0 +1,1213 @@ +-*- Mode:Diff -*- +--- python3/PCbuild/_ctypes.vcxproj ++++ python3/PCbuild/_ctypes.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_ctypes_test.vcxproj ++++ python3/PCbuild/_ctypes_test.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_decimal.vcxproj ++++ python3/PCbuild/_decimal.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_elementtree.vcxproj ++++ python3/PCbuild/_elementtree.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_freeze_importlib.vcxproj ++++ python3/PCbuild/_freeze_importlib.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -28,23 +28,27 @@ + Application + true + Unicode ++ v120 + + + Application + true + Unicode ++ v120 + + + Application + false + true + Unicode ++ v120 + + + Application + false + true + Unicode ++ v120 + + + +--- python3/PCbuild/_msi.vcxproj ++++ python3/PCbuild/_msi.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_multiprocessing.vcxproj ++++ python3/PCbuild/_multiprocessing.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_socket.vcxproj ++++ python3/PCbuild/_socket.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_ssl.vcxproj ++++ python3/PCbuild/_ssl.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_testbuffer.vcxproj ++++ python3/PCbuild/_testbuffer.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/_testcapi.vcxproj ++++ python3/PCbuild/_testcapi.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/kill_python.vcxproj ++++ python3/PCbuild/kill_python.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -28,19 +28,23 @@ + Application + NotSet + true ++ v120 + + + Application + NotSet ++ v120 + + + Application + NotSet + true ++ v120 + + + Application + NotSet ++ v120 + + + +--- python3/PCbuild/make_buildinfo.vcxproj ++++ python3/PCbuild/make_buildinfo.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Release +@@ -19,10 +19,12 @@ + + Application + NotSet ++ v120 + + + Application + NotSet ++ v120 + + + +--- python3/PCbuild/make_versioninfo.vcxproj ++++ python3/PCbuild/make_versioninfo.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -27,17 +27,21 @@ + Application + false + NotSet ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application ++ v120 + + + Application ++ v120 + + + +--- python3/PCbuild/pyexpat.vcxproj ++++ python3/PCbuild/pyexpat.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/pylauncher.vcxproj ++++ python3/PCbuild/pylauncher.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -43,47 +43,55 @@ + Application + true + MultiByte ++ v120 + + + Application + true + MultiByte ++ v120 + + + Application + false + true + MultiByte ++ v120 + + + Application + false + true + MultiByte ++ v120 + + + Application + false + true + MultiByte ++ v120 + + + Application + false + true + MultiByte ++ v120 + + + Application + false + true + MultiByte ++ v120 + + + Application + false + true + MultiByte ++ v120 + + + +@@ -308,4 +316,4 @@ + + + +- ++ +\ No newline at end of file +--- python3/PCbuild/python.vcxproj ++++ python3/PCbuild/python.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -42,41 +42,49 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + NotSet ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +--- python3/PCbuild/pythoncore.vcxproj ++++ python3/PCbuild/pythoncore.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -42,35 +42,43 @@ + + DynamicLibrary + false ++ v120 + + + DynamicLibrary + false ++ v120 + + + DynamicLibrary + false + NotSet ++ v120 + + + DynamicLibrary + false ++ v120 + + + DynamicLibrary + false ++ v120 + + + DynamicLibrary + false ++ v120 + + + DynamicLibrary + false ++ v120 + + + DynamicLibrary + false ++ v120 + + + +--- python3/PCbuild/pywlauncher.vcxproj ++++ python3/PCbuild/pywlauncher.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -43,29 +43,41 @@ + Application + true + Unicode ++ v120 + + + Application + true + Unicode ++ v120 + + + Application + false + true + Unicode ++ v120 + + + Application + false + true + Unicode ++ v120 + + + Unicode ++ v120 + + + Unicode ++ v120 ++ ++ ++ v120 ++ ++ ++ v120 + + + +--- python3/PCbuild/select.vcxproj ++++ python3/PCbuild/select.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/unicodedata.vcxproj ++++ python3/PCbuild/unicodedata.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/w9xpopen.vcxproj ++++ python3/PCbuild/w9xpopen.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +--- python3/PCbuild/winsound.vcxproj ++++ python3/PCbuild/winsound.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -44,39 +44,47 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet ++ v120 + + + +--- python3/PCbuild/xxlimited.vcxproj ++++ python3/PCbuild/xxlimited.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + PGInstrument +@@ -36,31 +36,37 @@ + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + DynamicLibrary + NotSet + true ++ v120 + + + -- cgit