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

Skip to content

Commit f38e0d0

Browse files
loewisloewis
committed
Merged revisions 64185-64196 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r64185 | martin.v.loewis | 2008-06-12 20:38:47 +0200 (Do, 12 Jun 2008) | 1 line Switch to Tcl/Tk 8.5.2. ........ r64189 | martin.v.loewis | 2008-06-12 20:52:00 +0200 (Do, 12 Jun 2008) | 1 line Switch to Tcl/Tk 8.5. ........ r64191 | martin.v.loewis | 2008-06-12 21:00:14 +0200 (Do, 12 Jun 2008) | 1 line Revert bogus disabling of Tcl and Tk. ........ r64194 | martin.v.loewis | 2008-06-12 21:51:59 +0200 (Do, 12 Jun 2008) | 1 line Split Tcl make targets into separate ones. ........ r64195 | martin.v.loewis | 2008-06-12 22:06:18 +0200 (Do, 12 Jun 2008) | 1 line Support file names which include '+' (for Tk 8.5). ........ r64196 | martin.v.loewis | 2008-06-12 22:07:53 +0200 (Do, 12 Jun 2008) | 1 line Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license. ........
1 parent 59683e8 commit f38e0d0

7 files changed

Lines changed: 49 additions & 45 deletions

File tree

‎PCbuild/build_tkinter.py‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@
1111
here = os.path.abspath(os.path.dirname(__file__))
1212
par = os.path.pardir
1313

14-
if 1:
15-
TCL = "tcl8.4.16"
16-
TK = "tk8.4.16"
17-
TIX = "tix-8.4.0"
18-
else:
19-
TCL = "tcl8.5b3"
20-
TK = "tcl8.5b3"
21-
TIX = "Tix8.4.2"
14+
TCL = "tcl8.5.2"
15+
TK = "tk8.5.2"
16+
TIX = "tix-8.4.0.x"
2217

2318
ROOT = os.path.abspath(os.path.join(here, par, par))
2419
# Windows 2000 compatibility: WINVER 0x0500
@@ -38,9 +33,9 @@ def build(platform, clean):
3833
if platform == "Win32":
3934
dest = os.path.join(ROOT, "tcltk")
4035
machine = "X86"
41-
elif platform == "x64":
36+
elif platform == "AMD64":
4237
dest = os.path.join(ROOT, "tcltk64")
43-
machine = "X64"
38+
machine = "AMD64"
4439
else:
4540
raise ValueError(platform)
4641

@@ -50,29 +45,29 @@ def build(platform, clean):
5045
os.chdir(os.path.join(tcldir, "win"))
5146
if clean:
5247
nmake("makefile.vc", "clean")
53-
nmake("makefile.vc")
54-
nmake("makefile.vc", "install", INSTALLDIR=dest)
48+
nmake("makefile.vc", MACHINE=machine)
49+
nmake("makefile.vc", "install", INSTALLDIR=dest, MACHINE=machine)
5550

5651
# TK
5752
if 1:
5853
os.chdir(os.path.join(ROOT, TK, "win"))
5954
if clean:
6055
nmake("makefile.vc", "clean", TCLDIR=tcldir)
61-
nmake("makefile.vc", TCLDIR=tcldir)
62-
nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest)
56+
nmake("makefile.vc", TCLDIR=tcldir, MACHINE=machine)
57+
nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest, MACHINE=machine)
6358

6459
# TIX
6560
if 1:
6661
# python9.mak is available at http://svn.python.org
6762
os.chdir(os.path.join(ROOT, TIX, "win"))
6863
if clean:
6964
nmake("python9.mak", "clean")
70-
nmake("python9.mak", MACHINE=machine)
71-
nmake("python9.mak", "install")
65+
nmake("python9.mak", MACHINE=machine, INSTALL_DIR=dest)
66+
nmake("python9.mak", "install", INSTALL_DIR=dest)
7267

7368
def main():
74-
if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "x64"):
75-
print("%s Win32|x64" % sys.argv[0])
69+
if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "AMD64"):
70+
print("%s Win32|AMD64" % sys.argv[0])
7671
sys.exit(1)
7772

7873
if "-c" in sys.argv:

‎PCbuild/pyproject.vsprops‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,18 @@
9494
/>
9595
<UserMacro
9696
Name="tcltkLib"
97-
Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
97+
Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"
9898
/>
9999
<UserMacro
100100
Name="tcltkLibDebug"
101-
Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
101+
Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"
102102
/>
103103
<UserMacro
104104
Name="tcltk64Lib"
105-
Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
105+
Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"
106106
/>
107107
<UserMacro
108108
Name="tcltk64LibDebug"
109-
Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
109+
Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"
110110
/>
111111
</VisualStudioPropertySheet>

‎Tools/buildbot/external-amd64.bat‎

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

7-
if not exist tcltk64\bin\tcl84g.dll (
8-
cd tcl-8.4.18.2\win
7+
if not exist tcltk64\bin\tcl85g.dll (
8+
cd tcl-8.5.2.1\win
99
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
1010
cd ..\..
1111
)
1212

13-
if not exist tcltk64\bin\tk84g.dll (
14-
cd tk-8.4.18.1\win
15-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.4.18.2 clean all install
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
1616
cd ..\..
1717
)

‎Tools/buildbot/external-common.bat‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4
2727
if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g
2828

2929
@rem tcl/tk
30-
if not exist tcl-8.4.18.2 svn export http://svn.python.org/projects/external/tcl-8.4.18.2
31-
if not exist tk-8.4.18.1 svn export http://svn.python.org/projects/external/tk-8.4.18.1
30+
if not exist tcl-8.5.2.1 (
31+
rd /s/q tcltk tcltk64
32+
svn export http://svn.python.org/projects/external/tcl-8.5.2.1
33+
)
34+
if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0
3235

3336
@rem sqlite3
3437
if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4

‎Tools/buildbot/external.bat‎

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

7-
if not exist tcltk\bin\tcl84g.dll (
8-
cd tcl-8.4.18.2\win
9-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all install
7+
if not exist tcltk\bin\tcl85.dll (
8+
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
9+
cd tcl-8.5.2.1\win
10+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all
11+
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
1012
cd ..\..
1113
)
1214

13-
if not exist tcltk\bin\tk84g.dll (
14-
cd tk-8.4.18.1\win
15-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.4.18.2 clean all install
15+
if not exist tcltk\bin\tk85.dll (
16+
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
1620
cd ..\..
1721
)

‎Tools/msi/msi.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -849,17 +849,18 @@ def generate_license():
849849
import shutil, glob
850850
out = open("LICENSE.txt", "w")
851851
shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out)
852-
for dir, file in (("bzip2","LICENSE"),
853-
("db", "LICENSE"),
854-
("openssl", "LICENSE"),
855-
("tcl", "license.terms"),
856-
("tk", "license.terms")):
857-
out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % dir)
858-
dirs = glob.glob(srcdir+"/../"+dir+"-*")
852+
for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
853+
("Berkeley DB", "db-*", "LICENSE"),
854+
("openssl", "openssl-*", "LICENSE"),
855+
("Tcl", "tcl8*", "license.terms"),
856+
("Tk", "tk8*", "license.terms"),
857+
("Tix", "tix-*", "license.terms")):
858+
out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % name)
859+
dirs = glob.glob(srcdir+"/../"+pat)
859860
if not dirs:
860-
raise ValueError, "Could not find "+srcdir+"/../"+dir+"-*"
861+
raise ValueError, "Could not find "+srcdir+"/../"+pat
861862
if len(dirs) > 2:
862-
raise ValueError, "Multiple copies of "+dir
863+
raise ValueError, "Multiple copies of "+pat
863864
dir = dirs[0]
864865
shutil.copyfileobj(open(os.path.join(dir, file)), out)
865866
out.close()

‎Tools/msi/msilib.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ def make_id(str):
328328
#str = str.replace(".", "_") # colons are allowed
329329
str = str.replace(" ", "_")
330330
str = str.replace("-", "_")
331+
str = str.replace("+", "_")
331332
if str[0] in string.digits:
332333
str = "_"+str
333334
assert re.match("^[A-Za-z_][A-Za-z0-9_.]*$", str), "FILE"+str
@@ -472,6 +473,7 @@ def start_component(self, component = None, feature = None, flags = None, keyfil
472473
[(feature.id, component)])
473474

474475
def make_short(self, file):
476+
file = re.sub(r'[\?|><:/*"+,;=\[\]]', '_', file) # restrictions on short names
475477
parts = file.split(".")
476478
if len(parts)>1:
477479
suffix = parts[-1].upper()
@@ -500,7 +502,6 @@ def make_short(self, file):
500502
if pos in (10, 100, 1000):
501503
prefix = prefix[:-1]
502504
self.short_names.add(file)
503-
assert not re.search(r'[\?|><:/*"+,;=\[\]]', file) # restrictions on short names
504505
return file
505506

506507
def add_file(self, file, src=None, version=None, language=None):

0 commit comments

Comments
 (0)