transactd 1.2.0 → 2.0.0

data/build/tdclcpp/{tdclcpp_bcb_64.cbproj → tdclcpp_bc.cbproj}

@@ -1,17 +1,34 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{38F6FDD0-00C4-4679-8F36-BE1499F35256}</ProjectGuid>
-        <ProjectVersion>14.4</ProjectVersion>
+        <ProjectVersion>15.4</ProjectVersion>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Release Unicode</Config>
         <AppType>Library</AppType>
         <FrameworkType>None</FrameworkType>
+        <TargetedPlatforms>3</TargetedPlatforms>
         <Platform Condition="'$(Platform)'==''">Win64</Platform>
-        <TargetedPlatforms>1</TargetedPlatforms>
+        <BCVER Condition="'$(ProductVersion)'&gt;='8.0' and '$(ProductVersion)' &lt; '9.0'">150</BCVER>
+        <BCVER Condition="'$(ProductVersion)'&gt;='9.0' and '$(ProductVersion)' &lt; '10.0'">160</BCVER>
+        <BCVER Condition="'$(ProductVersion)'&gt;='10.0' and '$(ProductVersion)' &lt; '11.0'">170</BCVER>
+        <BCVER Condition="'$(ProductVersion)'&gt;='11.0' and '$(ProductVersion)' &lt; '12.0'">180</BCVER>
+        <BCVER Condition="'$(ProductVersion)'&gt;='12.0' and '$(ProductVersion)' &lt; '13.0'">190</BCVER>
+        <BCVER Condition="'$(ProductVersion)'&gt;='14.0' and '$(ProductVersion)' &lt; '15.0'">200</BCVER>
+        <BCVER Condition="'$(ProductVersion)'&gt;='15.0' and '$(ProductVersion)' &lt; '16.0'">210</BCVER>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Base)'=='true') or '$(Base_OSX32)'!=''">
+        <Base_OSX32>true</Base_OSX32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
         <Base_Win64>true</Base_Win64>
         <CfgParent>Base</CfgParent>
@@ -22,6 +39,12 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
         <Cfg_1_Win64>true</Cfg_1_Win64>
         <CfgParent>Cfg_1</CfgParent>
@@ -33,6 +56,18 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX32)'!=''">
+        <Cfg_2_OSX32>true</Cfg_2_OSX32>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+        <Cfg_2_Win32>true</Cfg_2_Win32>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
         <Cfg_2_Win64>true</Cfg_2_Win64>
         <CfgParent>Cfg_2</CfgParent>
@@ -44,6 +79,18 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Cfg_3)'=='true') or '$(Cfg_3_OSX32)'!=''">
+        <Cfg_3_OSX32>true</Cfg_3_OSX32>
+        <CfgParent>Cfg_3</CfgParent>
+        <Cfg_3>true</Cfg_3>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_3)'=='true') or '$(Cfg_3_Win32)'!=''">
+        <Cfg_3_Win32>true</Cfg_3_Win32>
+        <CfgParent>Cfg_3</CfgParent>
+        <Cfg_3>true</Cfg_3>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_3)'=='true') or '$(Cfg_3_Win64)'!=''">
         <Cfg_3_Win64>true</Cfg_3_Win64>
         <CfgParent>Cfg_3</CfgParent>
@@ -55,6 +102,18 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Cfg_4)'=='true') or '$(Cfg_4_OSX32)'!=''">
+        <Cfg_4_OSX32>true</Cfg_4_OSX32>
+        <CfgParent>Cfg_4</CfgParent>
+        <Cfg_4>true</Cfg_4>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_4)'=='true') or '$(Cfg_4_Win32)'!=''">
+        <Cfg_4_Win32>true</Cfg_4_Win32>
+        <CfgParent>Cfg_4</CfgParent>
+        <Cfg_4>true</Cfg_4>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_4)'=='true') or '$(Cfg_4_Win64)'!=''">
         <Cfg_4_Win64>true</Cfg_4_Win64>
         <CfgParent>Cfg_4</CfgParent>
@@ -62,23 +121,26 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <ILINK_LibraryPath>..\..\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+        <SanitizedProjectName>tdclcpp_bc</SanitizedProjectName>
+        <Manifest_File>None</Manifest_File>
+        <Defines>LIB_TDCLCPP;BOOST_ALL_NO_LIB;$(Defines)</Defines>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_DLL>true</VerInfo_DLL>
+        <BRCC_EnableMultiByte>true</BRCC_EnableMultiByte>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <BRCC_EnableMultiByte>true</BRCC_EnableMultiByte>
-        <Defines>ARBTREGN_PKG;$(Defines)</Defines>
-        <IncludePath>..\..\source\;$(IncludePath)</IncludePath>
-        <Manifest_File>None</Manifest_File>
-        <ILINK_AdditionalOptions>/Gl</ILINK_AdditionalOptions>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <BCC_wiip>false</BCC_wiip>
-        <TD_VER_MAJOR>1</TD_VER_MAJOR>
-        <TD_VER_MINOR>1</TD_VER_MINOR>
-        <DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
+        <BCC_wpch>false</BCC_wpch>
+        <BCC_wpar>false</BCC_wpar>
         <Multithreaded>true</Multithreaded>
+        <ILINK_LibraryPath>..\..\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <ProjectType>CppDynamicLibrary</ProjectType>
         <NoVCL>true</NoVCL>
         <OutputExt>dll</OutputExt>
+        <IncludePath>..\..\source\;$(IncludePath)</IncludePath>
         <_TCHARMapping>char</_TCHARMapping>
         <BPILibOutputDir>..\..\lib\</BPILibOutputDir>
         <ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
@@ -87,70 +149,109 @@
         <UsePackages>false</UsePackages>
         <IntermediateOutputDir>.\$(Config)\$(Platform)</IntermediateOutputDir>
         <FinalOutputDir>..\..\bin\</FinalOutputDir>
-        <BCC_wpar>false</BCC_wpar>
         <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+        <TD_VER_MAJOR>2</TD_VER_MAJOR>
+        <TD_VER_MINOR>0</TD_VER_MINOR>
+        <DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
+        <TD_CPU>32</TD_CPU>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_OSX32)'!=''">
         <Icns_MainIcns>$(BDS)\bin\cbuilder_PROJECTICNS.icns</Icns_MainIcns>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <Manifest_File>None</Manifest_File>
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <TD_CPU>32</TD_CPU>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <BCC_UserSuppliedOptions>-tR</BCC_UserSuppliedOptions>
+        <DynamicRTL>true</DynamicRTL>
+        <UsePackages>true</UsePackages>
+        <TD_CPU>64</TD_CPU>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <Defines>_DEBUG;$(Defines)</Defines>
         <_TCHARMapping>char</_TCHARMapping>
         <BCC_wiip>false</BCC_wiip>
-        <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-        <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-        <DCC_Optimize>false</DCC_Optimize>
         <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
         <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
         <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
         <DCC_Define>DEBUG</DCC_Define>
         <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
         <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+        <DCC_Optimize>false</DCC_Optimize>
+        <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+        <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
         <BCC_StackFrames>true</BCC_StackFrames>
+        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
         <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
         <TASM_Debugging>Full</TASM_Debugging>
-        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
         <ILINK_LibraryPath>$(BDSLIB)\$(PLATFORM)\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+        <DllSuffix>$(BCVER)_$(TD_CPU)m_$(DllSuffix)</DllSuffix>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)mr_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-        <Defines>_DEBUG;$(Defines)</Defines>
-        <DllSuffix>m_$(DllSuffix)</DllSuffix>
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)mr_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <Defines>NDEBUG;$(Defines)</Defines>
+        <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+        <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+        <BCC_StackFrames>true</BCC_StackFrames>
+        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
         <_TCHARMapping>char</_TCHARMapping>
+        <DllSuffix>$(BCVER)_$(TD_CPU)m_$(DllSuffix)</DllSuffix>
         <TASM_Debugging>None</TASM_Debugging>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_OSX32)'!=''">
+        <Icns_MainIcns>$(BDS)\bin\cbuilder_PROJECTICNS.icns</Icns_MainIcns>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)mr_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <Defines>NDEBUG;$(Defines)</Defines>
-        <DllSuffix>m_$(DllSuffix)</DllSuffix>
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)mr_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_3)'!=''">
+        <Defines>_DEBUG;$(Defines)</Defines>
+        <BCC_SmartPCHCache>false</BCC_SmartPCHCache>
+        <BCC_MergeDuplicateStrings>true</BCC_MergeDuplicateStrings>
+        <BCC_MonitorThis>true</BCC_MonitorThis>
+        <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+        <BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+        <ILINK_Verbose>true</ILINK_Verbose>
+        <BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+        <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
         <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+        <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+        <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
         <_TCHARMapping>wchar_t</_TCHARMapping>
+        <DllSuffix>$(BCVER)_$(TD_CPU)u_$(DllSuffix)</DllSuffix>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_3_OSX32)'!=''">
+        <Icns_MainIcns>$(BDS)\bin\cbuilder_PROJECTICNS.icns</Icns_MainIcns>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_3_Win32)'!=''">
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)ur_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_3_Win64)'!=''">
-        <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-        <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-        <ILINK_Verbose>true</ILINK_Verbose>
-        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-        <DllSuffix>u_$(DllSuffix)</DllSuffix>
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)ur_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_4)'!=''">
+        <Defines>NDEBUG;$(Defines)</Defines>
         <_TCHARMapping>wchar_t</_TCHARMapping>
+        <DllSuffix>$(BCVER)_$(TD_CPU)u_$(DllSuffix)</DllSuffix>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_4_OSX32)'!=''">
+        <Icns_MainIcns>$(BDS)\bin\cbuilder_PROJECTICNS.icns</Icns_MainIcns>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_4_Win32)'!=''">
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)ur_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_4_Win64)'!=''">
-        <BRCC_EnableMultiByte>true</BRCC_EnableMultiByte>
-        <BCC_WindowsVersionDefines>NTDDI_VERSION=NTDDI_WINXPSP1;_WIN32_WINNT=_WIN32_WINNT_WINXP</BCC_WindowsVersionDefines>
-        <BCC_OptimizeForSize>true</BCC_OptimizeForSize>
-        <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-        <DllSuffix>u_$(DllSuffix)</DllSuffix>
+        <DllSuffix Condition="'$(UsePackages)'=='true' or '$(DynamicRTL)'=='true' ">$(BCVER)_$(TD_CPU)ur_$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
     </PropertyGroup>
     <ItemGroup>
         <ResourceCompile Include="tdclcpp.rc">
@@ -160,6 +261,9 @@
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\btrDate.cpp">
             <BuildOrder>0</BuildOrder>
         </CppCompile>
+        <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\activeTable.cpp">
+            <BuildOrder>22</BuildOrder>
+        </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\database.cpp">
             <BuildOrder>3</BuildOrder>
         </CppCompile>
@@ -172,21 +276,36 @@
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\errorMessage.cpp">
             <BuildOrder>19</BuildOrder>
         </CppCompile>
+        <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\field.cpp">
+            <BuildOrder>20</BuildOrder>
+        </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\fieldDDF.cpp">
             <BuildOrder>7</BuildOrder>
         </CppCompile>
+        <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\fieldNameAlias.cpp">
+            <BuildOrder>25</BuildOrder>
+        </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\fileDDF.cpp">
             <BuildOrder>8</BuildOrder>
         </CppCompile>
+        <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\groupQuery.cpp">
+            <BuildOrder>24</BuildOrder>
+        </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\indexDDF.cpp">
             <BuildOrder>10</BuildOrder>
         </CppCompile>
+        <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\memRecord.cpp">
+            <BuildOrder>22</BuildOrder>
+        </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\nsDatabase.cpp">
             <BuildOrder>11</BuildOrder>
         </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\nsTable.cpp">
             <BuildOrder>12</BuildOrder>
         </CppCompile>
+        <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\recordset.cpp">
+            <BuildOrder>25</BuildOrder>
+        </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\sharedData.cpp">
             <BuildOrder>13</BuildOrder>
         </CppCompile>
@@ -245,40 +364,45 @@
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
                     <VersionInfo Name="AutoIncBuild">False</VersionInfo>
                     <VersionInfo Name="MajorVer">1</VersionInfo>
-                    <VersionInfo Name="MinorVer">0</VersionInfo>
+                    <VersionInfo Name="MinorVer">1</VersionInfo>
                     <VersionInfo Name="Release">0</VersionInfo>
                     <VersionInfo Name="Build">0</VersionInfo>
                     <VersionInfo Name="Debug">False</VersionInfo>
                     <VersionInfo Name="PreRelease">False</VersionInfo>
                     <VersionInfo Name="Special">False</VersionInfo>
                     <VersionInfo Name="Private">False</VersionInfo>
-                    <VersionInfo Name="DLL">False</VersionInfo>
-                    <VersionInfo Name="Locale">1041</VersionInfo>
-                    <VersionInfo Name="CodePage">932</VersionInfo>
+                    <VersionInfo Name="DLL">True</VersionInfo>
+                    <VersionInfo Name="Locale">1033</VersionInfo>
+                    <VersionInfo Name="CodePage">1252</VersionInfo>
                 </VersionInfo>
                 <VersionInfoKeys>
-                    <VersionInfoKeys Name="CompanyName"/>
+                    <VersionInfoKeys Name="CompanyName">BizStation Corp</VersionInfoKeys>
                     <VersionInfoKeys Name="FileDescription"/>
-                    <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="FileVersion">1.1.0.0</VersionInfoKeys>
                     <VersionInfoKeys Name="InternalName"/>
-                    <VersionInfoKeys Name="LegalCopyright"/>
+                    <VersionInfoKeys Name="LegalCopyright">Copyright(C) 2013 BizStation Corp</VersionInfoKeys>
                     <VersionInfoKeys Name="LegalTrademarks"/>
                     <VersionInfoKeys Name="OriginalFilename"/>
-                    <VersionInfoKeys Name="ProductName"/>
-                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="ProductName">Transactd Client</VersionInfoKeys>
+                    <VersionInfoKeys Name="ProductVersion">1.1.0.0</VersionInfoKeys>
                     <VersionInfoKeys Name="Comments"/>
                 </VersionInfoKeys>
                 <ProjectProperties>
                     <ProjectProperties Name="AutoShowDeps">False</ProjectProperties>
                     <ProjectProperties Name="ManagePaths">False</ProjectProperties>
                     <ProjectProperties Name="VerifyPackages">True</ProjectProperties>
+                    <ProjectProperties Name="IndexFiles">False</ProjectProperties>
                 </ProjectProperties>
+                <Parameters>
+                    <Parameters Name="HostApplication">..\..\bin\test_tdclcpp_bc_32.exe</Parameters>
+                    <Parameters Name="RunParams">--report_level=detailed --show_progress=yes --build_info=yes</Parameters>
+                </Parameters>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k170.bpl">Embarcadero C++Builder Office 2000 サーバー パッケージ</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp170.bpl">Embarcadero C++Builder Office XP サーバー パッケージ</Excluded_Packages>
                 </Excluded_Packages>
             </CPlusPlusBuilder.Personality>
             <Platforms>
+                <Platform value="OSX32">False</Platform>
+                <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>
         </BorlandProject>

data/build/tdclrb/CMakeLists.txt

@@ -28,7 +28,6 @@ include(../common/system.cmake)
 include(../common/get_boost_libs.cmake)
 include(../common/get_ruby_path.cmake)
 include(../common/smart_install.cmake)
-include(./gem_output.cmake)
 
 
 set(this_target tdclrb)
@@ -71,27 +70,9 @@ endif()
 # ==========================================================
 # version info
 # ==========================================================
-transactd_read_variables("${TRANSACTD_ROOT}/build/tdclrb/GEM_VERSION")
-foreach(vername MAJOR MINOR RELEASE)
-  if("${TDREAD_TDVER_RUBYGEM_VER_${vername}}" STREQUAL "")
-    message(SEND_ERROR "Can not read TDVER_RUBYGEM_${vername}")
-  endif()
-  set(TDVER_RUBYGEM_${vername} "${TDREAD_TDVER_RUBYGEM_VER_${vername}}")
-endforeach()
+transactd_read_version("${TRANSACTD_ROOT}")
 transactd_read_build_number("${TRANSACTD_ROOT}")
-set(TDVER_RUBYGEM_BUILD "${TRANSACTD_BUILD_NUMBER}")
-
-
-# ==========================================================
-# add tdclc/tdclcppm if need
-# ==========================================================
-if((NOT TARGET tdclc) AND (NOT MINGW))
-  subdirs("../tdclc")
-endif()
-if(NOT TARGET tdclcppm)
-  set(TDCL_CPP_CHARSET "m")
-  subdirs("../tdclcppm")
-endif()
+set(TDVER_RUBY_BUILD "${TRANSACTD_BUILD_NUMBER}")
 
 
 # ==========================================================
@@ -121,9 +102,14 @@ add_custom_command (
 # ==========================================================
 # add swig wrapper source file
 # ==========================================================
+if(WIN32 AND (NOT MSVC))
+  # Add source files of C++ client to contain it inside.
+  tdcl_add_source_files("${TRANSACTD_ROOT}")
+endif()
 set(${this_target}_SOURCE_FILES
   ${${this_target}_SOURCE_FILES}
   ${RUBY_SWIG_WRAPPER_CPP}
+  ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/connectionPool.cpp
   ${TRANSACTD_ROOT}/source/bzs/rtl/benchmark.cpp
 )
 
@@ -135,30 +121,19 @@ tdcl_add_include_directory("${TRANSACTD_ROOT}")
 include_directories(${TRANSACTD_ROOT};${TRANSACTD_RUBY_INCLUDE_PATH})
 
 
-# ==========================================================
-# add compiler / linker options
-# ==========================================================
-tdcl_add_compiler_options()
-foreach(build_type "" "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
-  bz_add_cxx_flag("-DSWIGRUBY" "${build_type}")
-  if(MSVC)
-    bz_set_MBCS_cxx_flag("${build_type}")
-  endif()
-endforeach()
-
-
 # ==========================================================
 # add resource file (for Windows Visual Studio)
 # ==========================================================
 if(WIN32)
-  set(${this_target}_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/${this_target}.rc")
+  transactd_ver_info_lic()
+  set(${this_target}_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/tdclrb.rc")
   transactd_generate_rc_file(
     TRANSACTD_ROOT "${TRANSACTD_ROOT}"
     OUTFILE "${${this_target}_RC_FILE}"
-    F_VER   "${TDVER_RUBYGEM_MAJOR}.${TDVER_RUBYGEM_MINOR}.${TDVER_RUBYGEM_RELEASE}.${TDVER_RUBYGEM_BUILD}"
-    P_VER   "${TDVER_RUBYGEM_MAJOR}.${TDVER_RUBYGEM_MINOR}.${TDVER_RUBYGEM_RELEASE}.${TDVER_RUBYGEM_BUILD}"
-    P_NAME  "Transactd Ruby Client"
-    F_DESC  "Transactd Ruby Client module"
+    F_VER   "${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_CPP_INTERFACE_VER_RELEASE}.${TDVER_RUBY_BUILD}"
+    P_VER   "${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_CPP_INTERFACE_VER_RELEASE}.${TDVER_RUBY_BUILD}"
+    P_NAME  "Transactd Client ${TRANSACTD_VER_POSTFIX}"
+    F_DESC  "Transactd Ruby client"
   )
   transactd_add_rc_file()
 endif()
@@ -167,23 +142,59 @@ endif()
 # ==========================================================
 # add_library
 # ==========================================================
-if(APPLE)
-  add_library(${this_target} MODULE ${${this_target}_SOURCE_FILES})
-  set_target_properties(${this_target} PROPERTIES LINK_FLAGS "-flat_namespace")
+add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
+
+
+# ==========================================================
+# Add compile options
+# ==========================================================
+transactd_set_MTMD("MD")
+
+
+# ==========================================================
+# Add compile definitions
+# ==========================================================
+set_property(TARGET ${this_target} PROPERTY COMPILE_DEFINITIONS
+  SWIGRUBY SWIG_BUILDING USE_DBM_CONNECTION_POOL BOOST_ALL_NO_LIB _MBCS)
+if(TRANSACTD_HAVE_RB_THREAD_BLOCKING_REGION)
+  set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+    HAVE_RB_THREAD_BLOCKING_REGION)
+endif()
+if(TRANSACTD_HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+  set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+    HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+endif()
+if(MSVC)
+  set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+    WIN32 _WIN32 _WINDOWS _USRDLL BOOST_ALL_NO_LIB 
+    LIB_TDCLCPP TRDCL_AUTOLINK_OFF TRDCLENGN_EXPORTS _CRT_SECURE_NO_WARNINGS)
 else()
-  add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
+  set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+    PIC BOOST_ALL_NO_LIB)
+  if(NOT MINGW)
+    set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+      LINUX)
+  else()
+    set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+      WIN32 _WIN32 _SYS_TIME_H_ _GETTIMEOFDAY_DEFINED)
+  endif()
 endif()
 
+
 # ==========================================================
 # add link / include
 # ==========================================================
-if(MINGW)
+target_link_libraries(${this_target} "${TRANSACTD_RUBY_LIBRARY_PATH}")
+if(WIN32 AND (NOT MSVC))
   transactd_link_boost_libraries("timer;filesystem;thread;chrono;system")
 else()
   transactd_link_boost_libraries("timer")
+  if(MSVC)
+    target_link_libraries(${this_target} "tdclcppmr")
+  else()
+    target_link_libraries(${this_target} "tdclcppm")
+  endif()
 endif()
-target_link_libraries(${this_target} "tdclcpp${TDCL_CPP_CHARSET}")
-target_link_libraries(${this_target} ${TRANSACTD_RUBY_LIBRARY_PATH})
 
 
 # ==========================================================
@@ -196,16 +207,31 @@ if(APPLE)
 else()
   set_target_properties(${this_target} PROPERTIES SUFFIX ".so")
 endif()
-if(UNIX AND NOT APPLE)
+if(UNIX)
   set_target_properties(${this_target} PROPERTIES
-    SOVERSION ${TDVER_RUBYGEM_MAJOR}.${TDVER_RUBYGEM_MINOR}
-    VERSION ${TDVER_RUBYGEM_MAJOR}.${TDVER_RUBYGEM_MINOR}.${TDVER_RUBYGEM_RELEASE})
+    SOVERSION ${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}
+    VERSION ${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_CPP_INTERFACE_VER_RELEASE})
 endif()
 
 
 # ==========================================================
-# find .dll if MINGW
+# find .dll to install (prebuilt tdclc_*.dll and MinGW runtime)
 # ==========================================================
+# find tdclc_*.dll
+if(WIN32)
+  bz_get_compiler_bitness()
+  file(GLOB tmp_paths "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common/tdclc_${BZ_BITNESS}*.dll")
+  if("${tmp_paths}" STREQUAL "")
+    set(TDCL_CLIB_PATH "")
+  else()
+    list(GET tmp_paths 0 TDCL_CLIB_PATH)
+  endif()
+  file(TO_CMAKE_PATH "${TDCL_CLIB_PATH}" TDCL_CLIB_PATH)
+  message(STATUS "tdclc_${BZ_BITNESS}*.dll   : ${TDCL_CLIB_PATH}")
+else()
+  set(TDCL_CLIB_PATH "")
+endif()
+# find MinGW runtime
 if(MINGW AND WIN32)
   get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
   # find libgcc_*.dll
@@ -222,22 +248,12 @@ if(MINGW AND WIN32)
   else()
     list(GET tmp_paths 0 MINGW_LIBSTDCPP_PATH)
   endif()
-  # find tdclc dll
-  bz_get_compiler_bitness()
-  file(GLOB tmp_paths "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common/tdclc_${BZ_BITNESS}*.dll")
-  if("${tmp_paths}" STREQUAL "")
-    set(TDCL_CLIB_PATH "")
-  else()
-    list(GET tmp_paths 0 TDCL_CLIB_PATH)
-  endif()
   message(STATUS "MinGW bin path  : ${MINGW_BIN_PATH}")
   message(STATUS "libgcc_*.dll    : ${MINGW_LIBGCC_PATH}")
   message(STATUS "libstdc++-*.dll : ${MINGW_LIBSTDCPP_PATH}")
-  message(STATUS "tdclc_${BZ_BITNESS}*.dll   : ${TDCL_CLIB_PATH}")
 else()
   set(MINGW_LIBGCC_PATH "")
   set(MINGW_LIBSTDCPP_PATH "")
-  set(TDCL_CLIB_PATH "")
 endif()
 
 
@@ -255,12 +271,14 @@ file(GLOB rb_files "${TRANSACTD_ROOT}/build/tdclrb/gem/*.rb")
 install(FILES ${rb_files} DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/lib/")
 file(GLOB rb_test_files "${TRANSACTD_ROOT}/source/bzs/test/tdclrb/*.rb")
 install(FILES ${rb_test_files} DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/test/")
-## install runtime and prebuilt tdclc_*.dll if mingw on win32
-if(MINGW AND WIN32)
-  # libgcc*.dll and libstdc++*.dll -> ruby\bin
-  get_filename_component(RUBY_BIN_PATH "${TRANSACTD_RUBY_EXECUTABLE_PATH}" PATH)
-  bz_smart_install(DEST "${RUBY_BIN_PATH}"
-    SOURCES "${MINGW_LIBGCC_PATH}" "${MINGW_LIBSTDCPP_PATH}")
+## install runtime and prebuilt tdclc_*.dll on win32
+if(WIN32)
+  if(MINGW)
+    # libgcc*.dll and libstdc++*.dll -> ruby\bin
+    get_filename_component(RUBY_BIN_PATH "${TRANSACTD_RUBY_EXECUTABLE_PATH}" PATH)
+    bz_smart_install(DEST "${RUBY_BIN_PATH}"
+      SOURCES "${MINGW_LIBGCC_PATH}" "${MINGW_LIBSTDCPP_PATH}")
+  endif()
   # tdclc_*.dll -> system dir
-  bz_smart_install(TO_WIN_SYSTEMDIR SOURCES "${TDCL_CLIB_PATH}")
+  bz_smart_install(SOURCES "${TDCL_CLIB_PATH}" TO_WIN_SYSTEMDIR)
 endif()