mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Include SVG support in Windows builds

This commit is contained in:
Mike Gelfand 2021-12-06 21:39:16 +00:00
parent bfbca961d4
commit 89b0362bf2
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/msi/components/QtClient.wxs vendored
View File

@ -97,6 +97,9 @@
<Component Id="dll.qt.network"> <Component Id="dll.qt.network">
<File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Network.dll" /> <File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Network.dll" />
</Component> </Component>
<Component Id="dll.qt.svg">
<File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Svg.dll" />
</Component>
<Component Id="dll.qt.widgets"> <Component Id="dll.qt.widgets">
<File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Widgets.dll" /> <File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Widgets.dll" />
</Component> </Component>
@ -109,7 +112,6 @@
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="INSTALLDIR" FileSource="$(var.QtDir)\plugins"> <DirectoryRef Id="INSTALLDIR" FileSource="$(var.QtDir)\plugins">
<?if $(var.QtMajorVer) = 6 ?>
<Directory Id="QTIMAGEFORMATSDIR" Name="imageformats"> <Directory Id="QTIMAGEFORMATSDIR" Name="imageformats">
<Component Id="dll.qt.plugins.imageformats.gif"> <Component Id="dll.qt.plugins.imageformats.gif">
<File DiskId="1" KeyPath="yes" Name="qgif.dll" /> <File DiskId="1" KeyPath="yes" Name="qgif.dll" />
@ -120,8 +122,10 @@
<Component Id="dll.qt.plugins.imageformats.jpeg"> <Component Id="dll.qt.plugins.imageformats.jpeg">
<File DiskId="1" KeyPath="yes" Name="qjpeg.dll" /> <File DiskId="1" KeyPath="yes" Name="qjpeg.dll" />
</Component> </Component>
<Component Id="dll.qt.plugins.imageformats.svg">
<File DiskId="1" KeyPath="yes" Name="qsvg.dll" />
</Component>
</Directory> </Directory>
<?endif ?>
<Directory Id="QTPLATFORMDIR" Name="platforms"> <Directory Id="QTPLATFORMDIR" Name="platforms">
<Component Id="dll.qt.plugins.platforms.windows"> <Component Id="dll.qt.plugins.platforms.windows">
@ -161,15 +165,15 @@
<ComponentRef Id="dll.qt.dbus" /> <ComponentRef Id="dll.qt.dbus" />
<ComponentRef Id="dll.qt.gui" /> <ComponentRef Id="dll.qt.gui" />
<ComponentRef Id="dll.qt.network" /> <ComponentRef Id="dll.qt.network" />
<ComponentRef Id="dll.qt.svg" />
<ComponentRef Id="dll.qt.widgets" /> <ComponentRef Id="dll.qt.widgets" />
<?if $(var.QtMajorVer) = 5 ?> <?if $(var.QtMajorVer) = 5 ?>
<ComponentRef Id="dll.qt.winextras" /> <ComponentRef Id="dll.qt.winextras" />
<?endif ?> <?endif ?>
<?if $(var.QtMajorVer) = 6 ?>
<ComponentRef Id="dll.qt.plugins.imageformats.gif" /> <ComponentRef Id="dll.qt.plugins.imageformats.gif" />
<ComponentRef Id="dll.qt.plugins.imageformats.ico" /> <ComponentRef Id="dll.qt.plugins.imageformats.ico" />
<ComponentRef Id="dll.qt.plugins.imageformats.jpeg" /> <ComponentRef Id="dll.qt.plugins.imageformats.jpeg" />
<?endif ?> <ComponentRef Id="dll.qt.plugins.imageformats.svg" />
<ComponentRef Id="dll.qt.plugins.platforms.windows" /> <ComponentRef Id="dll.qt.plugins.platforms.windows" />
<ComponentRef Id="dll.qt.plugins.styles.windowsvista" /> <ComponentRef Id="dll.qt.plugins.styles.windowsvista" />
<?if $(var.QtMajorVer) = 6 ?> <?if $(var.QtMajorVer) = 6 ?>

1
release/windows/build-qt.ps1
View File

@ -16,6 +16,7 @@ function global:Build-Qt([string] $PrefixDir, [string] $Arch, [string] $DepsPref
$UnpackFlags = @( $UnpackFlags = @(
(Join-Path $ArchiveBase qtactiveqt '*') (Join-Path $ArchiveBase qtactiveqt '*')
(Join-Path $ArchiveBase qtbase '*') (Join-Path $ArchiveBase qtbase '*')
(Join-Path $ArchiveBase qtsvg '*')
(Join-Path $ArchiveBase qttools '*') (Join-Path $ArchiveBase qttools '*')
(Join-Path $ArchiveBase qttranslations '*') (Join-Path $ArchiveBase qttranslations '*')
(Join-Path $ArchiveBase qtwinextras '*') (Join-Path $ArchiveBase qtwinextras '*')

10
release/windows/build-transmission.ps1
View File

@ -36,13 +36,21 @@ function global:Build-Transmission([string] $PrefixDir, [string] $Arch, [string]
Copy-Item -Path (Join-Path $DepsPrefixDir bin "${x}.pdb") -Destination $DebugSymbolsDir Copy-Item -Path (Join-Path $DepsPrefixDir bin "${x}.pdb") -Destination $DebugSymbolsDir
} }
foreach ($x in @('Core', 'DBus', 'Gui', 'Network', 'Widgets', 'WinExtras')) { foreach ($x in @('Core', 'DBus', 'Gui', 'Network', 'Svg', 'Widgets', 'WinExtras')) {
if ($DepsPrefixDir -ne $PrefixDir) { if ($DepsPrefixDir -ne $PrefixDir) {
Copy-Item -Path (Join-Path $DepsPrefixDir bin "Qt5${x}.dll") -Destination (Join-Path $PrefixDir bin) Copy-Item -Path (Join-Path $DepsPrefixDir bin "Qt5${x}.dll") -Destination (Join-Path $PrefixDir bin)
} }
Copy-Item -Path (Join-Path $DepsPrefixDir bin "Qt5${x}.pdb") -Destination $DebugSymbolsDir Copy-Item -Path (Join-Path $DepsPrefixDir bin "Qt5${x}.pdb") -Destination $DebugSymbolsDir
} }
foreach ($x in @('gif', 'ico', 'jpeg', 'svg')) {
if ($DepsPrefixDir -ne $PrefixDir) {
New-Item -Path (Join-Path $PrefixDir plugins imageformats) -ItemType Directory -ErrorAction Ignore | Out-Null
Copy-Item -Path (Join-Path $DepsPrefixDir plugins imageformats "q${x}.dll") -Destination (Join-Path $PrefixDir plugins imageformats)
}
Copy-Item -Path (Join-Path $DepsPrefixDir plugins imageformats "q${x}.pdb") -Destination $DebugSymbolsDir
}
if ($DepsPrefixDir -ne $PrefixDir) { if ($DepsPrefixDir -ne $PrefixDir) {
New-Item -Path (Join-Path $PrefixDir plugins platforms) -ItemType Directory -ErrorAction Ignore | Out-Null New-Item -Path (Join-Path $PrefixDir plugins platforms) -ItemType Directory -ErrorAction Ignore | Out-Null
Copy-Item -Path (Join-Path $DepsPrefixDir plugins platforms qwindows.dll) -Destination (Join-Path $PrefixDir plugins platforms) Copy-Item -Path (Join-Path $DepsPrefixDir plugins platforms qwindows.dll) -Destination (Join-Path $PrefixDir plugins platforms)