mirror of
https://github.com/PabloMK7/citra
synced 2024-11-15 05:08:23 +00:00
Merge pull request #3043 from MerryMage/appveyor
appveyor: Determine dlls to include in package programmatically
This commit is contained in:
commit
b4471aafa2
2 changed files with 47 additions and 15 deletions
39
.appveyor/UtilityFunctions.ps1
Normal file
39
.appveyor/UtilityFunctions.ps1
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
# Set-up Visual Studio Command Prompt environment for PowerShell
|
||||||
|
pushd "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\"
|
||||||
|
cmd /c "VsDevCmd.bat -arch=x64 & set" | foreach {
|
||||||
|
if ($_ -match "=") {
|
||||||
|
$v = $_.split("="); Set-Item -Force -Path "ENV:\$($v[0])" -Value "$($v[1])"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
popd
|
||||||
|
|
||||||
|
function Which ($search_path, $name) {
|
||||||
|
($search_path).Split(";") | Get-ChildItem -Filter $name | Select -First 1 -Exp FullName
|
||||||
|
}
|
||||||
|
|
||||||
|
function GetDeps ($search_path, $binary) {
|
||||||
|
((dumpbin /dependents $binary).Where({ $_ -match "dependencies:"}, "SkipUntil") | Select-String "[^ ]*\.dll").Matches | foreach {
|
||||||
|
Which $search_path $_.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function RecursivelyGetDeps ($search_path, $binary) {
|
||||||
|
$final_deps = @()
|
||||||
|
$deps_to_process = GetDeps $search_path $binary
|
||||||
|
while ($deps_to_process.Count -gt 0) {
|
||||||
|
$current, $deps_to_process = $deps_to_process
|
||||||
|
if ($final_deps -contains $current) { continue }
|
||||||
|
|
||||||
|
# Is this a system dll file?
|
||||||
|
# We use the same algorithm that cmake uses to determine this.
|
||||||
|
if ($current -match "$([regex]::Escape($env:SystemRoot))\\sys") { continue }
|
||||||
|
if ($current -match "$([regex]::Escape($env:WinDir))\\sys") { continue }
|
||||||
|
if ($current -match "\\msvc[^\\]+dll") { continue }
|
||||||
|
if ($current -match "\\api-ms-win-[^\\]+dll") { continue }
|
||||||
|
|
||||||
|
$final_deps += $current
|
||||||
|
$new_deps = GetDeps $search_path $current
|
||||||
|
$deps_to_process += ($new_deps | ?{-not ($final_deps -contains $_)})
|
||||||
|
}
|
||||||
|
return $final_deps
|
||||||
|
}
|
23
appveyor.yml
23
appveyor.yml
|
@ -117,23 +117,16 @@ after_build:
|
||||||
Get-ChildItem "$CMAKE_BINARY_DIR" -Recurse -Filter "libcurl.dll" | Copy-Item -destination $RELEASE_DIST
|
Get-ChildItem "$CMAKE_BINARY_DIR" -Recurse -Filter "libcurl.dll" | Copy-Item -destination $RELEASE_DIST
|
||||||
Copy-Item -path "$CMAKE_SOURCE_DIR/license.txt" -destination $RELEASE_DIST
|
Copy-Item -path "$CMAKE_SOURCE_DIR/license.txt" -destination $RELEASE_DIST
|
||||||
Copy-Item -path "$CMAKE_SOURCE_DIR/README.md" -destination $RELEASE_DIST
|
Copy-Item -path "$CMAKE_SOURCE_DIR/README.md" -destination $RELEASE_DIST
|
||||||
|
|
||||||
# copy all the dll dependencies to the release folder
|
# copy all the dll dependencies to the release folder
|
||||||
# hardcoded list because we don't build static and determining the list of dlls from the binary is a pain.
|
. "./.appveyor/UtilityFunctions.ps1"
|
||||||
$MingwDLLs = "Qt5Core.dll","Qt5Widgets.dll","Qt5Gui.dll","Qt5OpenGL.dll",
|
$DLLSearchPath = "$CMAKE_BINARY_DIR\externals\curl-7_55_1\lib;C:\msys64\mingw64\bin;$env:PATH"
|
||||||
# QT dll dependencies
|
$MingwDLLs = RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\citra.exe"
|
||||||
"libbz2-*.dll","libicudt*.dll","libicuin*.dll","libicuuc*.dll","libffi-*.dll",
|
$MingwDLLs += RecursivelyGetDeps $DLLSearchPath "$RELEASE_DIST\citra-qt.exe"
|
||||||
"libfreetype-*.dll","libglib-*.dll","libgobject-*.dll","libgraphite2.dll","libiconv-*.dll",
|
Write-Host "Detected the following dependencies:"
|
||||||
"libharfbuzz-*.dll","libintl-*.dll","libpcre-*.dll","libpcre16-*.dll","libpcre2-16-*.dll","libpng16-*.dll",
|
Write-Host $MingwDLLs
|
||||||
# Runtime/Other dependencies
|
|
||||||
"libgcc_s_seh-*.dll","libstdc++-*.dll","libwinpthread-*.dll","SDL2.dll","zlib1.dll"
|
|
||||||
foreach ($file in $MingwDLLs) {
|
foreach ($file in $MingwDLLs) {
|
||||||
Copy-Item -path "C:/msys64/mingw64/bin/$file" -force -destination "$RELEASE_DIST"
|
Copy-Item -path "$file" -force -destination "$RELEASE_DIST"
|
||||||
}
|
|
||||||
# the above list copies a few extra debug dlls that aren't needed (thanks globbing patterns!)
|
|
||||||
# so we can remove them by hardcoding another list of extra dlls to remove
|
|
||||||
$DebugDLLs = "libicudtd*.dll","libicuind*.dll","libicuucd*.dll"
|
|
||||||
foreach ($file in $DebugDLLs) {
|
|
||||||
Remove-Item -path "$RELEASE_DIST/$file"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# copy the qt windows plugin dll to platforms
|
# copy the qt windows plugin dll to platforms
|
||||||
|
|
Loading…
Reference in a new issue