# HG changeset patch # User Steve Dower # Date 1416689697 28800 # Sat Nov 22 12:54:57 2014 -0800 # Node ID f3f2785c5a3b6a18cf34fea85bbe472ac8dd1a4c # Parent 7d5754af95a99032fbe942f638c91f4c08cf7555 Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release. diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ .gdb_history Doc/build/ Doc/venv/ +Lib/distutils/command/*.pdb Lib/lib2to3/*.pickle Lib/test/data/* Lib/_sysconfigdata.py @@ -27,23 +28,26 @@ Programs/_testembed PC/python_nt*.h PC/pythonnt_rc*.h -PCbuild/*.bsc -PCbuild/*.dll -PCbuild/*.exe -PCbuild/*.exp -PCbuild/*.lib -PCbuild/*.ncb -PCbuild/*.o -PCbuild/*.pdb +PC/*/*.exe +PC/*/*.exp +PC/*/*.lib +PC/*/*.bsc +PC/*/*.dll +PC/*/*.pdb +PC/*/*.user +PC/*/*.ncb +PC/*/*.suo +PC/*/Win32-temp-* +PC/*/x64-temp-* +PC/*/amd64 PCbuild/*.user PCbuild/*.suo PCbuild/*.*sdf -PCbuild/Win32-temp-* -PCbuild/x64-temp-* PCbuild/*-pgi PCbuild/*-pgo PCbuild/amd64/ -PCbuild/ipch +PCbuild/obj +PCBuild/win32 .purify Parser/pgen __pycache__ @@ -78,3 +82,5 @@ coverage/ externals/ htmlcov/ +Tools/ssl/amd64 +Tools/ssl/win32 diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -50,13 +50,12 @@ *.pyd *.cover *~ +Lib/distutils/command/*.pdb Lib/lib2to3/*.pickle Lib/test/data/* Misc/*.wpu PC/python_nt*.h PC/pythonnt_rc*.h -PC/*.obj -PC/*.exe PC/*/*.exe PC/*/*.exp PC/*/*.lib @@ -69,23 +68,14 @@ PC/*/Win32-temp-* PC/*/x64-temp-* PC/*/amd64 -PCbuild/*.exe -PCbuild/*.dll -PCbuild/*.pdb -PCbuild/*.lib -PCbuild/*.exp -PCbuild/*.o -PCbuild/*.ncb -PCbuild/*.bsc PCbuild/*.user PCbuild/*.suo PCbuild/*.*sdf -PCbuild/Win32-temp-* -PCbuild/x64-temp-* PCbuild/*-pgi PCbuild/*-pgo PCbuild/amd64 -PCbuild/ipch +PCbuild/obj +PCbuild/win32 Tools/unicode/build/ Tools/unicode/MAPPINGS/ BuildLog.htm @@ -100,3 +90,5 @@ *.gcno *.gcov coverage.info +Tools/ssl/amd64 +Tools/ssl/win32 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -19,6 +19,8 @@ i = i + len(prefix) s, rest = sys.version[i:].split(" ", 1) majorVersion = int(s[:-2]) - 6 + if majorVersion >= 13: + majorVersion += 1 minorVersion = int(s[2:3]) / 10.0 # I don't think paths are affected by minor version in version 6 if majorVersion == 6: @@ -36,8 +38,10 @@ return None if version <= 6: clibname = 'msvcrt' + elif version <= 13: + clibname = 'msvcr%d' % (version * 10) else: - clibname = 'msvcr%d' % (version * 10) + clibname = 'appcrt%d' % (version * 10) # If python was built with in debug mode import importlib.machinery diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -209,7 +209,7 @@ if MSVC_VERSION >= 9: # Use the .lib files for the correct architecture if self.plat_name == 'win32': - suffix = '' + suffix = 'win32' else: # win-amd64 or win-ia64 suffix = self.plat_name[4:] diff --git a/Lib/distutils/command/wininst-14.0-amd64.exe b/Lib/distutils/command/wininst-14.0-amd64.exe new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9affe13039517798970f5e3a8d9f4d1d13e79464 GIT binary patch literal 84480 zc%0h^=X% z;hNQTb=6&WMR!+G*A-obQddY?Xj)!Ni@b=t7TjGY1ht?G1%>&YbMB-s3cAnl`~Bzn zJbdWQ%$;-ZJ@?%6cF(96z6Z~nKAk+!`pHuiR{uu;ez(w@~g!lSyA6{qh zY#%;l?tK;63(Ft4xBTw=vrF$@u;2k-_Ut*?<^BcP_btelCr!@2|ABkvT$P@lV%Mv9 zQXP8x)}TKn@t5|gFLgWoPQCoylx=jsFm)6CKA0Mz-$kj-@H=?X2PrM|`=^vG^t&Nt z6V>5MDS_WF{_$vPBmJ(V=U@C|aVq}adSB^WY$wr$VwWJ?v%H@$_NnDl5_z4%#X@S* z06};fZa(38@~+hb1A%dwShPJltGw& z9{g4sgi+>R0Ba1w^H^rBAmsnZ(Bxjm;d;sm!fNxmpatP7-<%~r`0e_oju7_U)E6dO z5K68pzvph>-GXq%)4WdM8Tk8kUpOcHzlwti$`z0l>omE-@O`-ORSP*F^%43?guLnp zaL%jBE6PjZnrH&F5i;O+)Y;(X%zpp?sqa8593w&b0bJp^De?c-Kc%L{H)y4yI_ygy zd$r%#WSF4@A_o5#joY?uQ-U+>79}{}ZdHOld*(DHa3tH!x)k=Y!j396ZDRGaP(x*b zAXYyC7xgo+KDJe}MgNEw`;?lnZ;`@wG=XZd-T4PWU}~UC^Ix6U2AP^of}EPLf3Q-c z`38DelM=H1`y)XJDQ0bNJVjx9*5j~gd!5HOTm8e=ufrSLcdsDM-38u<0_)8L)?@_K z8x3O3JWbOSHp8A;+w&FXvpbc*rtDc~>z8z!gncVk*o*d6P{hTKda;|QSd6Nu z`Jx`uu)=nVvZ@5`vF8d=*`8C0pm{B>yf9Rit=V2i)L5qieH3ecN7&v5S%EI2Kf}Ws z-E1$^puToS)1cR{#uo>=ihU`pS+nH;RD6O`bHG=su)XV%W3_gm-9+9Nw9(UCm{5WH zY+`J-Q?p&()2{z=tYsJw=Dpp5;9*ftn|37U-u20JofnSnrhz};qg*59itC=Sqs(|h zvfU}Jd&2${b>O3yG0OwQV>{@P5}IOnYPM%z#x{4jYL5FYnr#}~#a}~ga}e9SHW}!e z?FvaI%{HDxDooXESL1cf7k(QwE>>6IIE8E%05-8(@EXcz>l9Vkb}4jAl4cuA#kWKM zG+XB?EPh-sK8hFrx*dw2M?>D^3C*w<^F&f-nZG+P;Q}WPS>oC154E z)Se5^^5xLPX`#uT>aywhWc0KPkh^^Y0AXJ);5iQp#4n&C>R;~=gn~xjP<)mF&+dh1 zG7GOq9jRUj1@jJYz̑)KFu06Q6AIpBYW5FoO^fK`api+1c6a@w6%=zS*iepaIk zm~FqOlq0UPkRVWR;!%(Twn+(22O(IPsRWl~PnD)fQ%M#=s}&?@)e%&*3N!C5FbGN> z0M}3h<4(+hdp5fBW&@zDDM622Ve)mS980e|?&u19HCU=zdfnmTiRONxjC@}*Fx~njz0qddy=y?k$~gg%mR7drDQ0@k^=dhT@5aB!9D1^{7xh z(P;8-ki?A>E(|nW1;00E8=F0)hcGA0WBj+VRVj@ccPWAJg>G@9_k!RQyQ~;@!1dHD zH#{_MQH&7tWH5fYmEwPR3aTF#R%m*W32vWuej00 zo2L?GFX4CqlLIlSF*!fmH=r^fHMaojFASQSBg;D>=i3d~iOd;TYP#<(7rQwV=um$? z)B_miQnw{>-GnsIP-V#Cc`bN50I##vwo||cz<`%ZP|gLoSfGLog-x-S1d;byv-*ec zP@jp_gU_HinoF=|WLcS!)@X-P@^#-xT4X(1cGU^b@rgv)S_GM>Uj z*-Cf091*v1x0^L0(GoNvDk5Qg*^pk{XN=|i;WWlVD~)mG^)r0t%ImN8_k-Fct=U@| z)`xvBX!)2AI<8xq5Q>MAw@qFC5SK@kACSg;kVdDQJ)-FPNSZ0lmdvCz<^Xk{qv~v zLnV-9K zdS!mzvJsW}3w-I7`Q?5$JZmzh$H$gMjp-?H1Kv|oAbKXAE7e($k3ls6nZZ9P2LFC+ zir)gzpreeZYmLZBx$&ghRJsRw_cQdfoJ~ejPx;){qH)hg#8|p~gMoa_ewyu?U+ZpS zF?1$yiEAS2zM%PHgn)8)!mycb1RnM$gKX^ICV*_9{hp@Rx86$5N$ayzk;1w(n+b`< z(*HHiKp5mI!AW55la=7OwsE}PSyV?R(k=To@cDYoTh}Pvyj9yPdCu>lOr8dQ2>aN> zj>eM}=CnvaA;9PxXyvOSgHRs_#|czr7$hyyVMQ@Q$6>H$yYB@;WlI7`8NL*pp}ZD& zdcJ0xNKZ$P#TLE*yUv~H69WM$-0xUQN=X00h29 zDF7yS1KQGF&_|5?Id%U)!eK%;4xBqnw{s+#o=5MnU;Pmyfn8LD{B}8N3%1CDNY#{s z1HhsRdxDb$blSVVJ~|D2t9kjT&+eLaSL0dd3b{B-K;hOJE5{B2V@m!Zpl(RWN(6mH z%~l5t0lLK4f> zHfKH<4{-R4QQ* zzF!C0LUlT?V|z2g?38=z;Bs7bq?k+E(rdb9592CIVB9s=)02<=g;4%}YUAE#$*J%U z0bZRr-hf2ChaTJjjmNf-va6|fPuVl_rApsmdS zBluoNcYE9x!~{A3@Sh+)XfMJ0s!d2VuE#7>mC&E<&NJkuhm(kwxw#29eGQRvP9^dh$l6?_C;Uz)J+Oq* zVoFN@p{i%Gs}E%XE(=;nAAByMV;|OR|CkE&-H4Ti$erDaBIxvlyiZ}qT)fNogj}_F zw?ua+ZEmb2fZBHiB)hykf^hmCL=PKY6S6w(*O7hpN6Fmtw&=0=NZB+ z4XRCoYGbo#q6c0&j%*3!?rubk4VqPlG9lEM1eC(2*5cEra9XcJq#(rky@Kh~j+x zaVkFULb|f4m1t3i>Tm!vU5617X7?HHsLn;85dVx6HiI+s4TfOBbU z5^*WABe=Kd^MJ}w+@Xo!r!}~P6ZdgHs~J2u6)>Ga%Hi?J-3sJN%{J<3WCuc_8GAGr zsRpui1p3Wd0RaaUdeli81)MsT-f|^eYnL1Yankh*$wo1kjWt|0GOkR>#wr6%;78nO zz$i|(i8#^bL8^s9JnFIWm%VNd{{nA@eSNEedo3S7MaoF5`2%ro`b|y}