From c4d26fe1d279d03574c0235293f46ac682c64742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= Date: Wed, 31 May 2023 11:00:53 +0200 Subject: [PATCH] Enable rebuilding FFMPEG for MSVC without deleting lib files first To simplify testing modifications to the FFMPEG library, it is nice to be able to rebuild FFMPEG without having to manually delete lib files first. This change makes this possible because it uses powershell Move-Item instead of Rename-Item to rename .o files to .lib files. Move-Item's -Force argument allows renaming files to destination that already exists. Pick-to: 6.5 6.6 Change-Id: I0a56776d38c37d38d1cd74b5186881fc955d51f0 Reviewed-by: Alexey Edelev --- coin/provisioning/common/windows/install-ffmpeg.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index f90dbbab..e258c444 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -83,7 +83,11 @@ function InstallMsvcFfmpeg { Write-Host "Rename libraries lib*.a -> *.lib" try { $msvcDir = [System.Environment]::GetEnvironmentVariable("FFMPEG_DIR_MSVC", [System.EnvironmentVariableTarget]::Machine) - Get-ChildItem "$msvcDir\lib\lib*.a" | Rename-Item -NewName { $_.Name -replace 'lib(\w+).a$', '$1.lib' } + Get-ChildItem "$msvcDir\lib\lib*.a" | ForEach-Object { + $NewName = $_.Name -replace 'lib(\w+).a$', '$1.lib' + $Destination = Join-Path -Path $_.Directory.FullName -ChildPath $NewName + Move-Item -Path $_.FullName -Destination $Destination -Force + } } catch { Write-Host "Failed to rename libraries lib*.a -> *.lib" return $false