Skip to content

Commit bf5747d

Browse files
kboortzdahlerlend
authored andcommitted
Bug #33972317 Server 8.x MSI incorrectly shows "Info" feature
Follow-up change to Bug #33972317. There should not be a separate entry at all in the selection box for installing the INFO_SRC and INFO_BIN files, they should be installed part of the documentation. Change-Id: I4949adc062e283bb655a48d1566a436e4308eec6
1 parent 472a50d commit bf5747d

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

packaging/WiX/CPackWixConfig.cmake

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,19 @@ SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
117117
SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
118118
SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
119119

120-
#Feature Documentation
121-
SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
122-
SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
123-
SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
120+
#Feature Documentation (disable each component as you can't disable a group)
121+
SET(CPACK_COMPONENT_GROUP_ALLDOC_DISPLAY_NAME "Documentation")
122+
SET(CPACK_COMPONENT_GROUP_ALLDOC_DESCRIPTION "Installs documentation")
123+
# Subfeature "Documentation" (hidden)
124+
SET(CPACK_COMPONENT_DOCUMENTATION_GROUP "AllDoc")
125+
SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Miscellaneous documentation")
126+
SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation and samle files")
127+
SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2) # Not to install by default
128+
# Subfeature "Info" (hidden)
129+
SET(CPACK_COMPONENT_INFO_GROUP "AllDoc")
130+
SET(CPACK_COMPONENT_INFO_DISPLAY_NAME "Source/build information")
131+
SET(CPACK_COMPONENT_INFO_DESCRIPTION "Installs the \"docs/INFO_SRC\" and \"docs/INFO_BIN\" files")
132+
SET(CPACK_COMPONENT_INFO_WIX_LEVEL 2) # Not to install by default
124133

125134
#Feature tests
126135
SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")

0 commit comments

Comments
 (0)