Skip to content

Commit 5fd654c

Browse files
lawrinlawrin
authored andcommitted
sqlstirng.h wasn't installed by MSI(Bug#12329294)
1 parent 5cc3a84 commit 5fd654c

File tree

1 file changed

+125
-124
lines changed

1 file changed

+125
-124
lines changed

win/mysql-conncpp-msi-template.xml.in

Lines changed: 125 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,125 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
3-
<Product Id="@CONNECTOR_PKG_ID1@" Name="MySQL Connector C++ @CONNECTOR_PRODUCT_VERSION@" Language="1033" Version="@CONNECTOR_PRODUCT_VERSION@" Manufacturer="Oracle and/or its affiliates" UpgradeCode="fe990d78-8bb1-4880-930a-0430e707f3ca">
4-
<Package Id="@CONNECTOR_PKG_ID2@" Keywords="Installer,MSI,Database" Description="MySQL C++ Connector @CONNECTOR_PRODUCT_VERSION@" InstallerVersion="200" Platforms="@CONNECTOR_PLATFORM@" Compressed="yes" SummaryCodepage="1252" />
5-
<?include mysql-conncpp-msi-arpprops.xml ?>
6-
7-
<!-- Check for installed applications -->
8-
<CustomAction Id="NewerVersionInstalled" Error="A newer version of this product is
9-
already installed." />
10-
11-
12-
<Upgrade Id="fe990d78-8bb1-4880-930a-0430e707f3ca">
13-
<UpgradeVersion Property="PREVIOUSLYINSTALLED" Minimum="0.0.0.0" Maximum="@CONNECTOR_PRODUCT_VERSION@" IncludeMaximum="yes" IncludeMinimum="yes" />
14-
<UpgradeVersion Property="NEWERPRODUCTFOUND" Minimum="@CONNECTOR_PRODUCT_VERSION@" Maximum="1.9.9.9" IncludeMinimum="no" OnlyDetect="yes" />
15-
</Upgrade>
16-
17-
<InstallExecuteSequence>
18-
<Custom Action="NewerVersionInstalled" After="FindRelatedProducts">NEWERPRODUCTFOUND</Custom>
19-
<RemoveExistingProducts After="InstallInitialize"/>
20-
</InstallExecuteSequence>
21-
22-
<!-- File definitions -->
23-
<Media Id="1" Cabinet="Product.cab" EmbedCab="yes" />
24-
<Directory Id="TARGETDIR" Name="SourceDir">
25-
<Directory Id="@CONNECTOR_DEFAULT_DEST@">
26-
<Directory Id="MYSQL" Name="MySQL">
27-
<Directory Id="MysqlLibraryDir" Name="MYSQLCPP.CON" LongName="@CONNECTOR_PRODUCT_DEST@">
28-
<Directory Id="INSTALLDIR" Name=".">
29-
<Directory Id="DesktopFolder" Name=".">
30-
<Directory Id="ProgramMenuFolder" Name=".">
31-
<Directory Id="MySQLProgramMenuFolder" Name="MySQL">
32-
<Directory Id="MySQLProductMenuFolder" Name="MySQLPMF" LongName="MySQL Connector C++ @CONNECTOR_PRODUCT_VERSION@" />
33-
</Directory>
34-
</Directory>
35-
</Directory>
36-
37-
<Component Id="AdditionalFiles" Guid="85f15863-ccbb-40b6-8610-5afedc9fa44f" DiskId="1">
38-
<File Id="file0031" Name="README" LongName="README" Source="..\README" />
39-
<File Id="file0032" Name="@LIC_SHORT_NAME@" LongName="@LIC_NAME@" Source="..\@LIC_NAME@" />
40-
<File Id="file0033" Name="LIC_3RDP.TXT" LongName="Licenses_for_Third-Party_Components.txt" Source="..\Licenses_for_Third-Party_Components.txt" />
41-
</Component>
42-
43-
<!-- *****************************************************************************************
44-
include directory
45-
-->
46-
47-
<Directory Id="include" Name="include">
48-
<Component Id="IncludeFiles" Guid="dfc7126d-b5b0-4ffb-b509-749523297faa" DiskId="1">
49-
<File Id="file0021" Name="mydrv.h" LongName="mysql_driver.h" Source="..\driver\mysql_driver.h" />
50-
<File Id="file0022" Name="myconn.h" LongName="mysql_connection.h" Source="..\driver\mysql_connection.h" />
51-
<File Id="file0023" Name="myerror.h" LongName="mysql_error.h" Source="..\driver\mysql_error.h" />
52-
</Component>
53-
54-
<Directory Id="cppconn" Name="cppconn">
55-
<Component Id="CppconnIncludes" Guid="3b8df956-dc82-48ac-8101-0784368dcd83" DiskId="1">
56-
<File Id="file0001" Name="connect~.h" LongName="connection.h" Source="..\cppconn\connection.h" />
57-
<File Id="file0002" Name="datatype.h" Source="..\cppconn\datatype.h" />
58-
<File Id="file0003" Name="driver.h" Source="..\cppconn\driver.h" />
59-
<File Id="file0004" Name="excepti~.h" LongName="exception.h" Source="..\cppconn\exception.h" />
60-
<File Id="file0005" Name="metadata.h" Source="..\cppconn\metadata.h" />
61-
<File Id="file0006" Name="paramet~.h" LongName="parameter_metadata.h" Source="..\cppconn\parameter_metadata.h" />
62-
<File Id="file0007" Name="prepare~.h" LongName="prepared_statement.h" Source="..\cppconn\prepared_statement.h" />
63-
<File Id="file0008" Name="results.h" LongName="resultset.h" Source="..\cppconn\resultset.h" />
64-
<File Id="file0009" Name="resultme.h" LongName="resultset_metadata.h" Source="..\cppconn\resultset_metadata.h" />
65-
<File Id="file0010" Name="statem~.h" LongName="statement.h" Source="..\cppconn\statement.h" />
66-
<File Id="file0012" Name="warning.h" Source="..\cppconn\warning.h" />
67-
<File Id="file0013" Name="config.h" Source="..\cppconn\config.h" />
68-
<File Id="file0014" Name="build_c~.h" LongName="build_config.h" Source="..\cppconn\build_config.h" />
69-
70-
</Component>
71-
</Directory>
72-
73-
</Directory>
74-
<!-- *****************************************************************************************
75-
lib directory
76-
-->
77-
<Directory Id="lib" Name="lib">
78-
<Directory Id="debug" Name="debug">
79-
<Component Id="ClientLibraryDebug" Guid="9cdd3e41-c4fb-4a47-88a2-6f0c82a4834d" DiskId="1">
80-
<File Id="file0100" Name="mycppcon.dll" LongName="mysqlcppconn.dll" Source="..\driver\debug\mysqlcppconn.dll" />
81-
<File Id="file0101" Name="mycppcon.lib" LongName="mysqlcppconn.lib" Source="..\driver\debug\mysqlcppconn.lib" />
82-
<File Id="file0102" Name="mycppcon.pdb" LongName="mysqlcppconn.pdb" Source="..\driver\debug\mysqlcppconn.pdb" />
83-
<File Id="file0103" Name="mycpstat.lib" LongName="mysqlcppconn-static.lib" Source="..\driver\debug\mysqlcppconn-static.lib" />
84-
<File Id="file0104" Name="mycpstat.pdb" LongName="mysqlcppconn-static.pdb" Source="..\driver\debug\mysqlcppconn-static.pdb" />
85-
</Component>
86-
</Directory>
87-
<Directory Id="opt" Name="opt">
88-
<Component Id="ClientLibraryRelease" Guid="00328709-7f5e-4a3c-a189-e79f92243377" DiskId="1">
89-
<File Id="file0150" Name="mycppcon.dll" LongName="mysqlcppconn.dll" Source="..\driver\relwithdebinfo\mysqlcppconn.dll" />
90-
<File Id="file0151" Name="mycppcon.lib" LongName="mysqlcppconn.lib" Source="..\driver\relwithdebinfo\mysqlcppconn.lib" />
91-
<File Id="file0152" Name="mycpstat.lib" LongName="mysqlcppconn-static.lib" Source="..\driver\relwithdebinfo\mysqlcppconn-static.lib" />
92-
</Component>
93-
<Component Id="MSRedistributables" Guid="e50ed3bb-e5bd-42b5-9029-9ca2356fd0f3" DiskId="1">
94-
@REQUIRED_REDISTRIBUTABLE_LIBS@
95-
</Component>
96-
</Directory>
97-
</Directory>
98-
99-
</Directory>
100-
</Directory>
101-
</Directory>
102-
</Directory>
103-
</Directory>
104-
105-
<Feature Id="Complete" Title="MySQL Connector C++" Description="The MySQL Connector C++ client library." Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR">
106-
<Feature Id="ConnectorCPP" Title="Library" Description="The release library and headers." Level="1" Display="expand">
107-
<ComponentRef Id="AdditionalFiles" />
108-
<ComponentRef Id="IncludeFiles" />
109-
<ComponentRef Id="CppconnIncludes" />
110-
<ComponentRef Id="ClientLibraryRelease" />
111-
<ComponentRef Id="MSRedistributables" />
112-
113-
<Feature Id="DebugLibraries" Title="Debug Libary" Description="Debug library and symbols." Level="1000">
114-
<ComponentRef Id="ClientLibraryDebug" />
115-
</Feature>
116-
</Feature>
117-
</Feature>
118-
119-
<UIRef Id="MySQL_Connector_UI" />
120-
<UIRef Id="WixUI_ErrorProgressText" />
121-
</Product>
122-
</Wix>
123-
124-
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
3+
<Product Id="@CONNECTOR_PKG_ID1@" Name="MySQL Connector C++ @CONNECTOR_PRODUCT_VERSION@" Language="1033" Version="@CONNECTOR_PRODUCT_VERSION@" Manufacturer="Oracle and/or its affiliates" UpgradeCode="fe990d78-8bb1-4880-930a-0430e707f3ca">
4+
<Package Id="@CONNECTOR_PKG_ID2@" Keywords="Installer,MSI,Database" Description="MySQL C++ Connector @CONNECTOR_PRODUCT_VERSION@" InstallerVersion="200" Platforms="@CONNECTOR_PLATFORM@" Compressed="yes" SummaryCodepage="1252" />
5+
<?include mysql-conncpp-msi-arpprops.xml ?>
6+
7+
<!-- Check for installed applications -->
8+
<CustomAction Id="NewerVersionInstalled" Error="A newer version of this product is
9+
already installed." />
10+
11+
12+
<Upgrade Id="fe990d78-8bb1-4880-930a-0430e707f3ca">
13+
<UpgradeVersion Property="PREVIOUSLYINSTALLED" Minimum="0.0.0.0" Maximum="@CONNECTOR_PRODUCT_VERSION@" IncludeMaximum="yes" IncludeMinimum="yes" />
14+
<UpgradeVersion Property="NEWERPRODUCTFOUND" Minimum="@CONNECTOR_PRODUCT_VERSION@" Maximum="1.9.9.9" IncludeMinimum="no" OnlyDetect="yes" />
15+
</Upgrade>
16+
17+
<InstallExecuteSequence>
18+
<Custom Action="NewerVersionInstalled" After="FindRelatedProducts">NEWERPRODUCTFOUND</Custom>
19+
<RemoveExistingProducts After="InstallInitialize"/>
20+
</InstallExecuteSequence>
21+
22+
<!-- File definitions -->
23+
<Media Id="1" Cabinet="Product.cab" EmbedCab="yes" />
24+
<Directory Id="TARGETDIR" Name="SourceDir">
25+
<Directory Id="@CONNECTOR_DEFAULT_DEST@">
26+
<Directory Id="MYSQL" Name="MySQL">
27+
<Directory Id="MysqlLibraryDir" Name="MYSQLCPP.CON" LongName="@CONNECTOR_PRODUCT_DEST@">
28+
<Directory Id="INSTALLDIR" Name=".">
29+
<Directory Id="DesktopFolder" Name=".">
30+
<Directory Id="ProgramMenuFolder" Name=".">
31+
<Directory Id="MySQLProgramMenuFolder" Name="MySQL">
32+
<Directory Id="MySQLProductMenuFolder" Name="MySQLPMF" LongName="MySQL Connector C++ @CONNECTOR_PRODUCT_VERSION@" />
33+
</Directory>
34+
</Directory>
35+
</Directory>
36+
37+
<Component Id="AdditionalFiles" Guid="85f15863-ccbb-40b6-8610-5afedc9fa44f" DiskId="1">
38+
<File Id="file0031" Name="README" LongName="README" Source="..\README" />
39+
<File Id="file0032" Name="@LIC_SHORT_NAME@" LongName="@LIC_NAME@" Source="..\@LIC_NAME@" />
40+
<File Id="file0033" Name="LIC_3RDP.TXT" LongName="Licenses_for_Third-Party_Components.txt" Source="..\Licenses_for_Third-Party_Components.txt" />
41+
</Component>
42+
43+
<!-- *****************************************************************************************
44+
include directory
45+
-->
46+
47+
<Directory Id="include" Name="include">
48+
<Component Id="IncludeFiles" Guid="dfc7126d-b5b0-4ffb-b509-749523297faa" DiskId="1">
49+
<File Id="file0021" Name="mydrv.h" LongName="mysql_driver.h" Source="..\driver\mysql_driver.h" />
50+
<File Id="file0022" Name="myconn.h" LongName="mysql_connection.h" Source="..\driver\mysql_connection.h" />
51+
<File Id="file0023" Name="myerror.h" LongName="mysql_error.h" Source="..\driver\mysql_error.h" />
52+
</Component>
53+
54+
<Directory Id="cppconn" Name="cppconn">
55+
<Component Id="CppconnIncludes" Guid="3b8df956-dc82-48ac-8101-0784368dcd83" DiskId="1">
56+
<File Id="file0001" Name="connect~.h" LongName="connection.h" Source="..\cppconn\connection.h" />
57+
<File Id="file0002" Name="datatype.h" Source="..\cppconn\datatype.h" />
58+
<File Id="file0003" Name="driver.h" Source="..\cppconn\driver.h" />
59+
<File Id="file0004" Name="excepti~.h" LongName="exception.h" Source="..\cppconn\exception.h" />
60+
<File Id="file0005" Name="metadata.h" Source="..\cppconn\metadata.h" />
61+
<File Id="file0006" Name="paramet~.h" LongName="parameter_metadata.h" Source="..\cppconn\parameter_metadata.h" />
62+
<File Id="file0007" Name="prepare~.h" LongName="prepared_statement.h" Source="..\cppconn\prepared_statement.h" />
63+
<File Id="file0008" Name="results.h" LongName="resultset.h" Source="..\cppconn\resultset.h" />
64+
<File Id="file0009" Name="resultme.h" LongName="resultset_metadata.h" Source="..\cppconn\resultset_metadata.h" />
65+
<File Id="file0010" Name="statem~.h" LongName="statement.h" Source="..\cppconn\statement.h" />
66+
<File Id="file0012" Name="warning.h" Source="..\cppconn\warning.h" />
67+
<File Id="file0013" Name="config.h" Source="..\cppconn\config.h" />
68+
<File Id="file0014" Name="build_c~.h" LongName="build_config.h" Source="..\cppconn\build_config.h" />
69+
<File Id="file0015" Name="sqlstri~.h" LongName="sqlstring.h" Source="..\cppconn\sqlstring.h" />
70+
71+
</Component>
72+
</Directory>
73+
74+
</Directory>
75+
<!-- *****************************************************************************************
76+
lib directory
77+
-->
78+
<Directory Id="lib" Name="lib">
79+
<Directory Id="debug" Name="debug">
80+
<Component Id="ClientLibraryDebug" Guid="9cdd3e41-c4fb-4a47-88a2-6f0c82a4834d" DiskId="1">
81+
<File Id="file0100" Name="mycppcon.dll" LongName="mysqlcppconn.dll" Source="..\driver\debug\mysqlcppconn.dll" />
82+
<File Id="file0101" Name="mycppcon.lib" LongName="mysqlcppconn.lib" Source="..\driver\debug\mysqlcppconn.lib" />
83+
<File Id="file0102" Name="mycppcon.pdb" LongName="mysqlcppconn.pdb" Source="..\driver\debug\mysqlcppconn.pdb" />
84+
<File Id="file0103" Name="mycpstat.lib" LongName="mysqlcppconn-static.lib" Source="..\driver\debug\mysqlcppconn-static.lib" />
85+
<File Id="file0104" Name="mycpstat.pdb" LongName="mysqlcppconn-static.pdb" Source="..\driver\debug\mysqlcppconn-static.pdb" />
86+
</Component>
87+
</Directory>
88+
<Directory Id="opt" Name="opt">
89+
<Component Id="ClientLibraryRelease" Guid="00328709-7f5e-4a3c-a189-e79f92243377" DiskId="1">
90+
<File Id="file0150" Name="mycppcon.dll" LongName="mysqlcppconn.dll" Source="..\driver\relwithdebinfo\mysqlcppconn.dll" />
91+
<File Id="file0151" Name="mycppcon.lib" LongName="mysqlcppconn.lib" Source="..\driver\relwithdebinfo\mysqlcppconn.lib" />
92+
<File Id="file0152" Name="mycpstat.lib" LongName="mysqlcppconn-static.lib" Source="..\driver\relwithdebinfo\mysqlcppconn-static.lib" />
93+
</Component>
94+
<Component Id="MSRedistributables" Guid="e50ed3bb-e5bd-42b5-9029-9ca2356fd0f3" DiskId="1">
95+
@REQUIRED_REDISTRIBUTABLE_LIBS@
96+
</Component>
97+
</Directory>
98+
</Directory>
99+
100+
</Directory>
101+
</Directory>
102+
</Directory>
103+
</Directory>
104+
</Directory>
105+
106+
<Feature Id="Complete" Title="MySQL Connector C++" Description="The MySQL Connector C++ client library." Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR">
107+
<Feature Id="ConnectorCPP" Title="Library" Description="The release library and headers." Level="1" Display="expand">
108+
<ComponentRef Id="AdditionalFiles" />
109+
<ComponentRef Id="IncludeFiles" />
110+
<ComponentRef Id="CppconnIncludes" />
111+
<ComponentRef Id="ClientLibraryRelease" />
112+
<ComponentRef Id="MSRedistributables" />
113+
114+
<Feature Id="DebugLibraries" Title="Debug Libary" Description="Debug library and symbols." Level="1000">
115+
<ComponentRef Id="ClientLibraryDebug" />
116+
</Feature>
117+
</Feature>
118+
</Feature>
119+
120+
<UIRef Id="MySQL_Connector_UI" />
121+
<UIRef Id="WixUI_ErrorProgressText" />
122+
</Product>
123+
</Wix>
124+
125+

0 commit comments

Comments
 (0)