Skip to content

Include openssl plugin int appx package and exclude some #1342

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

Merged
kristelmerilain merged 1 commit into from
Jun 20, 2025
Merged

Include openssl plugin int appx package and exclude some #1342

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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22)
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/common/CMakeLists.txt)
message(FATAL_ERROR "common submodule directory empty, did you 'git clone --recursive'?")
endif()
project(qdigidoc4 VERSION 4.8.0)
project(qdigidoc4 VERSION 4.8.1)

macro(SET_ENV NAME DEF)
if(DEFINED ENV{${NAME}})
Expand Down
8 changes: 4 additions & 4 deletions client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,16 +270,16 @@ elseif(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT_NAME}> appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libcrypto-3${OPENSSL_SUFFIX}.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libssl-3${OPENSSL_SUFFIX}.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/zlib1.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/zlib$<$<CONFIG:Debug>:d>1.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxml2.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1-openssl.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp$<$<CONFIG:Debug>:d>.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.conf appx
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Assets appx/Assets
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBS_PATH}/schema appx/schema
COMMAND ${qtCore_install_prefix}/windeployqt --no-translations --no-compiler-runtime --no-patchqt appx
COMMAND ${CMAKE_COMMAND} -E remove_directory appx/bearer
COMMAND ${qtCore_install_prefix}/windeployqt --no-translations --no-compiler-runtime --no-patchqt --force-openssl
--skip-plugin-types generic,networkinformation,iconengines --exclude-plugins qjpeg,qico,qgif,qcertonlybackend,qschannelbackend appx
COMMAND makeappx.exe pack -d appx -p ${MSI_FILE}.appx
# https://msdn.microsoft.com/en-us/library/windows/desktop/jj835832(v=vs.85).aspx
#Popups GUI
Expand Down
69 changes: 16 additions & 53 deletions qdigidoc4.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,56 +44,29 @@
<Shortcut Id="ClientStartMenu4" Advertise="yes" Name="DigiDoc4" Icon="qdigidoc4.ico"
Directory="ProgramMenuFolder" WorkingDirectory="INSTALLFOLDER" />
</File>
<ProgId Id="qdigidoc4.adoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="adoc" ContentType="application/vnd.lt.archyvai.adoc-2008">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
</ProgId>
<ProgId Id="qdigidoc4.bdoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="bdoc" ContentType="application/vnd.etsi.asic-e+zip">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
</ProgId>
<ProgId Id="qdigidoc4.edoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="edoc" ContentType="application/vnd.etsi.asic-e+zip">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
</ProgId>
<ProgId Id="qdigidoc4.asice" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
<ProgId Id="qdigidoc4.document" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="asice" ContentType="application/vnd.etsi.asic-e+zip">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
<Extension Id="adoc" ContentType="application/vnd.lt.archyvai.adoc-2008" />
<Extension Id="bdoc" ContentType="application/vnd.etsi.asic-e+zip" />
<Extension Id="edoc" ContentType="application/vnd.etsi.asic-e+zip" />
<Extension Id="sce" ContentType="application/vnd.etsi.asic-e+zip" />
<Extension Id="ddoc" ContentType="application/x-ddoc" />
</ProgId>
<ProgId Id="qdigidoc4.sce" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="sce" ContentType="application/vnd.etsi.asic-e+zip">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
</ProgId>
<ProgId Id="qdigidoc4.ddoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="ddoc" ContentType="application/x-ddoc">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
</ProgId>
<ProgId Id="qdigidoc4.cdoc" Description="DigiDoc encrypted container" Icon="qdigidoc4.exe" IconIndex="2">
<ProgId Id="qdigidoc4.crypto" Description="DigiDoc encrypted container" Icon="qdigidoc4.exe" IconIndex="2">
<Extension Id="cdoc" ContentType="application/x-cdoc">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="-crypto &quot;%1&quot;" />
</Extension>
<Extension Id="cdoc2" ContentType="application/x-cdoc2" />
</ProgId>
<ProgId Id="qdigidoc4.cdoc2" Description="DigiDoc encrypted container" Icon="qdigidoc4.exe" IconIndex="2">
<Extension Id="cdoc2" ContentType="application/x-cdoc2">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="-crypto &quot;%1&quot;" />
</Extension>
</ProgId>
<ProgId Id="qdigidoc4.asics" Description="DigiDoc timestamped document" Icon="qdigidoc4.exe" IconIndex="1">
<ProgId Id="qdigidoc4.timestamp" Description="DigiDoc timestamped document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="asics" ContentType="application/vnd.etsi.asic-s+zip">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
<Extension Id="scs" ContentType="application/vnd.etsi.asic-s+zip" />
</ProgId>
<ProgId Id="qdigidoc4.scs" Description="DigiDoc timestamped document" Icon="qdigidoc4.exe" IconIndex="1">
<Extension Id="scs" ContentType="application/vnd.etsi.asic-s+zip">
<Verb Id="open" TargetFile="qdigidoc4.exe" Command="Open" Argument="&quot;%1&quot;" />
</Extension>
</ProgId>
<RegistryValue Root="HKCR" Key=".pdf\OpenWithProgids" Name="qdigidoc4.document" Value="" Type="string" />
</Component>
<File Name="zlib$(var.qt_suffix)1.dll" />
<File Name="libxml2.dll" />
Expand All @@ -102,9 +75,7 @@
<File Name="digidocpp$(var.qt_suffix).dll" />
<File Name="digidoc-tool.exe" />
<File Name="digidocpp.conf" />
<Directory Name="schema">
<Files Include="$(var.libs_path)\schema\*.xsd" />
</Directory>
<Files Subdirectory="schema" Include="$(var.libs_path)\schema\*.xsd" />
<?ifdef var.qt_path ?>
<File Name="libcrypto-3$(var.OpenSSLSuffix).dll" />
<File Name="libssl-3$(var.OpenSSLSuffix).dll" />
Expand All @@ -124,18 +95,10 @@
<File Source="$(var.qt_path)\D3DCompiler_47.dll" />
<File Source="$(var.qt_path)\opengl32sw.dll" />
<File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll" />
<Directory Name="platforms">
<File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
</Directory>
<Directory Name="tls">
<File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
</Directory>
<Directory Name="styles">
<File Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
</Directory>
<Directory Name="imageformats">
<File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
</Directory>
<File Subdirectory="platforms" Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
<File Subdirectory="tls" Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
<File Subdirectory="styles" Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
<File Subdirectory="imageformats" Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
<?endif?>
</Directory>
</StandardDirectory>
Expand Down
Loading