Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b072cf2

Browse files
loewisloewis
committed
Merged revisions 64267-64272 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r64267 | amaury.forgeotdarc | 2008-06-14 09:40:32 +0200 (Sa, 14 Jun 2008) | 2 lines Use the correct URL for sqlite3 sources, and try to fix windows buildbots. ........ r64269 | amaury.forgeotdarc | 2008-06-14 10:36:07 +0200 (Sa, 14 Jun 2008) | 3 lines on windows, r64214 broke compilation with some recent SDKs, because IPPROTO_IPV6 may be an enumeration member... ........ r64270 | amaury.forgeotdarc | 2008-06-14 11:44:41 +0200 (Sa, 14 Jun 2008) | 4 lines Since python2.6 must run on Windows 2000, explicitely disable the use of Windows XP themes when compiling tk. This is also consistent with the WINVER=0x0500 option. ........ r64271 | martin.v.loewis | 2008-06-14 13:50:59 +0200 (Sa, 14 Jun 2008) | 3 lines Avoid rebuilding tcl/tk. Merge x86 changes into AMD64. ........ r64272 | martin.v.loewis | 2008-06-14 13:51:54 +0200 (Sa, 14 Jun 2008) | 2 lines Set eol-style to CRLF for all batch files. ........
1 parent 6d291c1 commit b072cf2

11 files changed

Lines changed: 87 additions & 80 deletions

File tree

‎Modules/socketmodule.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
# include <ws2tcpip.h>
1818
/* VC6 is shipped with old platform headers, and does not have MSTcpIP.h
1919
* Separate SDKs have all the functions we want, but older ones don't have
20-
* any version information. I use IPPROTO_IPV6 to detect a decent SDK.
20+
* any version information.
21+
* I use SIO_GET_MULTICAST_FILTER to detect a decent SDK.
2122
*/
22-
# ifdef IPPROTO_IPV6
23+
# ifdef SIO_GET_MULTICAST_FILTER
2324
# include <MSTcpIP.h> /* for SIO_RCVALL */
2425
# define HAVE_ADDRINFO
2526
# define HAVE_SOCKADDR_STORAGE

‎Tools/buildbot/build-amd64.bat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@rem Used by the buildbot "compile" step.
2-
cmd /c Tools\buildbot\external-amd64.bat
3-
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
4-
cmd /c Tools\buildbot\clean-amd64.bat
5-
vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe
6-
vcbuild PCbuild\pcbuild.sln "Debug|x64"
1+
@rem Used by the buildbot "compile" step.
2+
cmd /c Tools\buildbot\external-amd64.bat
3+
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
4+
cmd /c Tools\buildbot\clean-amd64.bat
5+
vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe
6+
vcbuild PCbuild\pcbuild.sln "Debug|x64"

‎Tools/buildbot/build.bat‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@rem Used by the buildbot "compile" step.
2-
cmd /c Tools\buildbot\external.bat
3-
call "%VS90COMNTOOLS%vsvars32.bat"
4-
cmd /c Tools\buildbot\clean.bat
5-
vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe
6-
vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
7-
1+
@rem Used by the buildbot "compile" step.
2+
cmd /c Tools\buildbot\external.bat
3+
call "%VS90COMNTOOLS%vsvars32.bat"
4+
cmd /c Tools\buildbot\clean.bat
5+
vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe
6+
vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
7+

‎Tools/buildbot/buildmsi.bat‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
@rem Used by the buildbot "buildmsi" step.
2-
3-
cmd /c Tools\buildbot\external.bat
4-
@rem build release versions of things
5-
call "%VS90COMNTOOLS%vsvars32.bat"
6-
7-
@rem build Python
8-
vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"
9-
10-
@rem build the documentation
11-
bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
12-
"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python30a5.hhp
13-
14-
@rem buold the MSI file
15-
cd PC
16-
nmake /f icons.mak
17-
cd ..\Tools\msi
18-
del *.msi
19-
nmake /f msisupport.mak
20-
%HOST_PYTHON% msi.py
1+
@rem Used by the buildbot "buildmsi" step.
2+
3+
cmd /c Tools\buildbot\external.bat
4+
@rem build release versions of things
5+
call "%VS90COMNTOOLS%vsvars32.bat"
6+
7+
@rem build Python
8+
vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"
9+
10+
@rem build the documentation
11+
bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
12+
"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp
13+
14+
@rem build the MSI file
15+
cd PC
16+
nmake /f icons.mak
17+
cd ..\Tools\msi
18+
del *.msi
19+
nmake /f msisupport.mak
20+
%HOST_PYTHON% msi.py
21+

‎Tools/buildbot/clean-amd64.bat‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@rem Used by the buildbot "clean" step.
2-
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
3-
cd PCbuild
4-
@echo Deleting .pyc/.pyo files ...
5-
del /s Lib\*.pyc Lib\*.pyo
6-
vcbuild /clean pcbuild.sln "Release|x64"
7-
vcbuild /clean pcbuild.sln "Debug|x64"
1+
@rem Used by the buildbot "clean" step.
2+
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
3+
cd PCbuild
4+
@echo Deleting .pyc/.pyo files ...
5+
del /s Lib\*.pyc Lib\*.pyo
6+
vcbuild /clean pcbuild.sln "Release|x64"
7+
vcbuild /clean pcbuild.sln "Debug|x64"

‎Tools/buildbot/clean.bat‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@rem Used by the buildbot "clean" step.
2-
call "%VS90COMNTOOLS%vsvars32.bat"
3-
@echo Deleting .pyc/.pyo files ...
4-
del /s Lib\*.pyc Lib\*.pyo
5-
cd PCbuild
6-
vcbuild /clean pcbuild.sln "Release|Win32"
7-
vcbuild /clean pcbuild.sln "Debug|Win32"
1+
@rem Used by the buildbot "clean" step.
2+
call "%VS90COMNTOOLS%vsvars32.bat"
3+
@echo Deleting .pyc/.pyo files ...
4+
del /s Lib\*.pyc Lib\*.pyo
5+
cd PCbuild
6+
vcbuild /clean pcbuild.sln "Release|Win32"
7+
vcbuild /clean pcbuild.sln "Debug|Win32"

‎Tools/buildbot/external-amd64.bat‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
@rem Fetches (and builds if necessary) external dependencies
2-
3-
@rem Assume we start inside the Python source directory
4-
call "Tools\buildbot\external-common.bat"
5-
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
6-
7-
if not exist tcltk64\bin\tcl85g.dll (
8-
cd tcl-8.5.2.1\win
9-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
10-
cd ..\..
11-
)
12-
13-
if not exist tcltk64\bin\tk85g.dll (
14-
cd tk-8.5.2.1\win
15-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean all install
16-
cd ..\..
17-
)
1+
@rem Fetches (and builds if necessary) external dependencies
2+
3+
@rem Assume we start inside the Python source directory
4+
call "Tools\buildbot\external-common.bat"
5+
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
6+
7+
if not exist tcltk64\bin\tcl85g.dll (
8+
cd tcl-8.5.2.1\win
9+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
10+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
11+
cd ..\..
12+
)
13+
14+
if not exist tcltk64\bin\tk85g.dll (
15+
cd tk-8.5.2.1\win
16+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean
17+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all
18+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install
19+
cd ..\..
20+
)
21+

‎Tools/buildbot/external-common.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cd ..
1515
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
1616
@rem if exist db-4.4.20 rd /s/q db-4.4.20
1717
@rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g
18-
@rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9
18+
@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
1919

2020
@rem bzip
2121
if not exist bzip2-1.0.5 (
@@ -37,7 +37,7 @@ if not exist tcl-8.5.2.1 (
3737
if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0
3838

3939
@rem sqlite3
40-
if not exist sqlite-source-3.5.9 (
40+
if not exist sqlite-3.5.9 (
4141
rd /s/q sqlite-source-3.3.4
42-
svn export http://svn.python.org/projects/external/sqlite-source-3.5.9
42+
svn export http://svn.python.org/projects/external/sqlite-3.5.9
4343
)

‎Tools/buildbot/external.bat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
call "Tools\buildbot\external-common.bat"
55
call "%VS90COMNTOOLS%\vsvars32.bat"
66

7-
if not exist tcltk\bin\tcl85.dll (
7+
if not exist tcltk\bin\tcl85g.dll (
88
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
99
cd tcl-8.5.2.1\win
1010
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all
1111
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
1212
cd ..\..
1313
)
1414

15-
if not exist tcltk\bin\tk85.dll (
15+
if not exist tcltk\bin\tk85g.dll (
1616
cd tk-8.5.2.0\win
17-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean
18-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all
19-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install
17+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean
18+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all
19+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install
2020
cd ..\..
2121
)

‎Tools/buildbot/test-amd64.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
@rem Used by the buildbot "test" step.
2-
cd PCbuild
3-
call rt.bat -q -d -x64 -uall -rw
1+
@rem Used by the buildbot "test" step.
2+
cd PCbuild
3+
call rt.bat -q -d -x64 -uall -rw

0 commit comments

Comments
 (0)