mirror of https://github.com/python/cpython
Tkinter, step 5: remove lib-tk subdirectory and update all places where it was mentioned.
This commit is contained in:
Georg Brandl
parent
2e08136b3c
commit
6e47a33e49
|
|
@ -808,7 +808,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
|
|||
plat-mac/lib-scriptpackages/SystemEvents \
|
||||
plat-mac/lib-scriptpackages/Terminal
|
||||
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
|
||||
LIBSUBDIRS= lib-tk site-packages test test/output test/data \
|
||||
LIBSUBDIRS= tkinter site-packages test test/output test/data \
|
||||
test/decimaltestdata \
|
||||
encodings \
|
||||
email email/mime email/test email/test/data \
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ rm -f mainpkg.files tools.files
|
|||
%if %{include_tkinter}
|
||||
%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
|
||||
|
||||
|
|
|
|||
|
|
@ -94,11 +94,7 @@ TESTPATH=
|
|||
MACHDEPPATH=:plat-$(MACHDEP)
|
||||
EXTRAMACHDEPPATH=
|
||||
|
||||
# Path component for the Tkinter-related modules
|
||||
# The TKPATH variable is always enabled, to save you the effort.
|
||||
TKPATH=:lib-tk
|
||||
|
||||
COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)
|
||||
COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)
|
||||
PYTHONPATH=$(COREPYTHONPATH)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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\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
|
||||
|
||||
|
|
@ -188,8 +189,6 @@ Source: Lib\site-packages\win32\*.*; DestDir: {app}\Lib\site-packages\win32; Cop
|
|||
Source: Lib\site-packages\win32com\*.*; DestDir: {app}\Lib\site-packages\win32com; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
|
||||
Source: Lib\site-packages\win32comext\*.*; DestDir: {app}\Lib\site-packages\win32comext; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
|
||||
|
||||
Source: Lib\lib-tk\*.py; DestDir: {app}\Lib\lib-tk; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs
|
||||
|
||||
Source: include\*.h; DestDir: {app}\include; CopyMode: alwaysoverwrite; Components: main
|
||||
|
||||
Source: Tools\idle\*.*; DestDir: {app}\Tools\idle; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs
|
||||
|
|
@ -239,7 +238,6 @@ Root: HKLM; Subkey: SOFTWARE\Python; Flags: uninsdeletekeyifempty; Check: IsAdmi
|
|||
Root: HKLM; Subkey: SOFTWARE\Python\PythonCore; Flags: uninsdeletekeyifempty
|
||||
Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2; Flags: uninsdeletekeyifempty
|
||||
Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath; ValueData: "{app}\Lib;{app}\DLLs"; Flags: uninsdeletekeyifempty
|
||||
Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\tk; ValueData: {app}\Lib\lib-tk; Flags: uninsdeletekey; Components: tk
|
||||
Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\win32; ValueData: "{app}\lib\site-packages\win32;{app}\lib\site-packages\win32\lib"; Flags: uninsdeletekey
|
||||
Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\win32com; ValueData: C:\Python\lib\site-packages; Flags: uninsdeletekey
|
||||
Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Modules; Flags: uninsdeletekeyifempty
|
||||
|
|
@ -294,9 +292,9 @@ Name: {app}\Lib\hotshot; Type: dirifempty
|
|||
Name: {app}\Lib\lib-old\*.pyc; Type: files
|
||||
Name: {app}\Lib\lib-old\*.pyo; Type: files
|
||||
Name: {app}\Lib\lib-old; Type: dirifempty
|
||||
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
|
||||
|
|
|
|||
|
|
@ -2040,8 +2040,8 @@ end
|
|||
item: Remark
|
||||
end
|
||||
item: Install File
|
||||
Source=..\lib\lib-tk\*.py
|
||||
Destination=%MAINDIR%\Lib\lib-tk
|
||||
Source=..\lib\tkinter\*.py
|
||||
Destination=%MAINDIR%\Lib\tkinter
|
||||
Description=Tkinter related library modules
|
||||
Flags=0000000000000010
|
||||
end
|
||||
|
|
@ -2726,7 +2726,7 @@ end
|
|||
item: Edit Registry
|
||||
Total Keys=1
|
||||
Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath
|
||||
New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk
|
||||
New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs
|
||||
New Value=
|
||||
Root=2
|
||||
end
|
||||
|
|
@ -2764,7 +2764,7 @@ end
|
|||
item: Edit Registry
|
||||
Total Keys=1
|
||||
Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath
|
||||
New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk
|
||||
New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs
|
||||
New Value=
|
||||
Root=1
|
||||
end
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
is set, we believe it. Otherwise, we use the path of our host .EXE's
|
||||
to try and locate our "landmark" (lib\\os.py) and deduce our home.
|
||||
- If we DO have a Python Home: The relevant sub-directories (Lib,
|
||||
plat-win, lib-tk, etc) are based on the Python Home
|
||||
plat-win, etc) are based on the Python Home
|
||||
- If we DO NOT have a Python Home, the core Python Path is
|
||||
loaded from the registry. This is the main PythonPath key,
|
||||
and both HKLM and HKCU are combined to form the path)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
is set, we believe it. Otherwise, we use the path of our host .EXE's
|
||||
to try and locate our "landmark" (lib\\os.py) and deduce our home.
|
||||
- If we DO have a Python Home: The relevant sub-directories (Lib,
|
||||
plat-win, lib-tk, etc) are based on the Python Home
|
||||
plat-win, etc) are based on the Python Home
|
||||
- If we DO NOT have a Python Home, the core Python Path is
|
||||
loaded from the registry. This is the main PythonPath key,
|
||||
and both HKLM and HKCU are combined to form the path)
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
#define PYCC_VACPP /* Define Indicator of C Compiler */
|
||||
|
||||
/* Platform Filesystem */
|
||||
#define PYTHONPATH ".;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
|
||||
#define PYTHONPATH ".;.\\lib;.\\lib\\plat-win"
|
||||
#define DOSFILESYS /* OS/2 Uses the DOS File Naming Conventions */
|
||||
/* #define IMPORT_8x3_NAMES (let's move up to long filenames) */
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ WIN32 is still required for the locale module.
|
|||
#define MS_WIN32 /* only support win32 and greater. */
|
||||
#define MS_WINDOWS
|
||||
#ifndef PYTHONPATH
|
||||
# define PYTHONPATH L".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
|
||||
# define PYTHONPATH L".\\DLLs;.\\lib;.\\lib\\plat-win"
|
||||
#endif
|
||||
#define NT_THREADS
|
||||
#define WITH_THREAD
|
||||
|
|
|
|||
|
|
@ -910,14 +910,14 @@ def add_files(db):
|
|||
print("WARNING: _ctypes.pyd not found, ctypes will not be included")
|
||||
extensions.remove("_ctypes.pyd")
|
||||
|
||||
# Add all .py files in Lib, except lib-tk, test
|
||||
# Add all .py files in Lib, except tkinter, test
|
||||
dirs={}
|
||||
pydirs = [(root,"Lib")]
|
||||
while pydirs:
|
||||
parent, dir = pydirs.pop()
|
||||
if dir == ".svn" or dir.startswith("plat-"):
|
||||
continue
|
||||
elif dir in ["lib-tk", "idlelib", "Icons"]:
|
||||
elif dir in ["tkinter", "idlelib", "Icons"]:
|
||||
if not have_tcl:
|
||||
continue
|
||||
tcltk.set_current()
|
||||
|
|
@ -1186,7 +1186,7 @@ def add_registry(db):
|
|||
("InstallGroup", -1, prefix+r"\InstallPath\InstallGroup", "",
|
||||
"Python %s" % short_version, "REGISTRY"),
|
||||
("PythonPath", -1, prefix+r"\PythonPath", "",
|
||||
r"[TARGETDIR]Lib;[TARGETDIR]DLLs;[TARGETDIR]Lib\lib-tk", "REGISTRY"),
|
||||
r"[TARGETDIR]Lib;[TARGETDIR]DLLs", "REGISTRY"),
|
||||
("Documentation", -1, prefix+r"\Help\Main Python Documentation", "",
|
||||
"[TARGETDIR]Doc\\"+docfile , "REGISTRY.doc"),
|
||||
("Modules", -1, prefix+r"\Modules", "+", None, "REGISTRY"),
|
||||
|
|
|
|||
Loading…
Reference in New Issue