Merge pull request #11 from pashagolub/9-cpp-personality-10.3

[-] fix component installation for C++ Builder 10.3, fixes #9
pashagolub · Oct 11, 2023 · 5d25ea3 · 5d25ea3
2 parents b0a464b + dc0f675
commit 5d25ea3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/Packages/PostgresDAC28.dproj b/Packages/PostgresDAC28.dproj
@@ -37,14 +37,15 @@
         <DCC_ImageBase>00400000</DCC_ImageBase>
         <GenDll>true</GenDll>
         <GenPackage>true</GenPackage>
+        <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <SanitizedProjectName>PostgresDAC28</SanitizedProjectName>
         <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
@@ -70,20 +71,20 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="dsnap.dcp"/>
         <DCCReference Include="dbrtl.dcp"/>
-        <DCCReference Include="PSQLTypes.pas"/>
-        <DCCReference Include="PSQLAccess.pas"/>
-        <DCCReference Include="PSQLDbTables.pas"/>
-        <DCCReference Include="PSQLBatch.pas"/>
-        <DCCReference Include="PSQLMacroQuery.pas"/>
-        <DCCReference Include="PSQLMonitor.pas"/>
-        <DCCReference Include="PSQLTools.pas"/>
-        <DCCReference Include="PSQLDump.pas"/>
-        <DCCReference Include="PSQLCopy.pas"/>
-        <DCCReference Include="PSQLDirectQuery.pas"/>
-        <DCCReference Include="PSQLExtMask.pas"/>
-        <DCCReference Include="PSQLFields.pas"/>
-        <DCCReference Include="PSQLNotify.pas"/>
-        <DCCReference Include="PSQLGeomTypes.pas"/>
+        <DCCReference Include="..\Source\PSQLTypes.pas"/>
+        <DCCReference Include="..\Source\PSQLAccess.pas"/>
+        <DCCReference Include="..\Source\PSQLDbTables.pas"/>
+        <DCCReference Include="..\Source\PSQLBatch.pas"/>
+        <DCCReference Include="..\Source\PSQLMacroQuery.pas"/>
+        <DCCReference Include="..\Source\PSQLMonitor.pas"/>
+        <DCCReference Include="..\Source\PSQLTools.pas"/>
+        <DCCReference Include="..\Source\PSQLDump.pas"/>
+        <DCCReference Include="..\Source\PSQLCopy.pas"/>
+        <DCCReference Include="..\Source\PSQLDirectQuery.pas"/>
+        <DCCReference Include="..\Source\PSQLExtMask.pas"/>
+        <DCCReference Include="..\Source\PSQLFields.pas"/>
+        <DCCReference Include="..\Source\PSQLNotify.pas"/>
+        <DCCReference Include="..\Source\PSQLGeomTypes.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

diff --git a/Packages/dclPostgresDAC28.dproj b/Packages/dclPostgresDAC28.dproj
@@ -37,6 +37,7 @@
         <DCC_ImageBase>00400000</DCC_ImageBase>
         <GenDll>true</GenDll>
         <GenPackage>true</GenPackage>
+        <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <SanitizedProjectName>dclPostgresDAC28</SanitizedProjectName>
         <DCC_Description>PostgreSQL Direct Access Components</DCC_Description>
         <DesignOnlyPackage>true</DesignOnlyPackage>
@@ -71,24 +72,24 @@
         </DelphiCompile>
         <DCCReference Include="dcldb.dcp"/>
         <DCCReference Include="PostgresDAC28.dcp"/>
-        <DCCReference Include="PSQLupdsqled.pas">
+        <DCCReference Include="..\Source\PSQLupdsqled.pas">
             <Form>PSQLUpdateSQLEditForm</Form>
         </DCCReference>
-        <DCCReference Include="PSQLCOMP.pas"/>
-        <DCCReference Include="PSQLConnFrm.pas">
+        <DCCReference Include="..\Source\PSQLCOMP.pas"/>
+        <DCCReference Include="..\Source\PSQLConnFrm.pas">
             <Form>PSQLConnForm</Form>
         </DCCReference>
-        <DCCReference Include="PSQLfldlinks.pas">
+        <DCCReference Include="..\Source\PSQLfldlinks.pas">
             <Form>PSQLLinkFields</Form>
         </DCCReference>
-        <DCCReference Include="PSQLMigrator.pas"/>
-        <DCCReference Include="PSQLStoredProcFrm.pas">
+        <DCCReference Include="..\Source\PSQLMigrator.pas"/>
+        <DCCReference Include="..\Source\PSQLStoredProcFrm.pas">
             <Form>PSQLStoredProcProp</Form>
         </DCCReference>
-        <DCCReference Include="PSQLQueryEdit.pas">
+        <DCCReference Include="..\Source\PSQLQueryEdit.pas">
             <Form>SQLEditForm</Form>
         </DCCReference>
-        <DCCReference Include="psqlAboutFrm.pas">
+        <DCCReference Include="..\Source\psqlAboutFrm.pas">
             <Form>PSQLAboutComp</Form>
         </DCCReference>
         <BuildConfiguration Include="Base">