[prev in list] [next in list] [prev in thread] [next in thread] 

List:       python-3000-checkins
Subject:    [Python-3000-checkins] r61140 - in python/branches/py3k:
From:       "martin.v.loewis" <python-3000-checkins () python ! org>
Date:       2008-02-29 21:03:38
Message-ID: 20080229210338.9A9ED1E4025 () bag ! python ! org
[Download RAW message or body]

Author: martin.v.loewis
Date: Fri Feb 29 22:03:38 2008
New Revision: 61140

Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/PCbuild/pcbuild.sln
   python/branches/py3k/Tools/msi/msi.py
Log:
Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,610 \
68,61070,61083,61085,61092-61097,61103-61104,61110-61112,61114-61115,61117,61120-61122,61126-61127,61129-61131,61134,61137-61139 \
via svnmerge from  svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61138 | martin.v.loewis | 2008-02-29 21:26:53 +0100 (Fr, 29 Feb 2008) | 1 line
  
  Make _hashlib depend on pythoncore.
........
  r61139 | martin.v.loewis | 2008-02-29 21:54:44 +0100 (Fr, 29 Feb 2008) | 1 line
  
  Package Tcl from tcltk64 on AMD64.
........


Modified: python/branches/py3k/PCbuild/pcbuild.sln
==============================================================================
--- python/branches/py3k/PCbuild/pcbuild.sln	(original)
+++ python/branches/py3k/PCbuild/pcbuild.sln	Fri Feb 29 22:03:38 2008
@@ -109,6 +109,10 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", \
"bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"  EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", \
"{447F05A8-F581-4CAC-A466-5AC7936E207E}" +	ProjectSection(ProjectDependencies) = \
postProject +		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = \
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} +		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = \
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py	(original)
+++ python/branches/py3k/Tools/msi/msi.py	Fri Feb 29 22:03:38 2008
@@ -1022,8 +1022,10 @@
         sqlite_arch = "/ia64"
     elif msilib.msi_type=="x64;1033":
         sqlite_arch = "/amd64"
+        tclsuffix = "64"
     else:
         sqlite_arch = ""
+        tclsuffix = ""
     lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
     if have_tcl:
         if not os.path.exists("%s/%s/_tkinter.pyd" % (srcdir, PCBUILD)):
@@ -1032,7 +1034,7 @@
             lib.start_component("TkDLLs", tcltk)
             lib.add_file("_tkinter.pyd")
             dlls.append("_tkinter.pyd")
-            tcldir = os.path.normpath(srcdir+"/../tcltk/bin")
+            tcldir = os.path.normpath(srcdir+("/../tcltk%s/bin" % tclsuffix))
             for f in glob.glob1(tcldir, "*.dll"):
                 lib.add_file(f, src=os.path.join(tcldir, f))
     # check whether there are any unknown extensions
@@ -1056,7 +1058,7 @@
         lib.add_file('libpython%s%s.a' % (major, minor))
     if have_tcl:
         # Add Tcl/Tk
-        tcldirs = [(root, '../tcltk/lib', 'tcl')]
+        tcldirs = [(root, '../tcltk%s/lib' % tclsuffix, 'tcl')]
         tcltk.set_current()
         while tcldirs:
             parent, phys, dir = tcldirs.pop()
_______________________________________________
Python-3000-checkins mailing list
Python-3000-checkins@python.org
http://mail.python.org/mailman/listinfo/python-3000-checkins


[prev in list] [next in list] [prev in thread] [next in thread]