Skip to content

Commit 4b482ae

Browse files
Maxwell175Maxwell175
committed
TCL TK is static now.
1 parent b1b0eee commit 4b482ae

File tree

6 files changed

+19
-33
lines changed

6 files changed

+19
-33
lines changed

‎Lib/rebuildpython.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,15 @@ def run_rebuild():
164164
"version",
165165
"libssl",
166166
"libcrypto",
167-
"tcl86t",
168-
"tk86t",
167+
"tcl86ts",
168+
"tk86ts",
169169
"Crypt32",
170170
"Iphlpapi",
171171
"msi",
172172
"Rpcrt4",
173173
"Cabinet",
174174
"winmm",
175+
"Netapi32",
175176
]
176177
if "32" in platform.architecture()[0]:
177178
link_libs += ["msvcrt"]
@@ -232,7 +233,7 @@ def run_rebuild():
232233
os.path.join(os.path.dirname(final_path), x)
233234
for x in linkData["library_dirs"]
234235
]
235-
extra_link_args += linkData["extra_postargs"]
236+
extra_link_args += linkData.get("extra_postargs", [])
236237
libIdx += 1
237238

238239
link_libs = list(set(link_libs))
@@ -452,7 +453,7 @@ def run_rebuild():
452453
include_dirs=include_dirs,
453454
macros=macros,
454455
)
455-
456+
456457
extra_args_combined = [x for x in sysconfig.get_config_var("LDFLAGS").split() if not x.startswith("-L") and not x.startswith("-l")] \
457458
+ extra_link_args \
458459
+ [
@@ -489,7 +490,7 @@ def run_rebuild():
489490
extra_preargs=["-g", "-Xlinker"],
490491
extra_midargs=final_extra_link_args,
491492
)
492-
493+
493494
otool_output = __np__.run_with_output("otool", "-l", os.path.join(build_dir, "python"), quiet=True)
494495
curr_load_lines = []
495496
for line in otool_output.split('\n'):

‎PCbuild/_tkinter.vcxproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,10 @@
126126
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
127127
<ImportGroup Label="ExtensionTargets">
128128
</ImportGroup>
129-
<Target Name="_CopyTclTkDLL" Inputs="@(_TclTkDLL)" Outputs="@(_TclTkDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
130-
<Copy SourceFiles="@(_TclTkDLL)" DestinationFolder="$(OutDir)" UseHardlinksIfPossible="true" />
131-
</Target>
132-
<Target Name="_CleanTclTkDLL" BeforeTargets="Clean">
133-
<Delete Files="@(_TclTkDLL->'$(OutDir)%(Filename)%(Extension)')" />
134-
</Target>
135129
<Target Name="_WriteTCL_LIBRARY" Outputs="$(OutDir)TCL_LIBRARY.env" AfterTargets="Build">
136130
<WriteLinesToFile File="$(OutDir)TCL_LIBRARY.env" Lines="$(tcltkdir)\lib\tcl$(TclMajorVersion).$(TclMinorVersion)" Encoding="utf-8" Overwrite="true" />
137131
</Target>
138132
<Target Name="_CleanTCL_LIBRARY" BeforeTargets="Clean">
139133
<Delete Files="$(OutDir)TCL_LIBRARY.env" />
140134
</Target>
141-
</Project>
135+
</Project>

‎PCbuild/get_externals.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.
6161
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
6262
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
6363
set libraries=%libraries% xz-5.2.5
64-
set libraries=%libraries% zlib-1.2.13
64+
set libraries=%libraries% zlib-1.2.12
6565

6666
for %%e in (%libraries%) do (
6767
if exist "%EXTERNALS_DIR%\%%e" (

‎PCbuild/python.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@
9797
<Link>
9898
<SubSystem>Console</SubSystem>
9999
<StackReserveSize>2000000</StackReserveSize>
100-
<AdditionalDependencies>advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;ws2_32.lib;version.lib;libssl.lib;libcrypto.lib;tcl86t.lib;tk86t.lib;Crypt32.lib;Iphlpapi.lib;msi.lib;Rpcrt4.lib;Cabinet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
101-
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">..\..\Nuitka-Python\externals\tcltk-8.6.9.0\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
102-
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">..\..\Nuitka-Python\externals\tcltk-8.6.9.0\amd64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100+
<AdditionalDependencies>advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;ws2_32.lib;version.lib;Netapi32.lib;libssl.lib;libcrypto.lib;tcl86ts.lib;tclstub86.lib;tk86ts.lib;Crypt32.lib;Iphlpapi.lib;msi.lib;Rpcrt4.lib;Cabinet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
101+
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">..\..\Nuitka-Python\externals\tcltk-8.6.12.0\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
102+
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">..\..\Nuitka-Python\externals\tcltk-8.6.12.0\amd64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103103
</Link>
104104
</ItemDefinitionGroup>
105105
<ItemGroup>
@@ -245,4 +245,4 @@ $(_PGOPath)
245245
<Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
246246
</Copy>
247247
</Target>
248-
</Project>
248+
</Project>

‎Tools/msi/tcltk/tcltk_files.wxs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,11 @@
77
<Component Id="_tkinter.lib" Directory="libs" Guid="*">
88
<File Name="_tkinter.lib" KeyPath="yes" />
99
</Component>
10-
<Component Id="tcl86t.lib" Directory="libs" Guid="*">
11-
<File Name="tcl86t.lib" Source="..\..\externals\tcltk-8.6.9.0\amd64\lib\tcl86t.lib" KeyPath="yes" />
10+
<Component Id="tcl86ts.lib" Directory="libs" Guid="*">
11+
<File Name="tcl86ts.lib" Source="..\..\externals\tcltk-8.6.12.0\amd64\lib\tcl86ts.lib" KeyPath="yes" />
1212
</Component>
13-
<Component Id="tk86t.lib" Directory="libs" Guid="*">
14-
<File Name="tk86t.lib" Source="..\..\externals\tcltk-8.6.9.0\amd64\lib\tk86t.lib" KeyPath="yes" />
15-
</Component>
16-
<Component Id="tcl86t.dll" Directory="DLLs" Guid="*">
17-
<File Name="tcl86t.dll" KeyPath="yes">
18-
<CopyFile Id="MyFileCopyIdTCL" DestinationDirectory="InstallDirectory" />
19-
</File>
20-
</Component>
21-
<Component Id="tk86t.dll" Directory="DLLs" Guid="*">
22-
<File Name="tk86t.dll" KeyPath="yes">
23-
<CopyFile Id="MyFileCopyIdTK" DestinationDirectory="InstallDirectory" />
24-
</File>
13+
<Component Id="tk86ts.lib" Directory="libs" Guid="*">
14+
<File Name="tk86ts.lib" Source="..\..\externals\tcltk-8.6.12.0\amd64\lib\tk86ts.lib" KeyPath="yes" />
2515
</Component>
2616
</ComponentGroup>
2717
</Fragment>

‎build.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ rem Move the standalone build result to "output". TODO: Version number could be
3535
rem from the Python binary built, or much rather we do not use one in the nuget build at all.
3636

3737
set OUTPUT_DIR=output
38-
set SRC_TOOLS_DIR=nuget-result-%NUGET_PYTHON_PACKAGE_NAME%\%NUGET_PYTHON_PACKAGE_NAME%.3.9.5\tools
38+
set SRC_TOOLS_DIR=nuget-result-%NUGET_PYTHON_PACKAGE_NAME%\%NUGET_PYTHON_PACKAGE_NAME%.3.9.15\tools
3939
set SRC_LIB_DIR=%%d\amd64
4040
if "%ARCH_OPT%" EQU "-x86" (
4141
set OUTPUT_DIR=output32
@@ -50,4 +50,5 @@ for /d %%d in (externals\openssl*) do (
5050

5151
echo "Ok, Nuitka Python now lives in %OUTPUT_DIR% folder"
5252

53-
endlocal
53+
endlocal
54+

0 commit comments

Comments
 (0)