Skip to content

Commit ca62829

Browse files
metsmametsma
authored
Include openssl plugin int appx package and exclude some (#1342)
IB-8518 Signed-off-by: Raul Metsma <[email protected]>
1 parent e2476d0 commit ca62829

File tree

3 files changed

+21
-58
lines changed

3 files changed

+21
-58
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22)
22
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/common/CMakeLists.txt)
33
message(FATAL_ERROR "common submodule directory empty, did you 'git clone --recursive'?")
44
endif()
5-
project(qdigidoc4 VERSION 4.8.0)
5+
project(qdigidoc4 VERSION 4.8.1)
66

77
macro(SET_ENV NAME DEF)
88
if(DEFINED ENV{${NAME}})

‎client/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,16 @@ elseif(WIN32)
270270
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT_NAME}> appx
271271
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libcrypto-3${OPENSSL_SUFFIX}.dll appx
272272
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libssl-3${OPENSSL_SUFFIX}.dll appx
273-
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/zlib1.dll appx
273+
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/zlib$<$<CONFIG:Debug>:d>1.dll appx
274274
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxml2.dll appx
275275
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1.dll appx
276276
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1-openssl.dll appx
277-
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.dll appx
277+
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp$<$<CONFIG:Debug>:d>.dll appx
278278
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.conf appx
279279
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Assets appx/Assets
280280
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBS_PATH}/schema appx/schema
281-
COMMAND ${qtCore_install_prefix}/windeployqt --no-translations --no-compiler-runtime --no-patchqt appx
282-
COMMAND ${CMAKE_COMMAND} -E remove_directory appx/bearer
281+
COMMAND ${qtCore_install_prefix}/windeployqt --no-translations --no-compiler-runtime --no-patchqt --force-openssl
282+
--skip-plugin-types generic,networkinformation,iconengines --exclude-plugins qjpeg,qico,qgif,qcertonlybackend,qschannelbackend appx
283283
COMMAND makeappx.exe pack -d appx -p ${MSI_FILE}.appx
284284
# https://msdn.microsoft.com/en-us/library/windows/desktop/jj835832(v=vs.85).aspx
285285
#Popups GUI

‎qdigidoc4.wxs‎

Lines changed: 16 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -44,56 +44,29 @@
4444
<Shortcut Id="ClientStartMenu4" Advertise="yes" Name="DigiDoc4" Icon="qdigidoc4.ico"
4545
Directory="ProgramMenuFolder" WorkingDirectory="INSTALLFOLDER" />
4646
</File>
47-
<ProgId Id="qdigidoc4.adoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
48-
<Extension Id="adoc" ContentType="application/vnd.lt.archyvai.adoc-2008">
49-
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
50-
</Extension>
51-
</ProgId>
52-
<ProgId Id="qdigidoc4.bdoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
53-
<Extension Id="bdoc" ContentType="application/vnd.etsi.asic-e+zip">
54-
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
55-
</Extension>
56-
</ProgId>
57-
<ProgId Id="qdigidoc4.edoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
58-
<Extension Id="edoc" ContentType="application/vnd.etsi.asic-e+zip">
59-
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
60-
</Extension>
61-
</ProgId>
62-
<ProgId Id="qdigidoc4.asice" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
47+
<ProgId Id="qdigidoc4.document" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
6348
<Extension Id="asice" ContentType="application/vnd.etsi.asic-e+zip">
6449
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
6550
</Extension>
51+
<Extension Id="adoc" ContentType="application/vnd.lt.archyvai.adoc-2008" />
52+
<Extension Id="bdoc" ContentType="application/vnd.etsi.asic-e+zip" />
53+
<Extension Id="edoc" ContentType="application/vnd.etsi.asic-e+zip" />
54+
<Extension Id="sce" ContentType="application/vnd.etsi.asic-e+zip" />
55+
<Extension Id="ddoc" ContentType="application/x-ddoc" />
6656
</ProgId>
67-
<ProgId Id="qdigidoc4.sce" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
68-
<Extension Id="sce" ContentType="application/vnd.etsi.asic-e+zip">
69-
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
70-
</Extension>
71-
</ProgId>
72-
<ProgId Id="qdigidoc4.ddoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
73-
<Extension Id="ddoc" ContentType="application/x-ddoc">
74-
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
75-
</Extension>
76-
</ProgId>
77-
<ProgId Id="qdigidoc4.cdoc" Description="DigiDoc encrypted container" Icon="qdigidoc4.exe" IconIndex="2">
57+
<ProgId Id="qdigidoc4.crypto" Description="DigiDoc encrypted container" Icon="qdigidoc4.exe" IconIndex="2">
7858
<Extension Id="cdoc" ContentType="application/x-cdoc">
7959
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="-crypto &quot;%1&quot;" />
8060
</Extension>
61+
<Extension Id="cdoc2" ContentType="application/x-cdoc2" />
8162
</ProgId>
82-
<ProgId Id="qdigidoc4.cdoc2" Description="DigiDoc encrypted container" Icon="qdigidoc4.exe" IconIndex="2">
83-
<Extension Id="cdoc2" ContentType="application/x-cdoc2">
84-
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="-crypto &quot;%1&quot;" />
85-
</Extension>
86-
</ProgId>
87-
<ProgId Id="qdigidoc4.asics" Description="DigiDoc timestamped document" Icon="qdigidoc4.exe" IconIndex="1">
63+
<ProgId Id="qdigidoc4.timestamp" Description="DigiDoc timestamped document" Icon="qdigidoc4.exe" IconIndex="1">
8864
<Extension Id="asics" ContentType="application/vnd.etsi.asic-s+zip">
8965
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
9066
</Extension>
67+
<Extension Id="scs" ContentType="application/vnd.etsi.asic-s+zip" />
9168
</ProgId>
92-
<ProgId Id="qdigidoc4.scs" Description="DigiDoc timestamped document" Icon="qdigidoc4.exe" IconIndex="1">
93-
<Extension Id="scs" ContentType="application/vnd.etsi.asic-s+zip">
94-
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
95-
</Extension>
96-
</ProgId>
69+
<RegistryValue Root="HKCR" Key=".pdf\OpenWithProgids" Name="qdigidoc4.document" Value="" Type="string" />
9770
</Component>
9871
<File Name="zlib$(var.qt_suffix)1.dll" />
9972
<File Name="libxml2.dll" />
@@ -102,9 +75,7 @@
10275
<File Name="digidocpp$(var.qt_suffix).dll" />
10376
<File Name="digidoc-tool.exe" />
10477
<File Name="digidocpp.conf" />
105-
<Directory Name="schema">
106-
<Files Include="$(var.libs_path)\schema\*.xsd" />
107-
</Directory>
78+
<Files Subdirectory="schema" Include="$(var.libs_path)\schema\*.xsd" />
10879
<?ifdef var.qt_path ?>
10980
<File Name="libcrypto-3$(var.OpenSSLSuffix).dll" />
11081
<File Name="libssl-3$(var.OpenSSLSuffix).dll" />
@@ -124,18 +95,10 @@
12495
<File Source="$(var.qt_path)\D3DCompiler_47.dll" />
12596
<File Source="$(var.qt_path)\opengl32sw.dll" />
12697
<File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll" />
127-
<Directory Name="platforms">
128-
<File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
129-
</Directory>
130-
<Directory Name="tls">
131-
<File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
132-
</Directory>
133-
<Directory Name="styles">
134-
<File Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
135-
</Directory>
136-
<Directory Name="imageformats">
137-
<File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
138-
</Directory>
98+
<File Subdirectory="platforms" Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
99+
<File Subdirectory="tls" Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
100+
<File Subdirectory="styles" Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
101+
<File Subdirectory="imageformats" Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
139102
<?endif?>
140103
</Directory>
141104
</StandardDirectory>

0 commit comments

Comments
 (0)