transactd 1.2.0 → 2.0.0

data/build/swig/validatablepointer.h

@@ -0,0 +1,91 @@
+#ifndef TRANSACTD_SWIG_VALIDATABLEPOINTER_H
+#define TRANSACTD_SWIG_VALIDATABLEPOINTER_H
+/* =================================================================
+ Copyright (C) 2000-2014 BizStation Corp All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
+#include <vector>
+#include <boost/thread/mutex.hpp>
+
+/* database::close() deletes table pointers, but does NOT delete
+   variables on target-languages (PHP, Ruby, etc).
+   
+   If the same address is allocated for a new table object by
+   database::openTable, then two variables on target-language will
+   hold the same table pointer (but the older one is invalid).
+   
+   When GC destroys the old variable, the new table object will be
+   deleted because old variable holds the pointer to it.
+   
+   To avoid this problem, global validatablePointerList holds list
+   of pointer and the availability, and delete only the old one.
+*/
+
+struct validatablePointer
+{
+    void* ptr;
+    bool  invalid;
+};
+
+class validatablePointerList
+{
+    boost::mutex m_mutex;
+    std::vector<validatablePointer> ptrs;
+    
+    int find(void* p)
+    {
+        for (size_t i = 0; i < ptrs.size(); ++i)
+        {
+            if (ptrs[i].ptr == p)
+                return (int)i;
+        }
+        return -1;
+    }
+    
+public:
+    void add(void* p)
+    {
+        boost::mutex::scoped_lock lck(m_mutex);
+        /* If there are some pointers which has same address with p,
+            set them as invalid. */
+        for (size_t i = 0; i < ptrs.size(); ++i)
+        {
+            if (ptrs[i].ptr == p)
+                ptrs[i].invalid = true;
+        }
+        validatablePointer v = {p, false};
+        ptrs.push_back(v);
+    }
+    
+    /*
+    @return true : a invalid pointer or no pointers has been removed.
+            false: a valid pointer has been removed.
+    */
+    bool remove(void* p) 
+    {
+        boost::mutex::scoped_lock lck(m_mutex);
+        int index = find(p);
+        bool ret = true;
+        if (index != -1)
+        {
+            ret = ptrs[index].invalid; 
+            ptrs.erase(ptrs.begin() + index);
+        }
+        return ret;
+    }
+};
+#endif //not TRANSACTD_SWIG_VALIDATABLEPOINTER_H

data/build/tdclc/CMakeLists.txt

@@ -25,6 +25,8 @@ include(../common/transactd_common.cmake)
 include(../common/options.cmake)
 include(../common/system.cmake)
 include(../common/get_boost_libs.cmake)
+include(../common/check_for_link_iconv.cmake)
+check_for_link_iconv()
 
 
 set(this_target tdclc)
@@ -84,42 +86,19 @@ if(UNIX)
 endif()
 
 
-# ==========================================================
-# compiler and linker options
-# ==========================================================
-foreach(build_type "" "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
-  bz_add_cxx_flag("-DBOOST_ALL_NO_LIB -DPIC" "${build_type}")
-  bz_remove_cxx_flag("-fno-exceptions" "${build_type}")
-  bz_remove_cxx_flag("-fno-rtti" "${build_type}")
-  bz_remove_cxx_flag("-fno-implicit-templates" "${build_type}")
-  bz_remove_cxx_flag("/EHsc" "${build_type}")
-  bz_remove_cxx_flag("/EHs" "${build_type}")
-  if(MSVC)
-    bz_add_cxx_flag("/EHa /wd4068 /D_WIN32_WINNT=0x0501 /DPACKAGE_NO_EXPORT" "${build_type}")
-    bz_set_MTMTd_cxx_flag("${build_type}")
-    bz_set_MBCS_cxx_flag("${build_type}")
-  else()
-    bz_add_cxx_flag("-fPIC -fabi-version=2 -fexceptions -fno-omit-frame-pointer" "${build_type}")
-    bz_add_cxx_flag("-fno-strict-aliasing -fpermissive -frtti" "${build_type}")
-    if(NOT MINGW)
-      bz_add_cxx_flag("-DLINUX" "${build_type}")
-    endif()
-  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}/tdclc.rc")
   transactd_generate_rc_file(
     TRANSACTD_ROOT "${TRANSACTD_ROOT}"
     OUTFILE "${${this_target}_RC_FILE}"
     F_VER   "${TDVER_C_INTERFACE_VER_MAJOR}.${TDVER_C_INTERFACE_VER_MINOR}.${TDVER_C_INTERFACE_VER_RELEASE}.${TRANSACTD_BUILD_NUMBER}"
     P_VER   "${TDVER_C_INTERFACE_VER_MAJOR}.${TDVER_C_INTERFACE_VER_MINOR}.${TDVER_C_INTERFACE_VER_RELEASE}.${TRANSACTD_BUILD_NUMBER}"
-    P_NAME  "Transactd C Client"
-    F_DESC  "Transactd C Client module"
+    P_NAME  "Transactd Client ${TRANSACTD_VER_POSTFIX}"
+    F_DESC  "Transactd C client"
   )
   transactd_add_rc_file()
 endif()
@@ -128,15 +107,41 @@ endif()
 # ==========================================================
 # add_library
 # ==========================================================
-add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
+if(APPLE)
+  add_library(${this_target} MODULE ${${this_target}_SOURCE_FILES})
+else()
+  add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
+endif()
+
+
+# ==========================================================
+# Add compile options
+# ==========================================================
+transactd_set_MTMD("MT")
+
+
+# ==========================================================
+# Add compile definitions
+# ==========================================================
+if(MSVC)
+  set_property(TARGET ${this_target} PROPERTY COMPILE_DEFINITIONS
+    WIN32 _WIN32 _WINDOWS _WIN32_WINNT=0x0501 PACKAGE_NO_EXPORT _USRDLL BOOST_ALL_NO_LIB _MBCS)
+else()
+  set_property(TARGET ${this_target} PROPERTY COMPILE_DEFINITIONS
+    PIC BOOST_ALL_NO_LIB _MBCS)
+  if(NOT MINGW)
+    set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+      LINUX)
+  endif()
+endif()
 
 
 # ==========================================================
 # add link / include
 # ==========================================================
 transactd_link_boost_libraries("filesystem;thread;chrono;system")
-if(APPLE)
-  target_link_libraries(${this_target} iconv)
+if(CAN_LINK_ICONV)
+  target_link_libraries(${this_target} "${ICONV_LIBRARY}")
 endif()
 if(NOT MSVC)
   target_link_libraries(${this_target} pthread)
@@ -157,10 +162,20 @@ else()
   ## Linux libtdclc_[32|64].so.[MAJOR].[MINOR]
   set_target_properties(${this_target} PROPERTIES PREFIX "lib")
   set_target_properties(${this_target} PROPERTIES OUTPUT_NAME "tdclc_${BZ_BITNESS}")
-  set_target_properties(${this_target} PROPERTIES SUFFIX ".so")
-  set_target_properties(${this_target} PROPERTIES
-    SOVERSION ${TDVER_C_INTERFACE_VER_MAJOR}.${TDVER_C_INTERFACE_VER_MINOR}
-    VERSION   ${TDVER_C_INTERFACE_VER_MAJOR}.${TDVER_C_INTERFACE_VER_MINOR}.${TDVER_C_INTERFACE_VER_RELEASE})
+  if(APPLE)
+    if(NOT COMMAND tdcl_set_outputnames_osx)
+      include(../common/transactd_cl_output.cmake)
+    endif()
+    tdcl_set_outputnames_osx(
+      "libtdclc_${BZ_BITNESS}" "${TDVER_C_INTERFACE_VER_MAJOR}"
+      "${TDVER_C_INTERFACE_VER_MINOR}" "${TDVER_C_INTERFACE_VER_RELEASE}"
+      "${TRANSACTD_ROOT}")
+  else()
+    set_target_properties(${this_target} PROPERTIES SUFFIX ".so")
+    set_target_properties(${this_target} PROPERTIES
+      SOVERSION ${TDVER_C_INTERFACE_VER_MAJOR}.${TDVER_C_INTERFACE_VER_MINOR}
+      VERSION   ${TDVER_C_INTERFACE_VER_MAJOR}.${TDVER_C_INTERFACE_VER_MINOR}.${TDVER_C_INTERFACE_VER_RELEASE})
+  endif()
 endif()
 
 

data/build/tdclc/{tdclc_64.cbproj → tdclc.cbproj}

@@ -1,18 +1,27 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <ProjectGuid>{88518A11-802B-49C9-AD5F-F913DCA6EC6F}</ProjectGuid>
-        <ProjectVersion>14.4</ProjectVersion>
+        <ProjectGuid>{88518A11-802B-49C9-AD5F-F913DCA6EC6E}</ProjectGuid>
+        <ProjectVersion>15.4</ProjectVersion>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Release</Config>
         <AppType>Library</AppType>
         <FrameworkType>None</FrameworkType>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
-        <TargetedPlatforms>1</TargetedPlatforms>
-        <Platform>Win64</Platform>
+        <TargetedPlatforms>3</TargetedPlatforms>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
     </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>
@@ -23,17 +32,23 @@
         <CfgParent>Base</CfgParent>
         <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>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
         <Cfg_2>true</Cfg_2>
         <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>
@@ -41,10 +56,13 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <Defines>BOOST_ALL_NO_LIB;TRANSACTD;$(Defines)</Defines>
+        <SanitizedProjectName>tdclc</SanitizedProjectName>
+        <Defines>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_Locale>1041</VerInfo_Locale>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <DllSuffix>_1_2</DllSuffix>
+        <DllSuffix>_2_0</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
         <BCC_PCHUsage>None</BCC_PCHUsage>
@@ -54,7 +72,6 @@
         <IncludePath>..\..\source\;$(IncludePath)</IncludePath>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <OutputExt>dll</OutputExt>
-        <PackageImports>vcl.bpi;rtl.bpi</PackageImports>
         <Multithreaded>true</Multithreaded>
         <NoVCL>true</NoVCL>
         <ProjectType>VCppStyleDll</ProjectType>
@@ -68,10 +85,26 @@
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <ILINK_TranslatedLibraryPath>$(BDSLIB)\$(PLATFORM)\release\$(LANGDIR);$(ILINK_TranslatedLibraryPath)</ILINK_TranslatedLibraryPath>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_OSX32)'!=''">
+        <Icns_MainIcns>$(BDS)\bin\cbuilder_PROJECTICNS.icns</Icns_MainIcns>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <Defines>TRANSACTD;$(Defines)</Defines>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <DllSuffix>_32$(DllSuffix)</DllSuffix>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <Defines>_WIN32_WINNT=0x0501;$(Defines)</Defines>
+        <BCC_Defines>_WIN32_WINNT=0x0501;$(BCC_Defines)</BCC_Defines>
+        <Defines>TRANSACTD;$(Defines)</Defines>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <DllSuffix>_64$(DllSuffix)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <Defines>_DEBUG;$(Defines)</Defines>
         <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
         <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
         <DCC_Optimize>false</DCC_Optimize>
@@ -85,20 +118,25 @@
         <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
         <TASM_Debugging>Full</TASM_Debugging>
         <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-        <ILINK_LibraryPath>$(BDSLIB)\$(PLATFORM)\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <ILINK_TranslatedLibraryPath>$(BDSLIB)\$(PLATFORM)\debug\$(LANGDIR);$(ILINK_TranslatedLibraryPath)</ILINK_TranslatedLibraryPath>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <Defines>NDEBUG;$(Defines)</Defines>
         <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)'!=''">
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <ItemGroup>
         <ResourceCompile Include="tdclc.rc">
-             <Form>tdclc.res</Form>
-             <BuildOrder>20</BuildOrder>
+            <Form>tdclc.res</Form>
+            <BuildOrder>20</BuildOrder>
         </ResourceCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\client.cpp">
             <DependentOn>..\..\source\bzs\db\protocol\tdap\client\Client.h</DependentOn>
@@ -187,9 +225,16 @@
                     <ProjectProperties Name="AutoShowDeps">False</ProjectProperties>
                     <ProjectProperties Name="ManagePaths">False</ProjectProperties>
                     <ProjectProperties Name="VerifyPackages">True</ProjectProperties>
+                    <ProjectProperties Name="IndexFiles">False</ProjectProperties>
                 </ProjectProperties>
+                <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/tdclcpp/CMakeLists.txt

@@ -32,9 +32,25 @@ include(../common/check_for_link_iconv.cmake)
 check_for_link_iconv()
 
 
+# ==========================================================
+# check project name and options
+# ==========================================================
 get_filename_component(this_target "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
-string(REPLACE tdclcpp "" TDCL_CPP_CHARSET "${this_target}")
+string(TOLOWER "${this_target}" this_target)
 project(${this_target})
+# m:multibyte u:unicode mr:multibyte-use_rtm
+if("${this_target}" STREQUAL "tdclcppm")
+  set(TDCL_CPP_CHARSET m)
+  set(TDCL_CPP_USE_RUNTIME_LIBS OFF)
+elseif("${this_target}" STREQUAL "tdclcppu")
+  set(TDCL_CPP_CHARSET u)
+  set(TDCL_CPP_USE_RUNTIME_LIBS OFF)
+elseif("${this_target}" STREQUAL "tdclcppmr")
+  set(TDCL_CPP_CHARSET m)
+  set(TDCL_CPP_USE_RUNTIME_LIBS ON)
+else()
+  message(ERROR "Invalid project name ${this_target}")
+endif()
 
 
 # ==========================================================
@@ -66,30 +82,21 @@ transactd_read_build_number("${TRANSACTD_ROOT}")
 # ==========================================================
 tdcl_add_source_files("${TRANSACTD_ROOT}")
 tdcl_add_include_directory("${TRANSACTD_ROOT}")
-tdcl_add_compiler_options()
-if(MSVC)
-  foreach(build_type "" "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
-    if("${TDCL_CPP_CHARSET}" STREQUAL "u")
-      bz_set_UNICODE_cxx_flag("${build_type}")
-    elseif("${TDCL_CPP_CHARSET}" STREQUAL "m")
-      bz_set_MBCS_cxx_flag("${build_type}")
-    endif()
-  endforeach()
-endif()
 
 
 # ==========================================================
 # 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}/tdclcpp.rc")
   transactd_generate_rc_file(
     TRANSACTD_ROOT "${TRANSACTD_ROOT}"
     OUTFILE "${${this_target}_RC_FILE}"
     F_VER   "${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_CPP_INTERFACE_VER_RELEASE}.${TRANSACTD_BUILD_NUMBER}"
     P_VER   "${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_CPP_INTERFACE_VER_RELEASE}.${TRANSACTD_BUILD_NUMBER}"
-    P_NAME  "Transactd CPP Client"
-    F_DESC  "Transactd CPP Client module"
+    P_NAME  "Transactd Client ${TRANSACTD_VER_POSTFIX}"
+    F_DESC  "Transactd C++ client"
   )
   transactd_add_rc_file()
 endif()
@@ -101,12 +108,56 @@ endif()
 add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 
+# ==========================================================
+# Add compile options
+# ==========================================================
+if(TDCL_CPP_USE_RUNTIME_LIBS)
+  transactd_set_MTMD("MD")
+else()
+  transactd_set_MTMD("MT")
+endif()
+
+
+# ==========================================================
+# Add compile definitions
+# ==========================================================
+if(MSVC)
+  set_property(TARGET ${this_target} PROPERTY COMPILE_DEFINITIONS
+    WIN32 _WIN32 _WINDOWS _USRDLL BOOST_ALL_NO_LIB 
+    LIB_TDCLCPP TRDCL_AUTOLINK_OFF TRDCLENGN_EXPORTS _CRT_SECURE_NO_WARNINGS)
+else()
+  set_property(TARGET ${this_target} 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)
+  endif()
+endif()
+if(TRANSACTD_RUBY_GEM OR TRANSACTD_PHP)
+  set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+    SWIG_BUILDING)
+endif()
+if("${TDCL_CPP_CHARSET}" STREQUAL "u")
+  set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+    UNICODE _UNICODE)
+else()
+  set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
+    _MBCS)
+endif()
+
+
 # ==========================================================
 # add link / include
 # ==========================================================
 transactd_link_boost_libraries("filesystem;thread;chrono;system")
 if(CAN_LINK_ICONV)
-  target_link_libraries(${this_target} iconv)
+  target_link_libraries(${this_target} "${ICONV_LIBRARY}")
+endif()
+if(NOT WIN32)
+  target_link_libraries(${this_target} dl)
 endif()
 
 
@@ -115,18 +166,27 @@ endif()
 # ==========================================================
 bz_get_compiler_bitness()
 if(WIN32)
-  ## Windows tdclcpp[_Compiler]_[32|64][m|u]_[MAJOR]_[MINOR].dll
+  ## Windows tdclcpp[_Compiler]_[32|64][m|u|mr]_[MAJOR]_[MINOR].dll
   bz_get_compiler()
+  set(TDCL_CPP_NAME_TMP "tdclcpp${BZ_COMPILER}_${BZ_BITNESS}${TDCL_CPP_CHARSET}")
+  if(TDCL_CPP_USE_RUNTIME_LIBS)
+    set(TDCL_CPP_NAME_TMP "${TDCL_CPP_NAME_TMP}r")
+  endif()
   set_target_properties(${this_target} PROPERTIES PREFIX "")
   set_target_properties(${this_target} PROPERTIES OUTPUT_NAME
-    "tdclcpp${BZ_COMPILER}_${BZ_BITNESS}${TDCL_CPP_CHARSET}_${TDVER_CPP_INTERFACE_VER_MAJOR}_${TDVER_CPP_INTERFACE_VER_MINOR}")
+    "${TDCL_CPP_NAME_TMP}_${TDVER_CPP_INTERFACE_VER_MAJOR}_${TDVER_CPP_INTERFACE_VER_MINOR}")
   set_target_properties(${this_target} PROPERTIES SUFFIX ".dll")
 else()
-  ## Linux   libtdclcpp_[32|64][m|u].so.[MAJOR].[MINOR]
+  ## Linux   libtdclcpp_[32|64][m|u].so.[MAJOR].[MINOR].[RELEASE]
   set_target_properties(${this_target} PROPERTIES PREFIX "lib")
   set_target_properties(${this_target} PROPERTIES OUTPUT_NAME
     "tdclcpp_${BZ_BITNESS}${TDCL_CPP_CHARSET}")
-  set_target_properties(${this_target} PROPERTIES SUFFIX ".so")
+  if(APPLE)
+  ## Apple   libtdclcpp_[32|64][m|u].[MAJOR].[MINOR].[RELEASE].dylib
+    set_target_properties(${this_target} PROPERTIES SUFFIX ".dylib")
+  else()
+    set_target_properties(${this_target} PROPERTIES SUFFIX ".so")
+  endif()
   set_target_properties(${this_target} PROPERTIES
     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})
@@ -137,6 +197,10 @@ endif()
 # set output directory
 # ==========================================================
 if(NOT COMMAND tdcl_set_output)
-  include(../common/transactd_cl_output.cmake)
+  if(TRANSACTD_RUBY_GEM)
+    include(../tdclrb/gem_output.cmake)
+  else()
+    include(../common/transactd_cl_output.cmake)
+  endif()
 endif()
 tdcl_set_output("${TRANSACTD_BINARY_ROOT}" "${TRANSACTD_CLIENTS_PREFIX}")