mirror of
https://github.com/pocoproject/poco.git
synced 2025-05-28 23:24:09 +02:00
Move include to runtime. Add PostgreSQL includes
This commit is contained in:
Francis ANDRE
parent
90de6442c1
commit
d41db39da1
@ -30,15 +30,12 @@
|
||||
<Package Description="Poco $(var.Platform) Installer for $(var.Platform)" Comments="Poco is a registered trademark of $(var.ProductAuthor)" InstallerVersion="300" Compressed="yes" Manufacturer="$(var.ProductAuthor)" Platform="$(var.Platform)" />
|
||||
<Media Id="1" Cabinet="simple.cab" EmbedCab="yes" />
|
||||
<MajorUpgrade AllowDowngrades="no" Schedule="afterInstallFinalize" MigrateFeatures="yes" DowngradeErrorMessage="A later or current version of [ProductName] is already installed. To install this version, uninstall the installed version first." />
|
||||
|
||||
<!-- Property gets value from registry to set up installation folder for upgrades -->
|
||||
<Property Id="APPLICATIONFOLDER" Secure="yes">
|
||||
<RegistrySearch Id="AppFolderRegistrySearch" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[WIX_UPGRADE_DETECTED]" Name="$(var.ProductAppFolder)" Win64="$(var.Win64)" />
|
||||
</Property>
|
||||
|
||||
<!-- Define destination folder (name of app folder only) -->
|
||||
<Property Id="ApplicationFolderName" Value="$(var.ProductName)" />
|
||||
|
||||
<!-- Default to per-machine installation -->
|
||||
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
|
||||
<!--
|
||||
@ -69,7 +66,6 @@
|
||||
<InstallExecuteSequence>
|
||||
<!-- Corrects WixUI_Advanced bug (http://bit.ly/hrbM7Y) -->
|
||||
<Custom Action="OverwriteWixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" />
|
||||
|
||||
<!-- Do not delete Windows service configuration on upgrade -->
|
||||
<DeleteServices>NOT UPGRADINGPRODUCTCODE</DeleteServices>
|
||||
</InstallExecuteSequence>
|
||||
@ -1358,6 +1354,21 @@
|
||||
<File Id="UTILITY.H_3" Name="Utility.h" Source="$(var.POCO)\Data\SQLite\include\Poco\Data\SQLite\Utility.h" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="POSTGRESQL" Name="PostgreSQL">
|
||||
<Component Win64="$(var.Win64)" Id="Poco.Data.PostgreSQL.inc" DiskId="1" Guid="F1DE7C5E-6E7E-46F9-8C48-91DEA02AA413">
|
||||
<File Id="BINDER.H_3" Name="Binder.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\Binder.h" />
|
||||
<File Id="CONNECTOR.H_4" Name="Connector.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\Connector.h" />
|
||||
<File Id="EXTRACTOR.H_3" Name="Extractor.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\Extractor.h" />
|
||||
<File Id="POSTGRESQL.H" Name="PostgreSQL.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\PostgreSQL.h" />
|
||||
<File Id="POSTGRESQLEXCEPTION.H" Name="PostgreSQLException.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\PostgreSQLException.h" />
|
||||
<File Id="POSTGRESQLSTATEMENTIMPL.H" Name="PostgreSQLStatementImpl.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\PostgreSQLStatementImpl.h" />
|
||||
<File Id="POSTGRESQLTYPES.H" Name="PostgreSQLTypes.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\PostgreSQLTypes.h" />
|
||||
<File Id="SESSIONHANDLE.H_1" Name="SessionHandle.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\SessionHandle.h" />
|
||||
<File Id="SESSIONIMPL.H_4" Name="SessionImpl.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\SessionImpl.h" />
|
||||
<File Id="STATEMENTEXECUTOR.H_1" Name="StatementExecutor.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\StatementExecutor.h" />
|
||||
<File Id="UTILITY.H_4" Name="Utility.h" Source="$(var.POCO)\Data\PostgreSQL\include\Poco\Data\PostgreSQL\Utility.h" />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="JSON" Name="JSON">
|
||||
<Component Win64="$(var.Win64)" Id="Poco.JSON.inc" DiskId="1" Guid="5E06611F-78EE-4E5C-8F73-5E1CB5AAB8D4">
|
||||
@ -3118,6 +3129,27 @@
|
||||
</ComponentGroup>
|
||||
<Feature Id="Poco" Title="Poco" Level="1" Description="POCO C++ Libraries - Cross-platform C++ libraries with a network/internet focus" TypicalDefault="install" Display="expand">
|
||||
<Feature Id="Runtime" Level="1" Title="Runtime" TypicalDefault="install" Description="Runtime" Display="expand">
|
||||
<Feature Id="Includes" Level="1" Description="Includes" Title="Includes" InstallDefault="followParent">
|
||||
<ComponentRef Id="Poco.inc" />
|
||||
<ComponentRef Id="Poco.Dynamic.inc" />
|
||||
<ComponentRef Id="Poco.Crypto.inc" />
|
||||
<ComponentRef Id="Poco.Data.inc" />
|
||||
<ComponentRef Id="Poco.Data.MySQL.inc" />
|
||||
<ComponentRef Id="Poco.Data.ODBC.inc" />
|
||||
<ComponentRef Id="Poco.Data.SQLite.inc" />
|
||||
<ComponentRef Id="Poco.Data.PostgreSQL.inc" />
|
||||
<ComponentRef Id="Poco.JSON.inc" />
|
||||
<ComponentRef Id="Poco.MongoDB.inc" />
|
||||
<ComponentRef Id="Poco.Net.inc" />
|
||||
<ComponentRef Id="Poco.NetSSL_OpenSSL.inc" />
|
||||
<ComponentRef Id="Poco.PDF.inc" />
|
||||
<ComponentRef Id="Poco.SevenZip.inc" />
|
||||
<ComponentRef Id="Poco.UTIL.inc" />
|
||||
<ComponentRef Id="Poco.DOM.inc" />
|
||||
<ComponentRef Id="Poco.SAX.inc" />
|
||||
<ComponentRef Id="Poco.XML.inc" />
|
||||
<ComponentRef Id="Poco.ZIP.inc" />
|
||||
</Feature>
|
||||
<Feature Id="SharedRelease" Level="1" Description="As shared libraries" TypicalDefault="install" Title="SharedRelease">
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<ComponentRef Id="PocoCppUnit64.shared.release" />
|
||||
@ -3233,26 +3265,6 @@
|
||||
<ComponentRef Id="Registry" />
|
||||
</Feature>
|
||||
<Feature Id="Development" Level="1" Title="Development" Description="Development files" TypicalDefault="advertise" Display="expand">
|
||||
<Feature Id="Includes" Level="1" Description="Includes" Title="Includes" InstallDefault="followParent">
|
||||
<ComponentRef Id="Poco.inc" />
|
||||
<ComponentRef Id="Poco.Dynamic.inc" />
|
||||
<ComponentRef Id="Poco.Crypto.inc" />
|
||||
<ComponentRef Id="Poco.Data.inc" />
|
||||
<ComponentRef Id="Poco.Data.MySQL.inc" />
|
||||
<ComponentRef Id="Poco.Data.ODBC.inc" />
|
||||
<ComponentRef Id="Poco.Data.SQLite.inc" />
|
||||
<ComponentRef Id="Poco.JSON.inc" />
|
||||
<ComponentRef Id="Poco.MongoDB.inc" />
|
||||
<ComponentRef Id="Poco.Net.inc" />
|
||||
<ComponentRef Id="Poco.NetSSL_OpenSSL.inc" />
|
||||
<ComponentRef Id="Poco.PDF.inc" />
|
||||
<ComponentRef Id="Poco.SevenZip.inc" />
|
||||
<ComponentRef Id="Poco.UTIL.inc" />
|
||||
<ComponentRef Id="Poco.DOM.inc" />
|
||||
<ComponentRef Id="Poco.SAX.inc" />
|
||||
<ComponentRef Id="Poco.XML.inc" />
|
||||
<ComponentRef Id="Poco.ZIP.inc" />
|
||||
</Feature>
|
||||
<Feature Id="SharedDebug" Description="As shared libraries" Level="1" Title="SharedDebug" InstallDefault="followParent">
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<ComponentRef Id="PocoCppUnit64.shared.debug" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user