Skip to content

Fix Windows layout directory for both Tcl 8 and 9 #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugovk wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −7
Open

Fix Windows layout directory for both Tcl 8 and 9 #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion windows-release/stage-layout-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,16 @@ jobs:
targetPath: $(Pipeline.Workspace)\$(TclLibrary)

- powershell: |
Write-Host "##vso[task.setvariable variable=TCL_LIBRARY]$(Pipeline.Workspace)\$(TclLibrary)\tcl8"
# PC\layout copies the *parent* of TCL_LIBRARY into the layout, so it only
# needs to name a directory that exists inside the artifact: tcl8 for
# Tcl 8.6, tk9.0 for Tcl 9 (which embeds its scripts in the DLL).
$tcl = Get-ChildItem "$(Pipeline.Workspace)\$(TclLibrary)" -Directory |
Where-Object { $_.Name -match '^t(cl|k)\d' } | Select-Object -First 1
if (-not $tcl) {
Write-Host "##[error]No Tcl/Tk library directory found in $(Pipeline.Workspace)\$(TclLibrary)"
exit 1
}
Write-Host "##vso[task.setvariable variable=TCL_LIBRARY]$($tcl.FullName)"
displayName: 'Update TCL_LIBRARY'
condition: and(succeeded(), variables['TclLibrary'])

Expand Down
15 changes: 10 additions & 5 deletions windows-release/stage-layout-msix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,16 @@ jobs:
targetPath: $(Pipeline.Workspace)\$(TclLibrary)

- powershell: |
Write-Host "##vso[task.setvariable variable=TCL_LIBRARY]$(Pipeline.Workspace)\$(TclLibrary)\tcl8"
# PC\layout copies the *parent* of TCL_LIBRARY into the layout, so it only
# needs to name a directory that exists inside the artifact: tcl8 for
# Tcl 8.6, tk9.0 for Tcl 9 (which embeds its scripts in the DLL).
$tcl = Get-ChildItem "$(Pipeline.Workspace)\$(TclLibrary)" -Directory |
Where-Object { $_.Name -match '^t(cl|k)\d' } | Select-Object -First 1
if (-not $tcl) {
Write-Host "##[error]No Tcl/Tk library directory found in $(Pipeline.Workspace)\$(TclLibrary)"
exit 1
}
Write-Host "##vso[task.setvariable variable=TCL_LIBRARY]$($tcl.FullName)"
displayName: 'Update TCL_LIBRARY'
condition: and(succeeded(), variables['TclLibrary'])

Expand Down Expand Up @@ -94,8 +103,6 @@ jobs:
Remove-Item "$(Build.ArtifactStagingDirectory)\appx-store" -Recurse -Force -EA 0
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\appx-store" --preset-appx $(ExtraOptions)
displayName: 'Generate store APPX layout'
env:
TCL_LIBRARY: $(TclLibrary)

- ${{ if parameters.SigningCertificate }}:
# The dotnet sign tool shouldn't need this, but we do because of the sccd file
Expand All @@ -110,8 +117,6 @@ jobs:
Remove-Item "$(Build.ArtifactStagingDirectory)\appx" -Recurse -Force -EA 0
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\appx" --preset-appx --include-symbols --include-tests $(ExtraOptions)
displayName: 'Generate sideloading APPX layout'
env:
TCL_LIBRARY: $(TclLibrary)

- publish: '$(Build.ArtifactStagingDirectory)\appx-store'
artifact: layout_appxstore_$(Name)
Expand Down
11 changes: 10 additions & 1 deletion windows-release/stage-layout-pymanager.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,16 @@ jobs:
targetPath: $(Pipeline.Workspace)\$(TclLibrary)

- powershell: |
Write-Host "##vso[task.setvariable variable=TCL_LIBRARY]$(Pipeline.Workspace)\$(TclLibrary)\tcl8"
# PC\layout copies the *parent* of TCL_LIBRARY into the layout, so it only
# needs to name a directory that exists inside the artifact: tcl8 for
# Tcl 8.6, tk9.0 for Tcl 9 (which embeds its scripts in the DLL).
$tcl = Get-ChildItem "$(Pipeline.Workspace)\$(TclLibrary)" -Directory |
Where-Object { $_.Name -match '^t(cl|k)\d' } | Select-Object -First 1
if (-not $tcl) {
Write-Host "##[error]No Tcl/Tk library directory found in $(Pipeline.Workspace)\$(TclLibrary)"
exit 1
}
Write-Host "##vso[task.setvariable variable=TCL_LIBRARY]$($tcl.FullName)"
displayName: 'Update TCL_LIBRARY'
condition: and(succeeded(), variables['TclLibrary'])

Expand Down
Loading