Skip to content

Commit 086efe3

Browse files
9EOR99EOR9
committed
More msi fixes
1 parent 9800e87 commit 086efe3

File tree

2 files changed

+44
-36
lines changed

2 files changed

+44
-36
lines changed

‎win/packaging/CMakeLists.txt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,22 @@ IF (WITH_SIGNCODE)
4040
COMMAND signtool sign ${SIGN_OPTIONS} ${CLIENT_DBG_DIR}/mariadbclient.lib)
4141
EXECUTE_PROCESS(
4242
COMMAND signtool sign ${SIGN_OPTIONS} ${CMAKE_BINARY_DIR}/plugins/auth/${CMAKE_BUILD_TYPE}/dialog.dll)
43-
EXECUTE_PROCESS(
44-
COMMAND signtool sign ${SIGN_OPTIONS} ${CMAKE_BINARY_DIR}/plugins/auth/${CMAKE_BUILD_TYPE}/mysql_clear_password.dll)
4543
ENDIF()
4644

4745
SET(MARIADB_PLUGINS "${MARIADB_PLUGINS} <File Id=\"dialog.dll\" Name=\"dialog.dll\" DiskId=\"1\" Source=\"${CMAKE_BINARY_DIR}/plugins/auth/${CMAKE_BUILD_TYPE}/dialog.dll\"/>\n")
48-
SET(MARIADB_PLUGINS "${MARIADB_PLUGINS} <File Id=\"mysql_clear_password.dll\" Name=\"mysql_clear_password.dll\" DiskId=\"1\" Source=\"${CMAKE_BINARY_DIR}/plugins/auth/${CMAKE_BUILD_TYPE}/mysql_clear_password.dll\"/>\n")
4946

5047

5148
FOREACH(src ${MARIADB_CLIENT_INCLUDES})
5249
STRING(REPLACE "-" "_" src_id ${src})
53-
STRING(REPLACE "/" "_" src_id ${src_id})
54-
SET(MARIADB_INCLUDE_FILES "${MARIADB_INCLUDE_FILES} <File Id=\"${src_id}\" Name=\"${src}\" DiskId=\"1\" Source=\"${CMAKE_SOURCE_DIR}/include/${src}\"/>\n")
50+
STRING(REPLACE "mysql/" "" src_id ${src_id})
51+
IF(${src} MATCHES "mysql/")
52+
SET(MARIADB_INCLUDEMYSQL_FILES "${MARIADB_INCLUDEMYSQL_FILES} <File Id=\"${src_id}\" Name=\"${src_id}\" DiskId=\"1\" Source=\"${CMAKE_SOURCE_DIR}/include/${src}\"/>\n")
53+
ELSE()
54+
SET(MARIADB_INCLUDE_FILES "${MARIADB_INCLUDE_FILES} <File Id=\"${src_id}\" Name=\"${src_id}\" DiskId=\"1\" Source=\"${CMAKE_SOURCE_DIR}/include/${src}\"/>\n")
55+
ENDIF()
5556
ENDFOREACH()
5657

58+
5759
IF(NOT WIX_DIR)
5860
SET(WIX_DIR $ENV{WIX}/bin)
5961
ENDIF()
@@ -85,3 +87,4 @@ SET_TARGET_PROPERTIES(${WIXOBJ} PROPERTIES EXCLUDE_FROM_ALL OFF)
8587
ADD_DEPENDENCIES(${MSI_PACKAGE} WIXOBJ)
8688
ADD_DEPENDENCIES(WIXOBJ libmariadb mariadbclient)
8789

90+

‎win/packaging/mariadb-connector-c.xml.in‎

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
</Feature>
2525
<Feature Id="IncludeFeature" Title="Include Files" Level="1">
2626
<ComponentRef Id="Includes"/>
27+
<ComponentRef Id="MysqlIncludes"/>
2728
</Feature>
2829
</Product>
2930

@@ -36,40 +37,44 @@
3637
<Directory Id="instlib_debug" Name="debug"/>
3738
<Directory Id="instlib_plugin" Name="plugin"/>
3839
</Directory>
39-
<Directory Id="instinclude" Name="include" />
40+
<Directory Id="instinclude" Name="include" >
41+
<Directory Id="instincludemysql" Name="mysql"/>
42+
</Directory>
4043
</Directory>
41-
</Directory>
44+
</Directory>
4245
</Directory>
4346
</Directory>
4447
</Fragment>
4548

46-
<Fragment>
47-
<!--<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">-->
48-
<Component Id="RegistryKeys" Guid="755726EA-9706-413D-86B3-E70582FF2819" DiskId="1" Directory="INSTALLFOLDER" Win64="@IS_WIN64@">
49-
<RegistryKey Id="Version" Root="HKLM" Key="SOFTWARE\@PRODUCT_MANUFACTURER@\@PRODUCT_NAME@" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
50-
<RegistryValue Name="Version" Type="string" Value="@PRODUCT_VERSION@"/>
51-
</RegistryKey>
52-
</Component>
53-
<Component Id="Library" Guid="89E28283-23AE-4F10-B743-B5FA485E9F9A" KeyPath="yes" DiskId="1" Directory="instlib" Win64="@IS_WIN64@">
54-
<File Id="libdll" Name="libmariadb.dll" DiskId="1" Source="@CLIENT_LIB_DIR@/libmariadb.dll" />
55-
<File Id="libdllimp" Name="libmariadb.lib" DiskId="1" Source="@CLIENT_LIB_DIR@/libmariadb.lib" />
56-
<File Id="libstatic" Name="mariadbclient.lib" DiskId="1" Source="@CLIENT_LIB_DIR@/mariadbclient.lib" />
57-
</Component>
58-
<Component Id="DebugLibrary" Guid="1b8f741d-e7d9-48f1-9e11-9270216d1dc7" KeyPath="yes" DiskId="1" Directory="instlib_debug" Win64="@IS_WIN64@">
59-
<File Id="dlibdll" Name="libmariadb.dll" DiskId="1" Source="@CLIENT_DBG_DIR@/libmariadb.dll" />
60-
<File Id="dlibdllimp" Name="libmariadb.lib" DiskId="1" Source="@CLIENT_DBG_DIR@/libmariadb.lib" />
61-
<File Id="dlibstatic" Name="mariadbclient.lib" DiskId="1" Source="@CLIENT_DBG_DIR@/mariadbclient.lib" />
62-
</Component>
63-
<Component Id="Plugins" Guid="" KeyPath="yes" DiskId="1" Directory="instlib_plugin" Win64="@IS_WIN64@">
64-
@MARIADB_PLUGINS@
65-
</Component>
66-
<Component Id="Debug" Guid="FFAFCCCC-4E0C-4A87-840C-53B63C8A427A" KeyPath="yes" Directory="instlib" DiskId="1" Win64="@IS_WIN64@">
67-
<File Id="libdllpdb" Name="libmariadb.pdb" DiskId="1" Source="@CLIENT_LIB_DIR@/libmariadb.pdb" />
68-
<File Id="libstaticpdb" Name="mariadbclient.pdb" DiskId="1" Source="@CLIENT_LIB_DIR@/mariadbclient.pdb" />
69-
</Component>
70-
<Component Id="Includes" Guid="5CFB93CC-FC30-4E13-B665-E52690AB56E3" KeyPath="yes" Directory="instinclude" DiskId="1" Win64="@IS_WIN64@">
71-
@MARIADB_INCLUDE_FILES@
72-
</Component>
73-
<!-- </ComponentGroup> -->
74-
</Fragment>
49+
<Fragment>
50+
<Component Id="RegistryKeys" Guid="755726EA-9706-413D-86B3-E70582FF2819" DiskId="1" Directory="INSTALLFOLDER" Win64="@IS_WIN64@">
51+
<RegistryKey Id="Version" Root="HKLM" Key="SOFTWARE\@PRODUCT_MANUFACTURER@\@PRODUCT_NAME@" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
52+
<RegistryValue Name="Version" Type="string" Value="@PRODUCT_VERSION@"/>
53+
</RegistryKey>
54+
</Component>
55+
<Component Id="Library" Guid="89E28283-23AE-4F10-B743-B5FA485E9F9A" KeyPath="yes" DiskId="1" Directory="instlib" Win64="@IS_WIN64@">
56+
<File Id="libdll" Name="libmariadb.dll" DiskId="1" Source="@CLIENT_LIB_DIR@/libmariadb.dll" />
57+
<File Id="libdllimp" Name="libmariadb.lib" DiskId="1" Source="@CLIENT_LIB_DIR@/libmariadb.lib" />
58+
<File Id="libstatic" Name="mariadbclient.lib" DiskId="1" Source="@CLIENT_LIB_DIR@/mariadbclient.lib" />
59+
</Component>
60+
<Component Id="DebugLibrary" Guid="1b8f741d-e7d9-48f1-9e11-9270216d1dc7" KeyPath="yes" DiskId="1" Directory="instlib_debug" Win64="@IS_WIN64@">
61+
<File Id="dlibdll" Name="libmariadb.dll" DiskId="1" Source="@CLIENT_DBG_DIR@/libmariadb.dll" />
62+
<File Id="dlibdllimp" Name="libmariadb.lib" DiskId="1" Source="@CLIENT_DBG_DIR@/libmariadb.lib" />
63+
<File Id="dlibstatic" Name="mariadbclient.lib" DiskId="1" Source="@CLIENT_DBG_DIR@/mariadbclient.lib" />
64+
</Component>
65+
<Component Id="Plugins" Guid="5B2E98C9-DFF2-4129-8360-C6AD16F6BBEA" KeyPath="yes" DiskId="1" Directory="instlib_plugin" Win64="@IS_WIN64@">
66+
@MARIADB_PLUGINS@
67+
</Component>
68+
<Component Id="Debug" Guid="FFAFCCCC-4E0C-4A87-840C-53B63C8A427A" KeyPath="yes" Directory="instlib" DiskId="1" Win64="@IS_WIN64@">
69+
<File Id="libdllpdb" Name="libmariadb.pdb" DiskId="1" Source="@CLIENT_LIB_DIR@/libmariadb.pdb" />
70+
<File Id="libstaticpdb" Name="mariadbclient.pdb" DiskId="1" Source="@CLIENT_LIB_DIR@/mariadbclient.pdb" />
71+
</Component>
72+
<Component Id="Includes" Guid="5CFB93CC-FC30-4E13-B665-E52690AB56E3" KeyPath="yes" Directory="instinclude" DiskId="1" Win64="@IS_WIN64@">
73+
@MARIADB_INCLUDE_FILES@
74+
</Component>
75+
<Component Id="MysqlIncludes" Guid="*" Directory="instincludemysql">
76+
@MARIADB_INCLUDEMYSQL_FILES@
77+
</Component>
78+
</Fragment>
7579
</Wix>
80+

0 commit comments

Comments
 (0)