Skip to content

Commit 682fe85

Browse files
committed
tcltk-build: Split {Tcl,Tk}SourceTag into version and prefix parameters
1 parent b5c6cc3 commit 682fe85

1 file changed

Lines changed: 22 additions & 8 deletions

File tree

windows-release/tcltk-build.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
parameters:
2-
- name: TclSourceTag
3-
displayName: 'Tcl Source Tag'
2+
- name: TclVersion
3+
displayName: 'Tcl Version'
44
type: string
5-
- name: TkSourceTag
6-
displayName: 'Tk Source Tag'
5+
- name: TkVersion
6+
displayName: 'Tk Version'
7+
type: string
8+
- name: TclTagPrefix
9+
displayName: 'Tcl source tag prefix'
10+
type: string
11+
default: 'tcl-'
12+
- name: TkTagPrefix
13+
displayName: 'Tk source tag prefix'
714
type: string
15+
default: 'tk-'
816
- name: SigningCertificate
917
displayName: "Code signing certificate"
1018
type: string
@@ -19,7 +27,7 @@ parameters:
1927
default: 'https://github.com/python/cpython-source-deps'
2028

2129

22-
name: tcltk$(TkSourceTag)_$(Date:yyyyMMdd)$(Rev:.rr)
30+
name: tcltk$(TkVersion)_$(Date:yyyyMMdd)$(Rev:.rr)
2331

2432

2533
resources:
@@ -44,13 +52,17 @@ variables:
4452
- name: Configuration
4553
value: 'Release'
4654
- name: SigningDescription
47-
value: 'Tcl/Tk for Python (${{ parameters.TclSourceTag }})'
55+
value: 'Tcl/Tk for Python (${{ parameters.TkVersion }})'
4856
- name: SourcesRepo
4957
value: ${{ parameters.SourcesRepo }}
58+
- name: TclVersion
59+
value: ${{ parameters.TclVersion }}
60+
- name: TkVersion
61+
value: ${{ parameters.TkVersion }}
5062
- name: TclSourceTag
51-
value: ${{ parameters.TclSourceTag }}
63+
value: ${{ parameters.TclTagPrefix }}${{ parameters.TclVersion }}
5264
- name: TkSourceTag
53-
value: ${{ parameters.TkSourceTag }}
65+
value: ${{ parameters.TkTagPrefix }}${{ parameters.TkVersion }}
5466

5567

5668
jobs:
@@ -82,6 +94,8 @@ jobs:
8294
"/p:ExternalsDir=$(ExternalsDir)\" >> msbuild.rsp
8395
"/p:tclDir=$(ExternalsDir)\$(TclSourceTag)\" >> msbuild.rsp
8496
"/p:tkDir=$(ExternalsDir)\$(TkSourceTag)\" >> msbuild.rsp
97+
"/p:TclVersion=$(TclVersion)" >> msbuild.rsp
98+
"/p:TkVersion=$(TkVersion)" >> msbuild.rsp
8599
displayName: 'Generate msbuild.rsp'
86100
87101
- powershell: |

0 commit comments

Comments
 (0)