transactd 2.4.0 → 2.4.2

data/{RELEASE_NOTE → RELEASE_NOTE.md}

@@ -1,121 +1,165 @@
 Release note
+================================================================================
+Version 2.4.2 2015/08/31
+================================================================================
+New Features
+--------------------------------------------------------------------------------
+* Added a bit AND operator to queryBase and recordsetQuery.
+  In addition to the operators of the past, you can use the '&' and '!&'.
+  '&' operator performs the value and bit operation of the field. If the same as 
+  the specified value matches.
+  '!&' operator performs the value and bit operation of the field. If the not
+  same as the specified value matches. 
+ 
+  ex)flags & 8 and flags !& 16
+
+
+Other Modifications
+--------------------------------------------------------------------------------
+* Changed method
+  field::addAllFileds(tabledef* def) : Chnaged from protected to public.
+
+* Added method parameters
+  writableRecord::del and writableRecord::update,added option of "bool noSeek=false". 
+  If true the noSeek, current record as an established, omit the read operation 
+  in the delete or update operation.
+
+* Added method 
+  void queryStatements::move(int from, int to)
+
+* It was fixed a bug that connection timeout does not work as configured on 
+  windows.
+
+* If there is no record to Join in HasManyJoin, Fixed a bug that may not be 
+  processed correctly.
+
+* In the Join, When the binding key is a string, Fixed a problem that may not
+  be able to properly search. 
+
+
 
 ================================================================================
 Version 2.4.0 2015/06/03
 ================================================================================
 Upgrade Notes
 --------------------------------------------------------------------------------
-* Compatibility between server plugin and clients.
+* Compatibility between server plugin and clients
+  
   Upgrade from the Version 2.3 is easy.
-  Server plug-ins, clients, it is both compatible with 2.4.
-  (However, except the new features of the 2.4)
-
-Upgrade from a previous version than Version 2.3, please check the previous 
-release notes.
+  Server plugins and clients are compatible with 2.4.
+  (However, except the new features from version 2.4)
+  
+  Upgrade from the older versions than 2.3, please check the previous 
+  release notes.
 
 New Features
 --------------------------------------------------------------------------------
 * Transactd studio
+  
   The following information API has been added to the Transactd.
-     Connection in use
-     Database in use
-     Table in use
-     
-  In the table information, it will be examined following number of records from 
-  the open table.
-     read,update,insert,delete
-
-* ActiveTable, It was now possible to obtain a recordset from bookmarks.
-  You can set multiple bookmark using the queryBase::addSeekBookmark method.
+  * Connection in use
+  * Database in use
+  * Table in use
   
-  After you set the query to the table object, and at the same time and count the 
-  number of records that match the conditions when you call the table::recordCount()
-  , you can get them of bookmark by the table::bookmarks().
+  Table information shows the number of records which were read, updated,
+  inserted, deleted since the table has been opened.
 
-* The following methods in C ++ API, it has to allow simultaneous access from 
-  multiple threads.
-  table::insertBookmarks
-  table::moveBookmarks
-  table::bookmarksCount
-  table::bookmarks
+* ActiveTable can obtain a recordset from bookmarks.
+  
+  You can set multiple bookmark using queryBase::addSeekBookmark.
+  
+  If you call table::recordCount() after setting query object to table object,
+  you will get the number of records which match the conditions, and you also
+  get bookmarks of them at the same time. You can access the bookmarks with
+  table::bookmarks().
+
+* The following methods in C ++ API were modified to allow simultaneous access
+  from multiple threads.
+  * table::insertBookmarks
+  * table::moveBookmarks
+  * table::bookmarksCount
+  * table::bookmarks
 
 Other Modifications
 --------------------------------------------------------------------------------
-* Fixed, In null key access P.SQL compatible, that may be whether the judgment 
-  mistake or null key.
+* Fix a bug that null key detection is sometimes wrong in P.SQL compatible
+  null key access.
 
-* Fixed, Sometimes automatic schema generation does not work.
+* Fix a bug that automatic schema generation sometimes does not work well.
 
-* Improved, lock control to get the server statistics. Improve the simultaneous 
-  effectiveness at the time of monitoring.
+* Improved lock control to get the server statistics. Improve the simultaneous
+  effectiveness at monitoring.
 
-* Added, the nsdatabase::isReconnected() method.
-  It indicates whether went to reconnect to the server.
+* nsdatabase::isReconnected() method was added.
+  It indicates whether reconnected to the server.
 
-* Supported, The reconnect in the case of using multiple databases in a single 
+* Support reconnection in the case of using multiple databases in single
   connection.
 
-* Fixed, If there is a null key to when the table is created, may cause by adding
-  unnecessary internal null field.
-
-* Fixed, invalid pointer operations when it receives an invalid prepared query 
-  handle.
-
-* Fixed, May not be able to coexist with the lock by the SQL access.
-
-* Adding Methods
-  short dbdef::validateTableDef(short TableIndex)
-  ushort_td nstable::bookmarkLen() const
-  bookmark_td tabale::bookmarks(unsigned int index) const
-  recordCountFn Call back function
-  table::setOnRecordCount
-  table::onRecordCount
-  bool queryBase::isSeekByBookmarks() const
-  void queryBase::addSeekBookmark(bookmark_td& bm, ushort_td len, bool reset=false)
-  bool writableRecord::read(bookmark_td& bm)
-
-* Changing the method name
-  table::setBookMarks     --> table::insertBookmarks
-  table::moveBookmarksId  --> table::moveBookmarks
-  table::bookMarksCount   --> table::bookmarksCount
-
-* Adding of method parameters
-  void database::close(bool withDropDefaultSchema = false)
-  activeTable::activeTable(database* db, short tableIndex, 
+* Fix a bug that useless internal null fields will be added when create table
+  if there is a null key.
+
+* Fix invalid pointer operations that occurs when an invalid prepared query
+  handle are received.
+
+* Fix a bug that can not coexist with the lock by SQL access sometimes.
+
+* Added methods
+  * short dbdef::validateTableDef(short TableIndex)
+  * ushort_td nstable::bookmarkLen() const
+  * bookmark_td tabale::bookmarks(unsigned int index) const
+  * recordCountFn Call back function
+  * table::setOnRecordCount
+  * table::onRecordCount
+  * bool queryBase::isSeekByBookmarks() const
+  * void queryBase::addSeekBookmark(bookmark_td& bm, ushort_td len, bool reset=false)
+  * bool writableRecord::read(bookmark_td& bm)
+
+* Changed method names
+  * table::setBookMarks     --> table::insertBookmarks
+  * table::moveBookmarksId  --> table::moveBookmarks
+  * table::bookMarksCount   --> table::bookmarksCount
+
+* Added method parameters
+  * void database::close(bool withDropDefaultSchema = false)
+  * activeTable::activeTable(database* db, short tableIndex, 
                                   short mode = TD_OPEN_NORMAL)
-  static activeTable* create(database* db, short tableIndex,
+  * static activeTable* create(database* db, short tableIndex,
                                   short mode = TD_OPEN_NORMAL);
 
-* Change of bookmark_td type from unsigned int.
-        struct BOOKMARK
-        {
-            uchar_td val[MAX_BOOKMARK_SIZE];
-            bool empty;
-            BOOKMARK():empty(true){ }
-            bool isEmpty(){ return empty; }
-            void set(uchar_td* p, int len)
-            {
-                memcpy(val, p, len);
-                empty = false;
-            }
-        };
-
-* A function that takes a bookmark_td type argument, it was changed to refer 
-  to the bookmark_td type.
-
-* The argument of openTable of C++ convenience API it was all arguments 
-  correspondence.
-
-* We added the following function in a C++ convenience API.
-  void deleteTable(dbdef* def, short id)
-  void renumberTable(dbdef* def, short id, short newid)
-  void deleteField(dbdef* def, short tableid, short fieldNum)
-  void deleteKey(dbdef* def, short tableid, short keynum)
-  void validateTableDef(dbdef* def, short tableid)
-
-* Trasnactd Client with SDK for Windows, binary for Embarcadero C ++ Builder is 
-  no longer included. If you want to use in the Embarcadero C ++ Builder, 
-  it is still available at that to build from source.
+* Change bookmark type from unsigned int to bookmark_td.
+  ```
+  struct BOOKMARK
+  {
+      uchar_td val[MAX_BOOKMARK_SIZE];
+      bool empty;
+      BOOKMARK():empty(true){ }
+      bool isEmpty(){ return empty; }
+      void set(uchar_td* p, int len)
+      {
+          memcpy(val, p, len);
+          empty = false;
+      }
+  };
+  ```
+
+* Changed the type of function arguments to reference of bookmark_td from
+  bookmark_td.
+
+* openTable method in C++ convenience API supports all arguments of
+  original openTable method.
+
+* The following functions are added to C++ convenience API.
+  * void deleteTable(dbdef* def, short id)
+  * void renumberTable(dbdef* def, short id, short newid)
+  * void deleteField(dbdef* def, short tableid, short fieldNum)
+  * void deleteKey(dbdef* def, short tableid, short keynum)
+  * void validateTableDef(dbdef* def, short tableid)
+
+* The binaries which compiled with Embarcadero C++ Builder are no longer
+  included in Transactd Client with SDK for Windows. If you want to use them,
+  they are still available by building from source code.
+  
   http://www.bizstation.jp/ja/transactd/documents/BUILD_WIN.html
 
 
@@ -126,38 +170,48 @@ Version 2.3.0 2015-03-20
 
 Upgrade Notes
 --------------------------------------------------------------------------------
-* Compatibility between server plugin and clients.
+* Compatibility between server plugin and clients
+  
   You have to upgrade both of the server plugin and client libraries.
+  
   The protocol that is used communicating between server and client were changed
   for database::reconnect() method. This version of server plugin and clients
-  has no compatibility with the past versions of them.
-  If you access to 2.2 or earlier version of server plugin with this version of
+  have no compatibility with the past versions of them.
+  
+  If you access to 2.2 or older version of server plugin with this version of
   clients, error code SERVER_CLIENT_NOT_COMPATIBLE (3003) will be returned.
 
 * Some methods were moved.
+  
   table::usePadChar() and table:: trimPadChar() were moved to fielddef structure.
+  
   The setter methods of them were put together to setPadCharSettings(bool set, 
   bool trim). By this change, these values can be saved to the schema.
+  
   This affects to the field types ft_string, ft_wstring, ft_mychar and ft_mywchar.
   Other field types are not affected.
+  
   The default value of table::usePadChar() and trimPadChar() are true. If you did
   not change this value, there is no changes on program behavior.
   If you changed the values, you have to fix program code.
   
   For example, the code `tb->setUsePadChar(false);` has to be modified like this:
-```
+  ```
   for (int i = 0 ; i < tb->tableDef()->fieldCount ; ++i)
   {
     fielddef* fd = const_cast<fielddef*>(&tb->tableDef()->fieldDefs[i]);
     fd->setPadCharSettings(false/*set*/, true/*trim*/);
   }
-```
+  ```
+  
   Note: Changes in this code are volatile, and not saved on schema. Add updating
   schema code if you need.
 
-* openTable in transaction.
+* openTable in transaction
+  
   The error code STATUS_ALREADY_INTRANSACTION is added. If openTable is called
   in transaction, and binary log is enable, the server returns this error.
+  
   The binary log was supported until now, but there was the problem that if
   openTable is called in transaction the binlog map will not be generated and
   replication does not go well. So that, we modified the server plugin to return
@@ -168,17 +222,21 @@ New Features
 --------------------------------------------------------------------------------
 * Add bias parameter ROW_LOCK_S to seek and step read operations in
   MULTILOCK_READ_COMMITED transaction.
+  
   By this, you can control lock in more detail with using shared lock.
 
 * Add limit option to finish searching to table query with queryBase.
+  
   In the past, the value of limit option meant that max number of records which
   will be got with one operation. The clients automatically called read operation
   many times until the other finish conditions are met. In effect, limit was the
   option that save receive buffer.
+  
   If you set true to queryBase::stopAtLimit(), the limit option behaves as finish
   condition. The default value is false, and it is same as the past behavior.
 
 * Add findContinue to enum eFindType for table::find(eFindType type).
+  
   If the last find operation has been finished because of the filter conditions
   maxRecord or rejectCount, it is able to continue searching from next record
   with findContinue.
@@ -189,15 +247,19 @@ New Features
 
 * Add first and last method to recordset grouping functions. These methods
   return first or last record in each group. Strings and numbers are supported.
+  
   These methods are useful when use non-normalized field values to avoid JOIN
   for some reason.
 
 * Add case-insensitive comparison operator to filter and query.
+  
   To compare strings without case sensitivity, add "i" after the normal
   comparison operators.
   
-  * Case-sensitive:   =,  >,  < ,  >=,  <=,  <>
-  * Case-insensitive: =i, >i, <i,  >=i, <=i, <>i
+  ```
+  Case-sensitive:   =,  >,  < ,  >=,  <=,  <>
+  Case-insensitive: =i, >i, <i,  >=i, <=i, <>i
+  ```
   
   When the comparison field is same as the index field which is using, setting
   case sensitivity same as field definition makes performance better. If case
@@ -207,9 +269,11 @@ New Features
 * Add database::reconnect() which is used to reconnect to database. You can
   reconnect to database with this method even if server process has been
   restarted unexpectedly.
+  
   The reconnection contains reopening tables, recovering cursor positions and
   record locks. Transactions which have not been commited yet will not be
   recovered. You have to run it again.
+  
   There is no way to change the reconnect address at present, but tdclc will
   support it in the future.
 
@@ -220,8 +284,10 @@ New Features
 * Add connectTimeout and netTimeout to client setting file (transactd.ini or
   transactd.cnf). The default values are following:
   
+  ```
   connectTimeout = 20
   netTimeout = 180
+  ```
   
   connectTimeout means timeout seconds for connection. netTimeout means timeout
   seconds for waiting response from server in a operation.

data/build/common/get_boost_libs.cmake

@@ -31,6 +31,7 @@
 function(get_boost_libs libs)
   # Get pathes STATIC_RUNTIME_ON (for /MT and /MTd)
   set(Boost_USE_STATIC_RUNTIME ON)
+  set(Boost_USE_STATIC_LIBS    ON)
   find_package(Boost COMPONENTS ${libs})
   if(NOT Boost_FOUND)
     message(SEND_ERROR "Boost not found. ${libs}")
@@ -39,6 +40,7 @@ function(get_boost_libs libs)
   set(Boost_LIBRARIES "")
   # Get pathes STATIC_RUNTIME_OFF (for /MD and /MDd)
   set(Boost_USE_STATIC_RUNTIME OFF)
+  set(Boost_USE_STATIC_LIBS    ON)
   find_package(Boost COMPONENTS ${libs})
   if(NOT Boost_FOUND)
     message(SEND_ERROR "Boost not found. ${libs}")

data/build/common/system.cmake

@@ -51,17 +51,19 @@ macro(bz_get_compiler)
   set(BZ_COMPILER "")
   if(WIN32)
     if(MSVC60)
-      set(BZ_COMPILER "_vc060")
+      set(BZ_COMPILER "_vc60")
     elseif(MSVC70)
-      set(BZ_COMPILER "_vc070")
+      set(BZ_COMPILER "_vc70")
     elseif(MSVC80)
-      set(BZ_COMPILER "_vc080")
+      set(BZ_COMPILER "_vc80")
     elseif(MSVC90)
-      set(BZ_COMPILER "_vc090")
+      set(BZ_COMPILER "_vc90")
     elseif(MSVC10)
       set(BZ_COMPILER "_vc100")
     elseif(MSVC11)
       set(BZ_COMPILER "_vc110")
+    elseif(MSVC12)
+      set(BZ_COMPILER "_vc120")
     elseif(MINGW)
       string(REPLACE "." ";" tmp_list ${CMAKE_CXX_COMPILER_VERSION})
       list (GET tmp_list 0 MINGW_MAJOR)

data/build/common/transactd_cl_output.cmake

@@ -115,18 +115,30 @@ endif()
 # ==========================================================
 if(NOT COMMAND transactd_make_msvc_install_file)
 macro(transactd_make_msvc_install_file TRANSACTD_BINARY_ROOT)
+  cmake_policy(PUSH)
+  if(POLICY CMP0026)
+    cmake_policy(SET CMP0026 OLD)
+  endif()
   get_target_property(${this_target}_BINARY_BASENAME "${this_target}" LOCATION)
+  cmake_policy(POP)
   get_filename_component(${this_target}_BINARY_BASENAME "${${this_target}_BINARY_BASENAME}" NAME_WE)
   foreach(build_type "RELEASE" "DEBUG" "RELWITHDEBINFO" "MINSIZEREL")
+    get_target_property(BINARY_NAME "${this_target}" OUTPUT_NAME_${build_type})
+    if (${BINARY_NAME} STREQUAL "BINARY_NAME-NOTFOUND")
+      get_target_property(BINARY_NAME "${this_target}" OUTPUT_NAME)
+    endif()
+    if (${BINARY_NAME} STREQUAL "BINARY_NAME-NOTFOUND")
+      set(BINARY_NAME ${this_target}_BINARY_BASENAME)
+    endif()
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/msvc_install_${build_type}.cmake
 "
 foreach(dirname bin lib)
-  file(GLOB dellist \"${TRANSACTD_BINARY_ROOT}/\${dirname}/${${this_target}_BINARY_BASENAME}*\")
+  file(GLOB dellist \"${TRANSACTD_BINARY_ROOT}/\${dirname}/${BINARY_NAME}*\")
   if(NOT \"\${dellist}\" STREQUAL \"\")
     file(REMOVE \${dellist})
   endif()
   file(GLOB copylist
-    \"${TRANSACTD_BINARY_ROOT}/\${dirname}/${build_type}/${${this_target}_BINARY_BASENAME}*\")
+    \"${TRANSACTD_BINARY_ROOT}/\${dirname}/${build_type}/${BINARY_NAME}*\")
   file(COPY \${copylist} DESTINATION \"${TRANSACTD_BINARY_ROOT}/\${dirname}/\")
 endforeach()
 ")

data/build/common/transactd_common.cmake

@@ -239,6 +239,22 @@ endmacro()
 endif()
 
 
+# ==========================================================
+#   transactd_has_MD_option
+# ==========================================================
+if(NOT COMMAND transactd_has_MD_option)
+macro(transactd_has_MD_option option_string)
+  set(IS_MD OFF)
+  if(MSVC)
+    if( ("${option_string}" MATCHES "(.* )?/MD( .*)?$") OR
+        ("${option_string}" MATCHES "(.* )?/MDd( .*)?$") )
+      set(IS_MD ON)
+    endif()
+  endif()
+endmacro()
+endif()
+
+
 # ==========================================================
 #   transactd_link_boost_libraries MACRO
 #     boost_components  : "system;chrono;thread;filesystem"
@@ -247,6 +263,9 @@ if(NOT COMMAND transactd_link_boost_libraries)
 macro(transactd_link_boost_libraries boost_components)
   set(Boost_USE_MULTITHREADED ON)
   set(Boost_USE_STATIC_LIBS ON)
+  if("${BOOST_ROOT}" STREQUAL "")
+    set(BOOST_ROOT "${WITH_BOOST}")
+  endif()
   if("${BOOST_ROOT}" STREQUAL "")
     if(WIN32)
       bz_get_compiler_bitness()
@@ -294,24 +313,27 @@ macro(transactd_link_boost_libraries boost_components)
     endif()
     set(boost_libs_listlen 0)
     # buildtype-specified libraries
-    foreach(BT_NAME "" ${CMAKE_CONFIGURATION_TYPES})
+    foreach(BUILD_TYPE DEBUG RELEASE RELWITHDEBINFO MINSIZEREL)
+      set(BT_NAME "${BUILD_TYPE}")
       if(NOT("${BT_NAME}" STREQUAL ""))
         set(BT_NAME "_${BT_NAME}")
         string(TOUPPER "${BT_NAME}" BT_NAME)
       endif()
-      transactd_has_MTMD_option("${CMAKE_CXX_FLAGS${BT_NAME}}")
-      if("${transactd_has_MTMD_option_return}" STREQUAL "ON")
-        # find buildtype-specified boost libraries
-        get_boost_libs_from_compiler_flags("${CMAKE_CXX_FLAGS${BT_NAME}}")
-        set(boost_libs_for${BT_NAME} "${get_boost_libs_from_compiler_flags_return}")
+      
+      transactd_has_MD_option("${CMAKE_CXX_FLAGS_${BUILD_TYPE}}")
+      message(STATUS "CMAKE_CXX_FLAGS_${BUILD_TYPE} = ${CMAKE_CXX_FLAGS_${BUILD_TYPE}} IS_MD=${IS_MD}")
+      if ("${IS_MD}" STREQUAL "ON")
+         if("${BUILD_TYPE}" STREQUAL "DEBUG")
+           set(boost_libs_for${BT_NAME} "${Boost_LIBRARIES_STATIC_USE_RUNTIME_DEBUG}")
+         else()
+           set(boost_libs_for${BT_NAME} "${Boost_LIBRARIES_STATIC_USE_RUNTIME_NO_DEBUG}")
+         endif()
+      elseif("${BUILD_TYPE}" STREQUAL "DEBUG")
+         set(boost_libs_for${BT_NAME} "${Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME_DEBUG}")
       else()
-        # use project-specified libaries if buildtype-specified option is not set
-        if("${boost_libs_for_${this_target}}" STREQUAL "")
-          set(boost_libs_for${BT_NAME} "${Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME_NO_DEBUG}")
-        else()
-          set(boost_libs_for${BT_NAME} "${boost_libs_for_${this_target}}")
-        endif()
+         set(boost_libs_for${BT_NAME} "${Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME_NO_DEBUG}")
       endif()
+      
       # check number of boost libaries
       string(REGEX REPLACE ";$" "" boost_libs_for${BT_NAME} "${boost_libs_for${BT_NAME}}")
       list(LENGTH boost_libs_for${BT_NAME} boost_libs_listlen${BT_NAME})

data/build/tdclc/CMakeLists.txt

@@ -103,6 +103,12 @@ endif()
 # Add compile options
 # ==========================================================
 transactd_set_MTMD("MT")
+if(NOT MSVC)
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_RELEASE")
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_DEBUG")
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_RELWITHDEBINFO")
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_MINSIZEREL")
+endif()
 
 
 # ==========================================================
@@ -131,9 +137,11 @@ if(CAN_LINK_ICONV)
   target_link_libraries(${this_target} "${ICONV_LIBRARY}")
 endif()
 if(NOT MSVC)
-  target_link_libraries(${this_target} pthread)
+  target_link_libraries(${this_target} pthread)
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    ## target_link_libraries(${this_target} "${TRANSACTD_ROOT}/build/tdclc/libtdclcm.map")
+    ## target_link_libraries(${this_target} "${TRANSACTD_ROOT}/build/tdclc/libtdclcm.map")
+  elseif(APPLE)
+    target_link_libraries(${this_target} -Wl,-map,"${TRANSACTD_ROOT}/build/tdclc/libtdclcm.map")
   else()
     target_link_libraries(${this_target} -Wl,--version-script,"${TRANSACTD_ROOT}/build/tdclc/libtdclcm.map")
   endif()

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,0,66
- PRODUCTVERSION 2,4,0,66
+ FILEVERSION 2,4,2,91
+ PRODUCTVERSION 2,4,2,91
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "2.4.0.66"
+            VALUE "FileVersion", "2.4.2.91"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.0.66"
+            VALUE "ProductVersion", "2.4.2.91"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/CMakeLists.txt

@@ -92,17 +92,38 @@ endif()
 # ==========================================================
 add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
+# ==========================================================
+# add dependencie projects
+# ==========================================================
+add_dependencies(${this_target} tdclc)
+
 
 # ==========================================================
 # Add compile options
 # ==========================================================
-if(TDCL_CPP_USE_RUNTIME_LIBS)
-  transactd_set_MTMD("MD")
+transactd_reset_MTMD()
+if (MSVC)
+  if((TRANSACTD_RUBY_GEM) OR (TRANSACTD_PHP))
+    bz_add_cxx_flag("/MD" "_RELEASE")
+    bz_add_cxx_flag("/MDd" "_DEBUG")
+    bz_add_cxx_flag("/MD" "_RELWITHDEBINFO")
+    bz_add_cxx_flag("/MD" "_MINSIZEREL")
+  else()
+    bz_add_cxx_flag("/MT" "_RELEASE")
+    bz_add_cxx_flag("/MTd" "_DEBUG")
+    bz_add_cxx_flag("/MT" "_RELWITHDEBINFO")
+    bz_add_cxx_flag("/MD" "_MINSIZEREL")
+  endif()
+  foreach(build_type "" "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
+    bz_add_cxx_flag("/wd4996" "${build_type}")
+  endforeach()
 else()
-  transactd_set_MTMD("MT")
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_RELEASE")
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_DEBUG")
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_RELWITHDEBINFO")
+  bz_add_cxx_flag("-Wno-unknown-pragmas -Wno-ignored-qualifiers" "_MINSIZEREL")
 endif()
 
-
 # ==========================================================
 # Add compile definitions
 # ==========================================================
@@ -154,12 +175,16 @@ if(WIN32)
   ## 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()
+  
+  foreach(BUILD_TYPE DEBUG RELEASE RELWITHDEBINFO MINSIZEREL)
+    transactd_has_MD_option("${CMAKE_CXX_FLAGS_${BUILD_TYPE}}")
+    if("${IS_MD}" STREQUAL "ON")
+      set_target_properties(${this_target} PROPERTIES OUTPUT_NAME_${BUILD_TYPE} "${TDCL_CPP_NAME_TMP}r_${TD_RC_VER_MAJOR}_${TD_RC_VER_MINOR}")
+    else()
+      set_target_properties(${this_target} PROPERTIES OUTPUT_NAME_${BUILD_TYPE} "${TDCL_CPP_NAME_TMP}_${TD_RC_VER_MAJOR}_${TD_RC_VER_MINOR}")
+    endif()
+  endforeach()
   set_target_properties(${this_target} PROPERTIES PREFIX "")
-  set_target_properties(${this_target} PROPERTIES OUTPUT_NAME
-    "${TDCL_CPP_NAME_TMP}_${TD_RC_VER_MAJOR}_${TD_RC_VER_MINOR}")
   set_target_properties(${this_target} PROPERTIES SUFFIX ".dll")
 else()
   ## Linux   libtdclcpp_[32|64][m|u].so.[MAJOR].[MINOR].[RELEASE]