diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-07-17 09:15:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 09:15:48 (GMT) |
| commit | 68d663cf85d1ac5eaf83482eed39c0a6f8093601 (patch) | |
| tree | fe26ff995655c31aca2d5c0f7bc4f8048cca5cc4 /Tools/msi/tcltk | |
| parent | 49f6449ef4b81537c19b82329caaf60596c516c2 (diff) | |
| download | cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.zip cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.tar.gz cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.tar.bz2 | |
[bpo-30916] Pre-build OpenSSL and Tcl/Tk for Windows (#2688)
Updates ssl and tkinter projects to use pre-built externals
Diffstat (limited to 'Tools/msi/tcltk')
| -rw-r--r-- | Tools/msi/tcltk/tcltk.wixproj | 8 | ||||
| -rw-r--r-- | Tools/msi/tcltk/tcltk_d.wxs | 1 | ||||
| -rw-r--r-- | Tools/msi/tcltk/tcltk_files.wxs | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/Tools/msi/tcltk/tcltk.wixproj b/Tools/msi/tcltk/tcltk.wixproj index f66fc14..fae353f 100644 --- a/Tools/msi/tcltk/tcltk.wixproj +++ b/Tools/msi/tcltk/tcltk.wixproj @@ -20,14 +20,6 @@ <WxlTemplate Include="*.wxl_template" /> </ItemGroup> <ItemGroup> - <InstallFiles Include="$(tcltkDir)bin\*.dll" Exclude="$(tcltkDir)bin\*g.dll"> - <SourceBase>$(tcltkDir)</SourceBase> - <Source>!(bindpath.tcltk)</Source> - <TargetBase>$(tcltkDir)bin</TargetBase> - <Target_>DLLs\</Target_> - <Group>tcltk_dlls</Group> - </InstallFiles> - <InstallFiles Include="$(tcltkDir)lib\**\*"> <SourceBase>$(tcltkDir)</SourceBase> <Source>!(bindpath.tcltk)</Source> diff --git a/Tools/msi/tcltk/tcltk_d.wxs b/Tools/msi/tcltk/tcltk_d.wxs index 01d0d24..391b3af 100644 --- a/Tools/msi/tcltk/tcltk_d.wxs +++ b/Tools/msi/tcltk/tcltk_d.wxs @@ -8,7 +8,6 @@ <Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)"> <ComponentGroupRef Id="tkinter_extension_d" /> - <ComponentGroupRef Id="tcltk_dlls_d" /> </Feature> </Product> </Wix> diff --git a/Tools/msi/tcltk/tcltk_files.wxs b/Tools/msi/tcltk/tcltk_files.wxs index 0d1b4a9..1194510 100644 --- a/Tools/msi/tcltk/tcltk_files.wxs +++ b/Tools/msi/tcltk/tcltk_files.wxs @@ -5,9 +5,17 @@ <Component Id="_tkinter.pyd" Directory="DLLs" Guid="*"> <File Name="_tkinter.pyd" KeyPath="yes" /> </Component> + </ComponentGroup> + <ComponentGroup Id="tcltk_dlls"> <Component Id="_tkinter.lib" Directory="libs" Guid="*"> <File Name="_tkinter.lib" KeyPath="yes" /> </Component> + <Component Id="tcl86t.dll" Directory="DLLs" Guid="*"> + <File Name="tcl86t.dll" KeyPath="yes" /> + </Component> + <Component Id="tk86t.dll" Directory="DLLs" Guid="*"> + <File Name="tk86t.dll" KeyPath="yes" /> + </Component> </ComponentGroup> </Fragment> |