Skip to content

Commit a3955d7

Browse files
authored
Include digidoc-tool in MSIX package (#1364)
IB-8685 Signed-off-by: Raul Metsma <[email protected]>
1 parent e585457 commit a3955d7

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

AppxManifest.xml.cmake

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
3+
xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
4+
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
35
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
46
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
5-
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
7+
IgnorableNamespaces="desktop uap uap3 rescap">
68
<Identity Name="RiigiInfossteemiAmet.DigiDoc4client" ProcessorArchitecture="${PLATFORM}" Version="${PROJECT_VERSION}.0"
79
Publisher="CN=8BBBE4D8-620A-4884-A12A-72F1A2030D8B" />
810
<Properties>
@@ -54,5 +56,16 @@
5456
</uap3:Extension>
5557
</Extensions>
5658
</Application>
59+
<Application Id="DigidocTool" Executable="digidoc-tool.exe" EntryPoint="Windows.FullTrustApplication">
60+
<uap:VisualElements DisplayName="digidoc-tool" Description="digidoc-tool" BackgroundColor="transparent"
61+
Square150x150Logo="Assets\DigiDoc.150x150.png" Square44x44Logo="Assets\DigiDoc.44x44.png" AppListEntry="none" />
62+
<Extensions>
63+
<uap3:Extension Category="windows.appExecutionAlias">
64+
<uap3:AppExecutionAlias>
65+
<desktop:ExecutionAlias Alias="digidoc-tool.exe" />
66+
</uap3:AppExecutionAlias>
67+
</uap3:Extension>
68+
</Extensions>
69+
</Application>
5770
</Applications>
5871
</Package>

client/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ elseif(WIN32)
284284
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBS_PATH}/schema appx/schema
285285
COMMAND Qt::windeployqt --no-translations --no-compiler-runtime --no-patchqt --force-openssl
286286
--skip-plugin-types generic,networkinformation,iconengines --exclude-plugins qjpeg,qico,qgif,qcertonlybackend,qschannelbackend appx
287+
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidoc-tool.exe appx
287288
COMMAND makeappx.exe pack -d appx -p ${MSI_FILE}.appx
288289
# https://msdn.microsoft.com/en-us/library/windows/desktop/jj835832(v=vs.85).aspx
289290
#Popups GUI

0 commit comments

Comments
 (0)