traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Georg Brandl 2008-05-17 19:14:23 +00:00
parent 7363445d94
commit 6c90c9faae
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/RPM/python-2.6.spec
View File

@ -377,6 +377,7 @@ rm -f mainpkg.files tools.files
%files tkinter %files tkinter
%defattr(-,root,root) %defattr(-,root,root)
%{__prefix}/%{libdirname}/python%{libvers}/lib-tk %{__prefix}/%{libdirname}/python%{libvers}/lib-tk
%{__prefix}/%{libdirname}/python%{libvers}/tkinter
%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload/_tkinter.so* %{__prefix}/%{libdirname}/python%{libvers}/lib-dynload/_tkinter.so*
%endif %endif

4
PC/VS7.1/python.iss
View File

@ -180,6 +180,7 @@ Source: Lib\lib-old\*.*; DestDir: {app}\Lib\lib-old; CopyMode: alwaysoverwrite;
Source: Lib\xml\*.*; DestDir: {app}\Lib\xml; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs 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\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\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 Source: Lib\site-packages\README.txt; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: main
@ -297,6 +298,9 @@ Name: {app}\Lib\lib-old; Type: dirifempty
Name: {app}\Lib\lib-tk\*.pyc; Type: files Name: {app}\Lib\lib-tk\*.pyc; Type: files
Name: {app}\Lib\lib-tk\*.pyo; Type: files Name: {app}\Lib\lib-tk\*.pyo; Type: files
Name: {app}\Lib\lib-tk; Type: dirifempty 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\*.pyc; Type: files
Name: {app}\Lib\test\*.pyo; Type: files Name: {app}\Lib\test\*.pyo; Type: files
Name: {app}\Lib\test; Type: dirifempty Name: {app}\Lib\test; Type: dirifempty

8
PC/VS7.1/python20.wse
View File

@ -2047,6 +2047,14 @@ item: Install File
end end
item: Remark item: Remark
end 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 item: Install File
Source=..\lib\logging\*.py Source=..\lib\logging\*.py
Destination=%MAINDIR%\Lib\logging Destination=%MAINDIR%\Lib\logging

2
Tools/msi/msi.py
View File

@ -916,7 +916,7 @@ def add_files(db):
parent, dir = pydirs.pop() parent, dir = pydirs.pop()
if dir == ".svn" or dir.startswith("plat-"): if dir == ".svn" or dir.startswith("plat-"):
continue continue
elif dir in ["lib-tk", "idlelib", "Icons"]: elif dir in ["lib-tk", "tkinter", "idlelib", "Icons"]:
if not have_tcl: if not have_tcl:
continue continue
tcltk.set_current() tcltk.set_current()