[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61419] trunk/lib/win64_vc12: Update to python 3.4.1,
Martijn Berger
martijn.berger at gmail.com
Fri Aug 29 14:13:34 CEST 2014
Revision: 61419
https://developer.blender.org/rBL61419
Author: juicyfruit
Date: 2014-08-29 12:13:33 +0000 (Fri, 29 Aug 2014)
Log Message:
-----------
Update to python 3.4.1,
Workaround -> http://bugs.python.org/issue17797
workaround / fix T40907
Modified Paths:
--------------
trunk/lib/win64_vc12/python/include/python3.4/abstract.h
trunk/lib/win64_vc12/python/include/python3.4/objimpl.h
trunk/lib/win64_vc12/python/include/python3.4/patchlevel.h
trunk/lib/win64_vc12/python/include/python3.4/pytime.h
trunk/lib/win64_vc12/python/include/python3.4/unicodeobject.h
trunk/lib/win64_vc12/python/lib/python34.dll
trunk/lib/win64_vc12/python/lib/python34.exp
trunk/lib/win64_vc12/python/lib/python34.lib
trunk/lib/win64_vc12/python/lib/python34_d.dll
trunk/lib/win64_vc12/python/lib/python34_d.lib
trunk/lib/win64_vc12/python/lib/python34_d.pdb
trunk/lib/win64_vc12/release/python34.tar.gz
trunk/lib/win64_vc12/release/python34_d.tar.gz
Added Paths:
-----------
trunk/lib/win64_vc12/python/fixes.diff
Removed Paths:
-------------
trunk/lib/win64_vc12/python/include/python3.3/
trunk/lib/win64_vc12/python/lib/python33.dll
trunk/lib/win64_vc12/python/lib/python33.lib
trunk/lib/win64_vc12/python/lib/python33_d.dll
trunk/lib/win64_vc12/python/lib/python33_d.lib
trunk/lib/win64_vc12/python/lib/python33_d.pdb
trunk/lib/win64_vc12/python/msvc_2013.patch
trunk/lib/win64_vc12/python/python_msvc_2013_compile.diff
trunk/lib/win64_vc12/release/python33.tar.gz
trunk/lib/win64_vc12/release/python33_d.tar.gz
trunk/lib/win64_vc12/release/python33_numpy_1.8.tar.gz
Added: trunk/lib/win64_vc12/python/fixes.diff
===================================================================
--- trunk/lib/win64_vc12/python/fixes.diff (rev 0)
+++ trunk/lib/win64_vc12/python/fixes.diff 2014-08-29 12:13:33 UTC (rev 61419)
@@ -0,0 +1,257 @@
+diff -ur Python-3.4.1.orig/PCbuild/_msi.vcxproj Python-3.4.1/PCbuild/_msi.vcxproj
+--- Python-3.4.1.orig/PCbuild/_msi.vcxproj Mon May 19 07:19:39 2014
++++ Python-3.4.1/PCbuild/_msi.vcxproj Fri Aug 29 12:07:18 2014
+@@ -151,7 +151,7 @@
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ </Link>
+ </ItemDefinitionGroup>
+@@ -160,13 +160,13 @@
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ </Link>
+ </ItemDefinitionGroup>
+@@ -175,13 +175,13 @@
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ </Link>
+ </ItemDefinitionGroup>
+@@ -190,14 +190,14 @@
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ </Link>
+ </ItemDefinitionGroup>
+@@ -206,7 +206,7 @@
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <Link>
+- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <BaseAddress>0x1D160000</BaseAddress>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+diff -ur Python-3.4.1.orig/Python/pythonrun.c Python-3.4.1/Python/pythonrun.c
+--- Python-3.4.1.orig/Python/pythonrun.c Mon May 19 07:19:40 2014
++++ Python-3.4.1/Python/pythonrun.c Fri Aug 29 12:05:40 2014
+@@ -1188,7 +1188,11 @@
+ * and fileno() may point to an invalid file descriptor. For example
+ * GUI apps don't have valid standard streams by default.
+ */
++#ifdef _MSC_VER
++ if (!is_valid_fd(fd) || GetStdHandle(STD_INPUT_HANDLE) == NULL) {
++#else
+ if (!is_valid_fd(fd)) {
++#endif
+ std = Py_None;
+ Py_INCREF(std);
+ }
+@@ -1203,7 +1207,11 @@
+
+ /* Set sys.stdout */
+ fd = fileno(stdout);
++#ifdef _MSC_VER
++ if (!is_valid_fd(fd) || GetStdHandle(STD_OUTPUT_HANDLE) == NULL) {
++#else
+ if (!is_valid_fd(fd)) {
++#endif
+ std = Py_None;
+ Py_INCREF(std);
+ }
+@@ -1219,7 +1227,11 @@
+ #if 1 /* Disable this if you have trouble debugging bootstrap stuff */
+ /* Set sys.stderr, replaces the preliminary stderr */
+ fd = fileno(stderr);
++#ifdef _MSC_VER
++ if (!is_valid_fd(fd) || GetStdHandle(STD_ERROR_HANDLE) == NULL) {
++#else
+ if (!is_valid_fd(fd)) {
++#endif
+ std = Py_None;
+ Py_INCREF(std);
+ }
+diff -ur Python-3.4.1.orig/Tools/buildbot/build-amd64.bat Python-3.4.1/Tools/buildbot/build-amd64.bat
+--- Python-3.4.1.orig/Tools/buildbot/build-amd64.bat Mon May 19 07:19:40 2014
++++ Python-3.4.1/Tools/buildbot/build-amd64.bat Fri Aug 29 13:02:18 2014
+@@ -1,6 +1,6 @@
+ @rem Used by the buildbot "compile" step.
+-cmd /c Tools\buildbot\external-amd64.bat
+-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+-cmd /c Tools\buildbot\clean-amd64.bat
++::cmd /c Tools\buildbot\external-amd64.bat
++::call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" amd64
++::cmd /c Tools\buildbot\clean-amd64.bat
+
+-msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64
++msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64 /p:PlatformToolset=v120
+diff -ur Python-3.4.1.orig/Tools/buildbot/build.bat Python-3.4.1/Tools/buildbot/build.bat
+--- Python-3.4.1.orig/Tools/buildbot/build.bat Mon May 19 07:19:40 2014
++++ Python-3.4.1/Tools/buildbot/build.bat Fri Aug 29 12:08:12 2014
+@@ -1,6 +1,6 @@
+ @rem Used by the buildbot "compile" step.
+ cmd /c Tools\buildbot\external.bat
+-call "%VS100COMNTOOLS%vsvars32.bat"
++call "%VS120COMNTOOLS%vsvars32.bat"
+ cmd /c Tools\buildbot\clean.bat
+
+ msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
+diff -ur Python-3.4.1.orig/Tools/buildbot/buildmsi.bat Python-3.4.1/Tools/buildbot/buildmsi.bat
+--- Python-3.4.1.orig/Tools/buildbot/buildmsi.bat Mon May 19 07:19:40 2014
++++ Python-3.4.1/Tools/buildbot/buildmsi.bat Fri Aug 29 12:08:26 2014
+@@ -2,7 +2,7 @@
+
+ cmd /c Tools\buildbot\external.bat
+ @rem build release versions of things
+-call "%VS100COMNTOOLS%vsvars32.bat"
++call "%VS120COMNTOOLS%vsvars32.bat"
+
+ @rem build Python
+ msbuild /p:useenv=true PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32
+diff -ur Python-3.4.1.orig/Tools/buildbot/clean-amd64.bat Python-3.4.1/Tools/buildbot/clean-amd64.bat
+--- Python-3.4.1.orig/Tools/buildbot/clean-amd64.bat Mon May 19 07:19:40 2014
++++ Python-3.4.1/Tools/buildbot/clean-amd64.bat Fri Aug 29 12:08:39 2014
+@@ -1,5 +1,5 @@
+ @rem Used by the buildbot "clean" step.
+-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
++call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+ @echo Deleting .pyc/.pyo files ...
+ del /s Lib\*.pyc Lib\*.pyo
+ @echo Deleting test leftovers ...
+diff -ur Python-3.4.1.orig/Tools/buildbot/clean.bat Python-3.4.1/Tools/buildbot/clean.bat
+--- Python-3.4.1.orig/Tools/buildbot/clean.bat Mon May 19 07:19:40 2014
++++ Python-3.4.1/Tools/buildbot/clean.bat Fri Aug 29 12:08:31 2014
+@@ -1,5 +1,5 @@
+ @rem Used by the buildbot "clean" step.
+-call "%VS100COMNTOOLS%vsvars32.bat"
++call "%VS120COMNTOOLS%vsvars32.bat"
+ @echo Deleting test leftovers ...
+ rmdir /s /q build
+ cd PCbuild
+diff -ur Python-3.4.1.orig/Tools/buildbot/external-amd64.bat Python-3.4.1/Tools/buildbot/external-amd64.bat
+--- Python-3.4.1.orig/Tools/buildbot/external-amd64.bat Mon May 19 07:19:40 2014
++++ Python-3.4.1/Tools/buildbot/external-amd64.bat Fri Aug 29 13:38:41 2014
+@@ -2,20 +2,35 @@
+
+ @rem Assume we start inside the Python source directory
+ call "Tools\buildbot\external-common.bat"
+-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
++call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
+
+ if not exist tcltk64\bin\tcl86tg.dll (
+ cd tcl-8.6.1.0\win
+- nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
+- nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
+ cd ..\..
+ )
+
+ if not exist tcltk64\bin\tk86tg.dll (
+ cd tk-8.6.1.0\win
+- nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 clean
+- nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 all
+- nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64\tcltk64\ TCLDIR=..\..\tcl-8.6.1.0 clean
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64\tcltk64\ TCLDIR=..\..\tcl-8.6.1.0 all
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64\tcltk64\ TCLDIR=..\..\tcl-8.6.1.0 install
+ cd ..\..
++)
++
++if not exist tcltk64\bin\tcl86t.dll (
++ cd tcl-8.6.1.0\win
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 DEBUG=0 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 DEBUG=0 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
++ cd ..\..
++)
++
++if not exist tcltk64\bin\tk86t.dll (
++ cd tk-8.6.1.0\win
++ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0600 OPTS=noxp DEBUG=0 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64\tcltk64\ TCLDIR=..\..\tcl-8.6.1.0 clean
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list