[Python-checkins] r63422 - in python/trunk: Misc/RPM/python-2.6.spec PC/VS7.1/python.iss PC/VS7.1/python20.wse Tools/msi/msi.py

[georg.brandl]

Author: georg.brandl
Date: Sat May 17 21:14:23 2008
New Revision: 63422

Log:
Add new tkinter dir to various locations where lib-tk shows up.


Modified:
   python/trunk/Misc/RPM/python-2.6.spec
   python/trunk/PC/VS7.1/python.iss
   python/trunk/PC/VS7.1/python20.wse
   python/trunk/Tools/msi/msi.py

Modified: python/trunk/Misc/RPM/python-2.6.spec
==============================================================================
--- python/trunk/Misc/RPM/python-2.6.spec	(original)
+++ python/trunk/Misc/RPM/python-2.6.spec	Sat May 17 21:14:23 2008
@@ -377,6 +377,7 @@
 %files tkinter
 %defattr(-,root,root)
 %{__prefix}/%{libdirname}/python%{libvers}/lib-tk
+%{__prefix}/%{libdirname}/python%{libvers}/tkinter
 %{__prefix}/%{libdirname}/python%{libvers}/lib-dynload/_tkinter.so*
 %endif
 

Modified: python/trunk/PC/VS7.1/python.iss
==============================================================================
--- python/trunk/PC/VS7.1/python.iss	(original)
+++ python/trunk/PC/VS7.1/python.iss	Sat May 17 21:14:23 2008
@@ -180,6 +180,7 @@
 Source: Lib\xml\*.*; DestDir: {app}\Lib\xml; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\hotshot\*.*; DestDir: {app}\Lib\hotshot; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\test\*.*; DestDir: {app}\Lib\test; CopyMode: alwaysoverwrite; Components: test; Flags: recursesubdirs
+Source: Lib\tkinter\*.py; DestDir: {app}\Lib\tkinter; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs
 
 Source: Lib\site-packages\README.txt; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: main
 
@@ -297,6 +298,9 @@
 Name: {app}\Lib\lib-tk\*.pyc; Type: files
 Name: {app}\Lib\lib-tk\*.pyo; Type: files
 Name: {app}\Lib\lib-tk; Type: dirifempty
+Name: {app}\Lib\tkinter\*.pyc; Type: files
+Name: {app}\Lib\tkinter\*.pyo; Type: files
+Name: {app}\Lib\tkinter; Type: dirifempty
 Name: {app}\Lib\test\*.pyc; Type: files
 Name: {app}\Lib\test\*.pyo; Type: files
 Name: {app}\Lib\test; Type: dirifempty

Modified: python/trunk/PC/VS7.1/python20.wse
==============================================================================
--- python/trunk/PC/VS7.1/python20.wse	(original)
+++ python/trunk/PC/VS7.1/python20.wse	Sat May 17 21:14:23 2008
@@ -2048,6 +2048,14 @@
 item: Remark
 end
 item: Install File
+  Source=..\lib\tkinter\*.py
+  Destination=%MAINDIR%\Lib\tkinter
+  Description=Tkinter related library modules
+  Flags=0000000000000010
+end
+item: Remark
+end
+item: Install File
   Source=..\lib\logging\*.py
   Destination=%MAINDIR%\Lib\logging
   Description=Logging package

Modified: python/trunk/Tools/msi/msi.py
==============================================================================
--- python/trunk/Tools/msi/msi.py	(original)
+++ python/trunk/Tools/msi/msi.py	Sat May 17 21:14:23 2008
@@ -916,7 +916,7 @@
         parent, dir = pydirs.pop()
         if dir == ".svn" or dir.startswith("plat-"):
             continue
-        elif dir in ["lib-tk", "idlelib", "Icons"]:
+        elif dir in ["lib-tk", "tkinter", "idlelib", "Icons"]:
             if not have_tcl:
                 continue
             tcltk.set_current()