[Python-checkins] cpython (merge default -> default): Merge.
larry.hastings
python-checkins at python.org
Mon Mar 9 10:40:38 CET 2015
https://hg.python.org/cpython/rev/41839a8a526b
changeset: 94917:41839a8a526b
parent: 94916:a73b782ae266
parent: 94911:82df13f0ea9b
user: Larry Hastings <larry at hastings.org>
date: Mon Mar 09 02:40:13 2015 -0700
summary:
Merge.
files:
Doc/library/index.rst | 2 +-
Doc/library/ssl.rst | 2 +-
Lib/test/test_sysconfig.py | 6 ++++++
Misc/NEWS | 4 ++++
Tools/msi/bundle/Default.thm | 2 +-
Tools/msi/bundle/bundle.wxs | 4 ++--
Tools/msi/msi.props | 4 ++--
Tools/msi/uploadrelease.bat | 3 ++-
Tools/msi/uploadrelease.proj | 4 ++--
configure | 10 +++++++++-
configure.ac | 10 +++++++++-
11 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/Doc/library/index.rst b/Doc/library/index.rst
--- a/Doc/library/index.rst
+++ b/Doc/library/index.rst
@@ -20,7 +20,7 @@
encourage and enhance the portability of Python programs by abstracting
away platform-specifics into platform-neutral APIs.
-The Python installers for the Windows platform usually includes
+The Python installers for the Windows platform usually include
the entire standard library and often also include many additional
components. For Unix-like operating systems Python is normally provided
as a collection of packages, so it may be necessary to use the packaging
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -556,7 +556,7 @@
prefer trusted certificates when building the trust chain to validate a
certificate. This flag is enabled by default.
- .. versionadded:: 3.4.5
+ .. versionadded:: 3.4.4
.. data:: PROTOCOL_SSLv23
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -389,6 +389,12 @@
self.assertIsNotNone(vars['SO'])
self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
+ @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test')
+ def test_bitness_in_ext_suffix(self):
+ suffix = sysconfig.get_config_var('EXT_SUFFIX')
+ bitness = '-32b' if sys.maxsize < 2**32 else '-64b'
+ self.assertTrue(suffix.endswith(bitness + '.so'), suffix)
+
class MakefileTests(unittest.TestCase):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,10 @@
Core and Builtins
-----------------
+- Issue #22980: Under Linux, C extensions now include bitness in the file
+ name, to make it easy to test 32-bit and 64-bit builds in the same
+ working tree.
+
- Issue #23571: PyObject_Call() and PyCFunction_Call() now raise a SystemError
if a function returns a result and raises an exception. The SystemError is
chained to the previous exception.
diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm
--- a/Tools/msi/bundle/Default.thm
+++ b/Tools/msi/bundle/Default.thm
@@ -115,7 +115,7 @@
<Image X="0" Y="0" Width="162" Height="352" ImageFile="SideBar.png"/>
<Hypertext Name="FailureLogFileLink" X="185" Y="71" Width="-11" Height="60" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
- <Hypertext Name="FailureMessageText" X="185" Y="-100" Width="-11" Height="34" FontId="3" TabStop="yes" HideWhenDisabled="yes">Failure Message</Hypertext>
+ <Hypertext Name="FailureMessageText" X="185" Y="-100" Width="-11" Height="60" FontId="3" TabStop="yes" HideWhenDisabled="yes"></Hypertext>
<Text Name="FailureRestartText" X="185" Y="-40" Width="-11" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
<Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
<Button Name="FailureCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.CloseButton)</Button>
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -2,11 +2,11 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Bundle Name="!(loc.FullProductName)"
- UpgradeCode="$(var.UpgradeCode)"
+ UpgradeCode="$(var.CoreUpgradeCode)"
Version="$(var.Version)"
IconSourceFile="bundle.ico"
Manufacturer="!(loc.Manufacturer)"
- UpdateUrl="http://www.python.org/"
+ AboutUrl="http://www.python.org/"
DisableModify="button"
Compressed="no">
<BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)">
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -62,7 +62,7 @@
<Bitness Condition="$(Platform) == 'x64'">64-bit</Bitness>
<DefineConstants>
$(DefineConstants);
- Version=$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber).$(RevisionNumber);
+ Version=$(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0;
ShortVersion=$(MajorVersionNumber).$(MinorVersionNumber);
LongVersion=$(PythonVersion);
MajorVersionNumber=$(MajorVersionNumber);
@@ -142,7 +142,7 @@
</ItemGroup>
<Target Name="_GenerateGuids" AfterTargets="PrepareForBuild">
<PropertyGroup>
- <_Uuids>@(_Uuid->'("%(Identity)", "%(Uri)")',',')</_Uuids>
+ <_Uuids>@(_Uuid->'("%(Identity)", "$(MajorVersionNumber).$(MinorVersionNumber)/%(Uri)")',',')</_Uuids>
<_GenerateCommand>import uuid; print('\n'.join('{}={}'.format(i, uuid.uuid5(uuid.UUID('c8d9733e-a70c-43ff-ab0c-e26456f11083'), '$(ReleaseUri)' + j)) for i,j in [$(_Uuids.Replace(`"`,`'`))]))</_GenerateCommand>
</PropertyGroup>
diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat
--- a/Tools/msi/uploadrelease.bat
+++ b/Tools/msi/uploadrelease.bat
@@ -30,9 +30,10 @@
echo Found pscp.exe at %PSCP%
call "%PCBUILD%env.bat" > nul 2> nul
+pushd "%D%"
msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86
msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false
-
+popd
exit /B 0
:Help
diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj
--- a/Tools/msi/uploadrelease.proj
+++ b/Tools/msi/uploadrelease.proj
@@ -41,14 +41,14 @@
<Target Name="_Upload" Condition="!$(DryRun)">
<Exec Command=""$(PLINK)" $(User)@$(Host) mkdir %(File.CopyTo) ^&^& chgrp downloads %(File.CopyTo) ^&^& chmod g-w,o+rx %(File.CopyTo)
"$(PSCP)" @(File,' ') $(User)@$(Host):%(File.CopyTo)
-"$(PLINK)" $(User)@$(Host) chgrp downloads %(File.CopyTo)/* ^&^& chmod g-w,o+r %(File.CopyTo)/*
+"$(PLINK)" $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
" />
</Target>
<Target Name="_PrintNames" Condition="$(DryRun)">
<Exec Command="echo "$(PLINK)" $(User)@$(Host) mkdir %(File.CopyTo) ^&^& chgrp downloads %(File.CopyTo) ^&^& chmod g-w,o+rx %(File.CopyTo)
echo "$(PSCP)" @(File,' ') $(User)@$(Host):%(File.CopyTo)
-echo "$(PLINK)" $(User)@$(Host) chgrp downloads %(File.CopyTo)/* ^&^& chmod g-w,o+r %(File.CopyTo)/*
+echo "$(PLINK)" $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
echo.
echo." />
</Target>
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -14200,7 +14200,15 @@
$as_echo "$ABIFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
$as_echo_n "checking SOABI... " >&6; }
-SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}
+
+case $ac_sys_system in
+ Linux*|GNU*)
+ BITNESS_SUFFIX=-$(($ac_cv_sizeof_void_p * 8))b;;
+ *)
+ BITNESS_SUFFIX=;;
+esac
+SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${BITNESS_SUFFIX}
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
$as_echo "$SOABI" >&6; }
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -4175,7 +4175,15 @@
AC_MSG_CHECKING(ABIFLAGS)
AC_MSG_RESULT($ABIFLAGS)
AC_MSG_CHECKING(SOABI)
-SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}
+
+case $ac_sys_system in
+ Linux*|GNU*)
+ BITNESS_SUFFIX=-$(($ac_cv_sizeof_void_p * 8))b;;
+ *)
+ BITNESS_SUFFIX=;;
+esac
+SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${BITNESS_SUFFIX}
+
AC_MSG_RESULT($SOABI)
AC_SUBST(EXT_SUFFIX)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list