Skip to content

Commit 8485d3b

Browse files
authored
Make Tix optional when building Tcl/Tk binaries (#47)
1 parent 0584b56 commit 8485d3b

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

windows-release/tcltk-build.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ parameters:
55
- name: TkSourceTag
66
displayName: 'Tk Source Tag'
77
type: string
8+
- name: IncludeTix
9+
displayName: 'Include Tix (pre-3.13)'
10+
type: boolean
11+
default: false
812
- name: TixSourceTag
913
displayName: 'Tix Source Tag'
1014
type: string
@@ -35,7 +39,8 @@ resources:
3539

3640

3741
variables:
38-
- group: CPythonSign
42+
- ${{ if ne(parameters.SigningCertificate, 'Unsigned') }}:
43+
- group: CPythonSign
3944
- name: IntDir
4045
value: '$(Build.BinariesDirectory)\obj'
4146
- name: ExternalsDir
@@ -78,9 +83,10 @@ jobs:
7883
git clone $(SourcesRepo) -b $(TkSourceTag) --depth 1 "$(ExternalsDir)\$(TkSourceTag)"
7984
displayName: 'Check out Tk sources'
8085
81-
- powershell: |
82-
git clone $(SourcesRepo) -b $(TixSourceTag) --depth 1 "$(ExternalsDir)\$(TixSourceTag)"
83-
displayName: 'Check out Tix sources'
86+
- ${{ if eq(parameters.IncludeTix, 'true') }}:
87+
- powershell: |
88+
git clone $(SourcesRepo) -b $(TixSourceTag) --depth 1 "$(ExternalsDir)\$(TixSourceTag)"
89+
displayName: 'Check out Tix sources'
8490
8591
# This msbuild.rsp file will be used by the build to forcibly override these variables
8692
- powershell: |
@@ -95,21 +101,25 @@ jobs:
95101
- powershell: |
96102
& "$(msbuild)" cpython\PCbuild\tcl.vcxproj "@msbuild.rsp" /p:Platform=Win32 /p:tcltkDir="$(OutDir)\win32"
97103
& "$(msbuild)" cpython\PCbuild\tk.vcxproj "@msbuild.rsp" /p:Platform=Win32 /p:tcltkDir="$(OutDir)\win32"
98-
& "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=Win32 /p:tcltkDir="$(OutDir)\win32"
99104
displayName: 'Build for win32'
100105
101106
- powershell: |
102107
& "$(msbuild)" cpython\PCbuild\tcl.vcxproj "@msbuild.rsp" /p:Platform=x64 /p:tcltkDir="$(OutDir)\amd64"
103108
& "$(msbuild)" cpython\PCbuild\tk.vcxproj "@msbuild.rsp" /p:Platform=x64 /p:tcltkDir="$(OutDir)\amd64"
104-
& "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=x64 /p:tcltkDir="$(OutDir)\amd64"
105109
displayName: 'Build for amd64'
106110
107111
- powershell: |
108112
& "$(msbuild)" cpython\PCbuild\tcl.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
109113
& "$(msbuild)" cpython\PCbuild\tk.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
110-
& "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
111114
displayName: 'Build for arm64'
112115
116+
- ${{ if eq(parameters.IncludeTix, 'true') }}:
117+
- powershell: |
118+
& "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=Win32 /p:tcltkDir="$(OutDir)\win32"
119+
& "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=x64 /p:tcltkDir="$(OutDir)\amd64"
120+
& "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
121+
displayName: 'Build Tix'
122+
113123
- ${{ if ne(parameters.SigningCertificate, 'Unsigned') }}:
114124
- template: sign-files.yml
115125
parameters:

0 commit comments

Comments
 (0)