Author: neal.norwitz
Date: Wed Jun 13 06:56:32 2007
New Revision: 55954
Added:
python/branches/p3yk/Tools/buildbot/external-amd64.bat
- copied unchanged from r55948,
python/trunk/Tools/buildbot/external-amd64.bat
Modified:
python/branches/p3yk/ (props changed)
python/branches/p3yk/Include/pyport.h
python/branches/p3yk/Lib/platform.py
python/branches/p3yk/PCbuild/_bsddb.vcproj
python/branches/p3yk/PCbuild/_ssl.mak
python/branches/p3yk/PCbuild/build_ssl.bat
python/branches/p3yk/PCbuild/build_ssl.py
python/branches/p3yk/Tools/buildbot/build-amd64.bat
Log:
Merged revisions 55913-55950 via svnmerge from
svn+ssh://[EMAIL PROTECTED]/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) |
3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) |
3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6
lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5
lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3
lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3
lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2
lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3
lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
Modified: python/branches/p3yk/Include/pyport.h
==============================================================================
--- python/branches/p3yk/Include/pyport.h (original)
+++ python/branches/p3yk/Include/pyport.h Wed Jun 13 06:56:32 2007
@@ -51,14 +51,20 @@
#ifndef PY_LONG_LONG
#define PY_LONG_LONG long long
#if defined(LLONG_MAX)
+/* If LLONG_MAX is defined in limits.h, use that. */
#define PY_LLONG_MIN LLONG_MIN
#define PY_LLONG_MAX LLONG_MAX
#define PY_ULLONG_MAX ULLONG_MAX
-#elif defined(__s390__)
-/* Apparently, S390 Linux has long long, but no LLONG_MAX */
-#define PY_LLONG_MAX 9223372036854775807LL
+#elif defined(__LONG_LONG_MAX__)
+/* Otherwise, if GCC has a builtin define, use that. */
+#define PY_LLONG_MAX __LONG_LONG_MAX__
+#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
+#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL)
+#else
+/* Otherwise, rely on two's complement. */
+#define PY_ULLONG_MAX (~0ULL)
+#define PY_LLONG_MAX ((long long)(PY_ULLONG_MAX>>1))
#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#define PY_ULLONG_MAX 18446744073709551615ULL
#endif /* LLONG_MAX */
#endif
#endif /* HAVE_LONG_LONG */
Modified: python/branches/p3yk/Lib/platform.py
==============================================================================
--- python/branches/p3yk/Lib/platform.py (original)
+++ python/branches/p3yk/Lib/platform.py Wed Jun 13 06:56:32 2007
@@ -242,7 +242,7 @@
_supported_dists = ('SuSE', 'debian', 'fedora', 'redhat', 'centos',
'mandrake', 'rocks', 'slackware', 'yellowdog',
- 'gentoo', 'UnitedLinux')
+ 'gentoo', 'UnitedLinux', 'turbolinux')
def _parse_release_file(firstline):
@@ -600,6 +600,16 @@
release = '2003Server'
else:
release = 'post2003'
+ elif maj == 6:
+ if min == 0:
+ # Per http://msdn2.microsoft.com/en-us/library/ms724429.aspx
+ productType = GetVersionEx(1)[8]
+ if productType == 1: # VER_NT_WORKSTATION
+ release = 'Vista'
+ else:
+ release = '2008Server'
+ else:
+ release = 'post2008Server'
else:
if not release:
# E.g. Win3.1 with win32s
@@ -1064,6 +1074,16 @@
# (_syscmd_ver() tends to return the vendor name as well)
if system == 'Microsoft Windows':
system = 'Windows'
+ elif system == 'Microsoft' and release == 'Windows':
+ # Under Windows Vista and Windows Server 2008,
+ # Microsoft changed the output of the ver command. The
+ # release is no longer printed. This causes the
+ # system and release to be misidentified.
+ system = 'Windows'
+ if '6.0' == version[:3]:
+ release = 'Vista'
+ else:
+ release = ''
# In case we still don't know anything useful, we'll try to
# help ourselves
Modified: python/branches/p3yk/PCbuild/_bsddb.vcproj
==============================================================================
--- python/branches/p3yk/PCbuild/_bsddb.vcproj (original)
+++ python/branches/p3yk/PCbuild/_bsddb.vcproj Wed Jun 13 06:56:32 2007
@@ -213,7 +213,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64
/USELINK:MS_SDK"
-
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib"
+
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib
bufferoverflowU.lib"
OutputFile="./_bsddb.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Modified: python/branches/p3yk/PCbuild/_ssl.mak
==============================================================================
--- python/branches/p3yk/PCbuild/_ssl.mak (original)
+++ python/branches/p3yk/PCbuild/_ssl.mak Wed Jun 13 06:56:32 2007
@@ -1,3 +1,4 @@
+EXTRA_LIBS=
!IFDEF DEBUG
SUFFIX=_d.pyd
@@ -26,12 +27,12 @@
@if not exist "$(TEMP)/_ssl/." mkdir "$(TEMP)/_ssl"
cl /nologo /c $(SSL_SOURCE) $(CFLAGS) /Fo$(TEMP)\_ssl\$*.obj $(INCLUDES)
link /nologo @<<
- /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS)
+ /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS)
$(EXTRA_LIBS)
<<
_hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h
../Include/*.h
@if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS)
/Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
link /nologo @<<
- /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
+ /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(EXTRA_LIBS)
$(TEMP)\_hashlib\$*.obj
<<
Modified: python/branches/p3yk/PCbuild/build_ssl.bat
==============================================================================
--- python/branches/p3yk/PCbuild/build_ssl.bat (original)
+++ python/branches/p3yk/PCbuild/build_ssl.bat Wed Jun 13 06:56:32 2007
@@ -1,3 +1,5 @@
+if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
+
@echo off
if not defined HOST_PYTHON (
if %1 EQU Debug (
Modified: python/branches/p3yk/PCbuild/build_ssl.py
==============================================================================
--- python/branches/p3yk/PCbuild/build_ssl.py (original)
+++ python/branches/p3yk/PCbuild/build_ssl.py Wed Jun 13 06:56:32 2007
@@ -170,7 +170,7 @@
if debug:
defs = defs + " " + "DEBUG=1"
if arch in ('amd64', 'ia64'):
- defs = defs + " EXTRA_CFLAGS=/GS-"
+ defs = defs + " EXTRA_CFLAGS=/GS- EXTRA_LIBS=bufferoverflowU.lib"
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
print "Executing:", makeCommand
sys.stdout.flush()
Modified: python/branches/p3yk/Tools/buildbot/build-amd64.bat
==============================================================================
--- python/branches/p3yk/Tools/buildbot/build-amd64.bat (original)
+++ python/branches/p3yk/Tools/buildbot/build-amd64.bat Wed Jun 13 06:56:32 2007
@@ -1,5 +1,6 @@
@rem Used by the buildbot "compile" step.
-REM cmd /c Tools\buildbot\external.bat
+setlocal
+cmd /c Tools\buildbot\external-amd64.bat
call "%VS71COMNTOOLS%vsvars32.bat"
REM cmd /q/c Tools\buildbot\kill_python.bat
devenv.com /build ReleaseAMD64 PCbuild\pcbuild.sln
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
