transactd 1.2.0 → 2.0.0

data/build/common/check_for_link_iconv.cmake

@@ -26,21 +26,25 @@ if(UNIX)
     set(CMAKE_FIND_LIBRARY_SUFFIXES "\\.so" "\\.a")
   endif()
   # find iconv.h
-  find_path(ICONV_INCLUDE_DIR iconv.h
-    /usr/include
-    /usr/local/include
-    ${CMAKE_SYSTEM_INCLUDE_PATH}
-    "$ENV{ICONV_INCLUDE}"
-    NO_DEFAULT_PATH
-  )
+  if(NOT DEFINED ICONV_INCLUDE_DIR)
+    find_path(ICONV_INCLUDE_DIR iconv.h
+      "$ENV{ICONV_INCLUDE}"
+      ${CMAKE_SYSTEM_INCLUDE_PATH}
+      /usr/include
+      /usr/local/include
+      NO_DEFAULT_PATH
+    )
+  endif()
   # find libiconv
-  find_library(ICONV_LIBRARY NAMES iconv libiconv PATHS
-    /usr/lib
-    /usr/local/lib
-    ${CMAKE_SYSTEM_LIBRARY_PATH}
-    "$ENV{ICONV_LIBRARY}"
-    NO_DEFAULT_PATH
-  )
+  if(NOT DEFINED ICONV_LIBRARY)
+    find_library(ICONV_LIBRARY NAMES iconv libiconv PATHS
+      "$ENV{ICONV_LIBRARY}"
+      ${CMAKE_SYSTEM_LIBRARY_PATH}
+      /usr/lib
+      /usr/local/lib
+      NO_DEFAULT_PATH
+    )
+  endif()
   # if found iconv.h and libiconv then we can use -liconv option
   if(ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
     set(CAN_LINK_ICONV TRUE)

data/build/common/create_symlink.cmake.in

@@ -0,0 +1,25 @@
+##=================================================================
+#   Copyright (C) 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.
+##=================================================================
+#
+# Create symlink
+#
+execute_process(COMMAND ln -sF
+  ${BZ_SYML_TARGET_NAME} ${BZ_SYML_LINK_PATH_1})
+execute_process(COMMAND ln -sF
+  ${BZ_SYML_LINK_NAME_1} ${BZ_SYML_LINK_PATH_2})

data/build/common/get_boost_libs.cmake

@@ -22,51 +22,51 @@
 #   set(Boost_USE_MULTITHREADED ON)
 #   set(Boost_USE_STATIC_LIBS ON)
 #   get_boost_libs("system;chrono")
-#   message(STATUS "for /MD  ${Boost_LIBRARIES_FOR_MD}")  # =Boost_LIBRARIES_STATIC_RUNTIME_OFF_NO_DEBUG
-#   message(STATUS "for /MDd ${Boost_LIBRARIES_FOR_MDd}") # =Boost_LIBRARIES_STATIC_RUNTIME_OFF_DEBUG
-#   message(STATUS "for /MT  ${Boost_LIBRARIES_FOR_MT}")  # =Boost_LIBRARIES_STATIC_RUNTIME_ON_NO_DEBUG
-#   message(STATUS "for /MTd ${Boost_LIBRARIES_FOR_MTd}") # =Boost_LIBRARIES_STATIC_RUNTIME_ON_DEBUG
-#   get_boost_libs_from_CXXFLAGS("${CMAKE_CXX_FLAGS_DEBUG}")
-#   message(STATUS "for DEBUG BUILD ${get_boost_libs_from_CXXFLAGS_return}")
+#   message(STATUS "for /MD  ${Boost_LIBRARIES_FOR_MD}")  # =Boost_LIBRARIES_STATIC_USE_RUNTIME_NO_DEBUG
+#   message(STATUS "for /MDd ${Boost_LIBRARIES_FOR_MDd}") # =Boost_LIBRARIES_STATIC_USE_RUNTIME_DEBUG
+#   message(STATUS "for /MT  ${Boost_LIBRARIES_FOR_MT}")  # =Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME_NO_DEBUG
+#   message(STATUS "for /MTd ${Boost_LIBRARIES_FOR_MTd}") # =Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME_DEBUG
+#   get_boost_libs_from_compiler_flags("${CMAKE_CXX_FLAGS_DEBUG}")
+#   message(STATUS "for DEBUG BUILD ${get_boost_libs_from_compiler_flags_return}")
 function(get_boost_libs libs)
-  # Get pathes STATIC_RUNTIME_ON
+  # Get pathes STATIC_RUNTIME_ON (for /MT and /MTd)
   set(Boost_USE_STATIC_RUNTIME ON)
   find_package(Boost COMPONENTS ${libs})
   if(NOT Boost_FOUND)
     message(SEND_ERROR "Boost not found. ${libs}")
   endif()
-  set(Boost_LIBRARIES_STATIC_RUNTIME_ON  ${Boost_LIBRARIES})
+  set(Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME  ${Boost_LIBRARIES})
   set(Boost_LIBRARIES "")
-  # Get pathes STATIC_RUNTIME_OFF
+  # Get pathes STATIC_RUNTIME_OFF (for /MD and /MDd)
   set(Boost_USE_STATIC_RUNTIME OFF)
   find_package(Boost COMPONENTS ${libs})
   if(NOT Boost_FOUND)
     message(SEND_ERROR "Boost not found. ${libs}")
   endif()
-  set(Boost_LIBRARIES_STATIC_RUNTIME_OFF ${Boost_LIBRARIES})
+  set(Boost_LIBRARIES_STATIC_USE_RUNTIME ${Boost_LIBRARIES})
   set(Boost_LIBRARIES "")
   # for /MD
-  parse_boost_libs(false "${Boost_LIBRARIES_STATIC_RUNTIME_OFF}")
+  parse_boost_libs(false "${Boost_LIBRARIES_STATIC_USE_RUNTIME}")
   set(Boost_LIBRARIES_FOR_MD "${parse_boost_libs_return}" PARENT_SCOPE)
-  set(Boost_LIBRARIES_STATIC_RUNTIME_OFF_NO_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
+  set(Boost_LIBRARIES_STATIC_USE_RUNTIME_NO_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
   # for /MDd
-  parse_boost_libs(true  "${Boost_LIBRARIES_STATIC_RUNTIME_OFF}")
+  parse_boost_libs(true  "${Boost_LIBRARIES_STATIC_USE_RUNTIME}")
   set(Boost_LIBRARIES_FOR_MDd "${parse_boost_libs_return}" PARENT_SCOPE)
-  set(Boost_LIBRARIES_STATIC_RUNTIME_OFF_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
+  set(Boost_LIBRARIES_STATIC_USE_RUNTIME_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
   # for /MT
-  parse_boost_libs(false "${Boost_LIBRARIES_STATIC_RUNTIME_ON}")
+  parse_boost_libs(false "${Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME}")
   set(Boost_LIBRARIES_FOR_MT "${parse_boost_libs_return}" PARENT_SCOPE)
-  set(Boost_LIBRARIES_STATIC_RUNTIME_ON_NO_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
+  set(Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME_NO_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
   # for /MTd
-  parse_boost_libs(true  "${Boost_LIBRARIES_STATIC_RUNTIME_ON}")
+  parse_boost_libs(true  "${Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME}")
   set(Boost_LIBRARIES_FOR_MTd "${parse_boost_libs_return}" PARENT_SCOPE)
-  set(Boost_LIBRARIES_STATIC_RUNTIME_ON_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
+  set(Boost_LIBRARIES_STATIC_NOTUSE_RUNTIME_DEBUG "${parse_boost_libs_return}" PARENT_SCOPE)
   # Boost_INCLUDE_DIRS
   set(Boost_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}" PARENT_SCOPE)
 endfunction()
 
-function(get_boost_libs_from_CXXFLAGS flags)
-  set(get_boost_libs_from_CXXFLAGS_return "" PARENT_SCOPE)
+function(get_boost_libs_from_compiler_flags flags)
+  set(get_boost_libs_from_compiler_flags_return "" PARENT_SCOPE)
   set(Boost_LIBRARIES_BUILD_TYPE "")
   if("${flags}" MATCHES "(.* )?/MD( .*)?$")
     set(Boost_LIBRARIES_BUILD_TYPE "${Boost_LIBRARIES_FOR_MD}")
@@ -76,10 +76,10 @@ function(get_boost_libs_from_CXXFLAGS flags)
     set(Boost_LIBRARIES_BUILD_TYPE "${Boost_LIBRARIES_FOR_MT}")
   elseif("${flags}" MATCHES "(.* )?/MTd( .*)?$")
     set(Boost_LIBRARIES_BUILD_TYPE "${Boost_LIBRARIES_FOR_MTd}")
-  else()
-    set(Boost_LIBRARIES_BUILD_TYPE "${Boost_LIBRARIES_FOR_MD}")
   endif()
-  set(get_boost_libs_from_CXXFLAGS_return "${Boost_LIBRARIES_BUILD_TYPE}" PARENT_SCOPE)
+  if(NOT ("${Boost_LIBRARIES_BUILD_TYPE}" STREQUAL ""))
+    set(get_boost_libs_from_compiler_flags_return "${Boost_LIBRARIES_BUILD_TYPE}" PARENT_SCOPE)
+  endif()
 endfunction()
 
 function(parse_boost_libs with_debug path)

data/build/common/options.cmake

@@ -59,69 +59,3 @@ macro(bz_add_cxx_flag opt build_type)
   set(CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}} ${opt}")
 endmacro()
 endif()
-
-# ==========================================================
-#   remove UNICODE or MBCS flag from CXX_FLAGS
-# ==========================================================
-if(NOT COMMAND bz_remove_charset_cxx_flag)
-macro(bz_remove_charset_cxx_flag build_type)
-  bz_remove_cxx_flag("-DUNICODE"  "${build_type}")
-  bz_remove_cxx_flag("/DUNICODE"  "${build_type}")
-  bz_remove_cxx_flag("-D_UNICODE" "${build_type}")
-  bz_remove_cxx_flag("/D_UNICODE" "${build_type}")
-  bz_remove_cxx_flag("-DMBCS"     "${build_type}")
-  bz_remove_cxx_flag("/DMBCS"     "${build_type}")
-  bz_remove_cxx_flag("-D_MBCS"    "${build_type}")
-  bz_remove_cxx_flag("/D_MBCS"    "${build_type}")
-endmacro()
-endif()
-
-# ==========================================================
-#   set UNICODE flag to CXX_FLAGS
-# ==========================================================
-if(NOT COMMAND bz_set_UNICODE_cxx_flag)
-macro(bz_set_UNICODE_cxx_flag build_type)
-  bz_remove_charset_cxx_flag("${build_type}")
-  bz_add_cxx_flag("-DUNICODE -D_UNICODE" "${build_type}")
-endmacro()
-endif()
-
-# ==========================================================
-#   set MBCS flag to CXX_FLAGS
-# ==========================================================
-if(NOT COMMAND bz_set_MBCS_cxx_flag)
-macro(bz_set_MBCS_cxx_flag build_type)
-  bz_remove_charset_cxx_flag("${build_type}")
-  bz_add_cxx_flag("-D_MBCS" "${build_type}")
-endmacro()
-endif()
-
-# ==========================================================
-#   set /MT(d) flag to CXX_FLAGS
-# ==========================================================
-if(NOT COMMAND bz_set_MTMTd_cxx_flag)
-macro(bz_set_MTMTd_cxx_flag build_type)
-  bz_replace_cxx_flag("/MDd" "/MTd" "${build_type}")
-  bz_replace_cxx_flag("/MD"  "/MT"  "${build_type}")
-  if(    "${CMAKE_CXX_FLAGS${build_type}}" MATCHES "(.* )?/MT( .*)?$")
-  elseif("${CMAKE_CXX_FLAGS${build_type}}" MATCHES "(.* )?/MTd( .*)?$")
-  else()
-    bz_add_cxx_flag("/MT" "${build_type}")
-  endif()
-endmacro()
-endif()
-
-# ==========================================================
-#   set /MD(d) flag to CXX_FLAGS
-# ==========================================================
-if(NOT COMMAND bz_set_MDMDd_cxx_flag)
-macro(bz_set_MDMDd_cxx_flag build_type)
-  bz_replace_cxx_flag("/MTd" "/MDd" "${build_type}")
-  bz_replace_cxx_flag("/MT"  "/MD"  "${build_type}")
-  if(    "${CMAKE_CXX_FLAGS${build_type}}" MATCHES "(.* )?/MD( .*)?$")
-  elseif("${CMAKE_CXX_FLAGS${build_type}}" MATCHES "(.* )?/MDd( .*)?$")
-  else()
-    bz_add_cxx_flag("/MD" "${build_type}")
-  endif()
-endmacro()
-endif()

data/build/common/smart_install.cmake

@@ -17,15 +17,15 @@
 #   02111-1307, USA.
 ##=================================================================
 ## need system.cmake
+set(BZ_SI_SCRIPT "${CMAKE_CURRENT_LIST_FILE}")
+get_filename_component(BZ_SI_WINCMD "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(BZ_SI_WINCMD "${BZ_SI_WINCMD}/copyifgreater.cmd")
 # ==========================================================
 #   install so/dll if greater
 #     * compare .dll with binary version info
 #     * compere .so with file name suffix
 # ==========================================================
 if(NOT COMMAND bz_smart_install)
-set(BZ_SI_SCRIPT "${CMAKE_CURRENT_LIST_FILE}")
-get_filename_component(BZ_SI_WINCMD "${CMAKE_CURRENT_LIST_FILE}" PATH)
-set(BZ_SI_WINCMD "${BZ_SI_WINCMD}/copyifgreater.cmd")
 macro(bz_smart_install)
   cmake_parse_arguments(BZ_SI
     "TO_WIN_SYSTEMDIR;ADD_ME" "DEST;VER_MAJOR;VER_MINOR;VER_RELEASE" "SOURCES" ${ARGN})

data/build/common/transactd.rc.in

@@ -1,5 +1,5 @@
 //=================================================================
-//   Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+//   Copyright (C) 2013 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
@@ -17,9 +17,17 @@
 //   02111-1307, USA.
 //=================================================================
 
+#ifndef __BCPLUSPLUS__
 #include <windows.h>
+#endif
+
 #define IDC_STATIC -1
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @TD_RC_F_VER_MAJOR@,@TD_RC_F_VER_MINOR@,@TD_RC_F_VER_RELEASE@,@TD_RC_F_VER_BUILD@
  PRODUCTVERSION @TD_RC_P_VER_MAJOR@,@TD_RC_P_VER_MINOR@,@TD_RC_P_VER_RELEASE@,@TD_RC_P_VER_BUILD@
@@ -35,18 +43,20 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041104b0"
+        BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "@TD_RC_F_DESC@"
             VALUE "FileVersion", "@TD_RC_F_VER_MAJOR@.@TD_RC_F_VER_MINOR@.@TD_RC_F_VER_RELEASE@.@TD_RC_F_VER_BUILD@"
-            VALUE "LegalCopyright", "Copyright (C) 2013 BizStation Corp."
-            VALUE "ProductName", "@TD_RC_P_NAME@"
+            VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
             VALUE "ProductVersion", "@TD_RC_P_VER_MAJOR@.@TD_RC_P_VER_MINOR@.@TD_RC_P_VER_RELEASE@.@TD_RC_P_VER_BUILD@"
+            VALUE "ProductName", "@TD_RC_P_NAME@"
         END
     END
     BLOCK "VarFileInfo"
+
     BEGIN
-        VALUE "Translation", 0x411, 1200
+        VALUE "Translation", 0x409, 1200
     END
 END
+

data/build/common/transactd_cl_common.cmake

@@ -25,16 +25,22 @@ macro(tdcl_add_source_files TRANSACTD_ROOT)
     ${${this_target}_SOURCE_FILES}
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/btrDate.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/tdapSchema.cpp
+    ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/activeTable.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/connMgr.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/database.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/databaseFactory.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/dbDef.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/errorMessage.cpp
+    ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/field.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/fieldDDF.cpp
+    ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/fieldNameAlias.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/fileDDF.cpp
+    ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/groupQuery.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/indexDDF.cpp
+    ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/memRecord.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/nsDatabase.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/nsTable.cpp
+    ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/recordset.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/sharedData.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/client/table.cpp
     ${TRANSACTD_ROOT}/source/bzs/db/protocol/tdap/mysql/characterset.cpp
@@ -69,32 +75,45 @@ endmacro()
 endif()
 
 # ==========================================================
-#   add compiler / linker options macro
+#   set compiler flags macro
 # ==========================================================
-if(NOT COMMAND tdcl_add_compiler_options)
-macro(tdcl_add_compiler_options)
+if(NOT COMMAND tdcl_set_compiler_flags)
+macro(tdcl_set_compiler_flags)
   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}")
     bz_remove_cxx_flag("-DPACKAGE_NO_EXPORT" "${build_type}")
     if(MSVC)
-      bz_add_cxx_flag("/EHa /wd4068 /DARBTREGN_PKG /DTRDCL_AUTOLINK_OFF /DTRDCLENGN_EXPORTS" "${build_type}")
-      bz_set_MTMTd_cxx_flag("${build_type}")
+      bz_remove_cxx_flag("/EHsc" "${build_type}")
+      bz_remove_cxx_flag("/EHs" "${build_type}")
+      bz_remove_cxx_flag("/MDd" "${build_type}")
+      bz_remove_cxx_flag("/MTd" "${build_type}")
+      bz_remove_cxx_flag("/MD" "${build_type}")
+      bz_remove_cxx_flag("/MT" "${build_type}")
+      bz_add_cxx_flag(" /nologo /W3 /WX- /Oy- /EHa /errorReport:prompt" "${build_type}")
+      bz_add_cxx_flag(" /fp:precise /Zc:wchar_t /Zc:forScope /GS /Gd" "${build_type}")
+      bz_add_cxx_flag(" /wd4068 /wd4275 /wd4819 /wd4251" "${build_type}")
+      bz_remove_cxx_flag("-DUNICODE"  "${build_type}")
+      bz_remove_cxx_flag("/DUNICODE"  "${build_type}")
+      bz_remove_cxx_flag("-D_UNICODE" "${build_type}")
+      bz_remove_cxx_flag("/D_UNICODE" "${build_type}")
+      bz_remove_cxx_flag("-DMBCS"     "${build_type}")
+      bz_remove_cxx_flag("/DMBCS"     "${build_type}")
+      bz_remove_cxx_flag("-D_MBCS"    "${build_type}")
+      bz_remove_cxx_flag("/D_MBCS"    "${build_type}")
     else()
-      bz_add_cxx_flag("-fPIC -fabi-version=2 -fexceptions -finput-charset=utf-8" "${build_type}")
-      bz_add_cxx_flag("-fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -frtti" "${build_type}")
-      if(NOT MINGW)
-        bz_add_cxx_flag("-DLINUX" "${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}")
+      if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        bz_add_cxx_flag("-std=c++11 -Wno-unknown-pragmas -Wno-char-subscripts -Wno-deprecated-register" "${build_type}")
       endif()
+      bz_add_cxx_flag("-fPIC -fexceptions -fno-omit-frame-pointer" "${build_type}")
+      bz_add_cxx_flag("-fno-strict-aliasing -fpermissive -frtti" "${build_type}")
+      bz_add_cxx_flag("-D_MBCS" "${build_type}")
     endif()
   endforeach()
-  if(MINGW)
-    add_definitions(-DWIN32)
-    add_definitions(-D_WIN32)
+  if(MSVC)
+    bz_add_cxx_flag(" /ZI /Od /Ob0 /Gm /RTC1" "_DEBUG")
+    bz_add_cxx_flag(" /Zi /Ox /Oi /GL /Gm- /Gy" "_RELEASE")
   endif()
 endmacro()
 endif()

data/build/common/transactd_cl_output.cmake

@@ -22,26 +22,68 @@
 if(NOT COMMAND tdcl_set_output)
 macro(tdcl_set_output TRANSACTD_BINARY_ROOT prefix)
   if(WIN32)
-    set_target_properties(${this_target} PROPERTIES
-      RUNTIME_OUTPUT_DIRECTORY "${TRANSACTD_BINARY_ROOT}/bin"
-      LIBRARY_OUTPUT_DIRECTORY "${TRANSACTD_BINARY_ROOT}/bin"
-      ARCHIVE_OUTPUT_DIRECTORY "${TRANSACTD_BINARY_ROOT}/lib")
-    if(MSVC)
-      transactd_make_msvc_install_file("${TRANSACTD_BINARY_ROOT}")
-      add_custom_command(TARGET ${this_target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -P
-        ${CMAKE_CURRENT_BINARY_DIR}/msvc_install_$<CONFIGURATION>.cmake)
-    endif()
+    tdcl_set_output_win(${TRANSACTD_BINARY_ROOT})
   else()
+    set(TDCL_TMP_PREFIX "${prefix}")
     if("${prefix}" STREQUAL "")
-      install(TARGETS ${this_target} LIBRARY DESTINATION /usr/lib)
-    else()
-      install(TARGETS ${this_target} LIBRARY DESTINATION "${prefix}")
+      set(TDCL_TMP_PREFIX "/usr/lib")
+    endif()
+    install(TARGETS ${this_target} LIBRARY DESTINATION "${TDCL_TMP_PREFIX}")
+    # if APPLE and bundle module, install symlinks
+    if(APPLE AND (NOT ("${${this_target}_CREATE_SIMLINK_CMAKE}" STREQUAL "")))
+      install(PROGRAMS "${${this_target}_LINK_PATH_1}" "${${this_target}_LINK_PATH_2}"
+        DESTINATION "${TDCL_TMP_PREFIX}")
     endif()
   endif()
 endmacro()
 endif()
 
+# set install filenames for Mac OSX
+if(NOT COMMAND tdcl_set_outputnames_osx)
+macro(tdcl_set_outputnames_osx TD_OSX_BASE TD_OSX_MAJOR TD_OSX_MINOR TD_OSX_RELEASE TRANSACTD_ROOT)
+  if(APPLE)
+    # set target binary suffix
+    set_target_properties(${this_target} PROPERTIES SUFFIX
+      ".${TD_OSX_MAJOR}.${TD_OSX_MINOR}.${TD_OSX_RELEASE}.so")
+    # get binary output location
+    get_property(${this_target}_BIN_LOC TARGET ${this_target} PROPERTY LOCATION)
+    get_filename_component(TDCL_TMP_BINDIR "${${this_target}_BIN_LOC}" DIRECTORY)
+    # target and symlinks name
+    set(BZ_SYML_TARGET_NAME
+        "${TD_OSX_BASE}.${TD_OSX_MAJOR}.${TD_OSX_MINOR}.${TD_OSX_RELEASE}.so")
+    set(BZ_SYML_LINK_NAME_1
+        "${TD_OSX_BASE}.${TD_OSX_MAJOR}.${TD_OSX_MINOR}.so")
+    file(TO_CMAKE_PATH "${TDCL_TMP_BINDIR}/${BZ_SYML_LINK_NAME_1}" BZ_SYML_LINK_PATH_1)
+    file(TO_CMAKE_PATH "${TDCL_TMP_BINDIR}/${TD_OSX_BASE}.so"      BZ_SYML_LINK_PATH_2)
+    set(${this_target}_LINK_PATH_1 "${BZ_SYML_LINK_PATH_1}")
+    set(${this_target}_LINK_PATH_2 "${BZ_SYML_LINK_PATH_2}")
+    # set post build command to make symlinks
+    set(${this_target}_CREATE_SIMLINK_CMAKE
+      "${CMAKE_CURRENT_BINARY_DIR}/create_symlink.cmake")
+    configure_file("${TRANSACTD_ROOT}/build/common/create_symlink.cmake.in"
+      "${${this_target}_CREATE_SIMLINK_CMAKE}")
+    add_custom_command(TARGET ${this_target} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -P ${${this_target}_CREATE_SIMLINK_CMAKE})
+  endif()
+endmacro()
+endif()
+
+# set install pathes for Windows
+if(NOT COMMAND tdcl_set_output_win)
+macro(tdcl_set_output_win TRANSACTD_BINARY_ROOT)
+  set_target_properties(${this_target} PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${TRANSACTD_BINARY_ROOT}/bin"
+    LIBRARY_OUTPUT_DIRECTORY "${TRANSACTD_BINARY_ROOT}/bin"
+    ARCHIVE_OUTPUT_DIRECTORY "${TRANSACTD_BINARY_ROOT}/lib")
+  if(MSVC)
+    transactd_make_msvc_install_file("${TRANSACTD_BINARY_ROOT}")
+    add_custom_command(TARGET ${this_target} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -P
+      ${CMAKE_CURRENT_BINARY_DIR}/msvc_install_$<CONFIGURATION>.cmake)
+  endif()
+endmacro()
+endif()
+
 
 # ==========================================================
 #   transactd_set_exe_output

data/build/common/transactd_common.cmake

@@ -16,6 +16,20 @@
 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
 #   02111-1307, USA.
 ##=================================================================
+# ==========================================================
+#   Version infomation macro
+# ==========================================================
+if(NOT COMMAND transactd_ver_info_lic)
+macro(transactd_ver_info_lic)
+  if(TRANSACTD_COMMERCIAL)
+    set(TRANSACTD_VER_POSTFIX "(Commercial)")
+  else()
+    set(TRANSACTD_VER_POSTFIX "(GPL V2)")
+  endif()
+endmacro()
+endif()
+
+
 # ==========================================================
 #   make subdir, copy CMakeLists.txt and BUILDNUMBER.txt
 # ==========================================================
@@ -112,32 +126,6 @@ endmacro()
 endif()
 
 
-# ==========================================================
-#   read simple version variables
-#       file format like: VARIABLENAME   VALUE
-#                         VARIABLENAME2  VALUE2
-# ==========================================================
-if(NOT COMMAND transactd_read_variables)
-macro(transactd_read_variables TRANSACTD_VAR_FILE)
-  file(READ "${TRANSACTD_VAR_FILE}" tmp_contents)
-  string(REGEX REPLACE "\n" ";" tmp_contents "${tmp_contents}")
-  string(REGEX REPLACE ";+$" "" tmp_contents "${tmp_contents}")
-  string(REGEX REPLACE " +" " " tmp_contents "${tmp_contents}")
-  foreach(tmp_line ${tmp_contents})
-    string(REGEX REPLACE " " ";" tmp_list "${tmp_line}")
-    list(LENGTH tmp_list tmp_list_len)
-    if("${tmp_list_len}" STREQUAL "2")
-      list (GET tmp_list 0 tmp_varname)
-      string(REGEX REPLACE "^\"(.*)\"$" "\\1" tmp_varname "${tmp_varname}")
-      list (GET tmp_list 1 tmp_value)
-      string(REGEX REPLACE "^\"(.*)\"$" "\\1" tmp_value "${tmp_value}")
-      set(TDREAD_${tmp_varname} "${tmp_value}")
-    endif()
-  endforeach()
-endmacro()
-endif()
-
-
 # ==========================================================
 #   generate rc file
 # ==========================================================
@@ -179,6 +167,70 @@ endmacro()
 endif()
 
 
+# ==========================================================
+#   transactd_set_MTMD
+# ==========================================================
+if(NOT COMMAND transactd_set_MTMD)
+macro(transactd_set_MTMD MT_OR_MD)
+  if(MSVC)
+    string(TOUPPER "${MT_OR_MD}" MT_OR_MD)
+    if( (NOT ("${MT_OR_MD}" STREQUAL "MT")) AND
+        (NOT ("${MT_OR_MD}" STREQUAL "MD")))
+      message(ERROR "[${MT_OR_MD}] is invalid. Please specify MT or MD.")
+    endif()
+    foreach(build_type "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
+      set(CMAKE_CXX_FLAGS${build_type}_BEFORE_${this_target} "${CMAKE_CXX_FLAGS${build_type}}")
+      string(REGEX REPLACE "/MTd" " "
+        CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}}")
+      string(REGEX REPLACE "/MDd" " "
+        CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}}")
+      string(REGEX REPLACE "/MT" " "
+        CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}}")
+      string(REGEX REPLACE "/MD" " "
+        CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}}")
+      if("${CMAKE_CXX_FLAGS${build_type}}" MATCHES "(.* )?/D_DEBUG( .*)?$")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS${build_type}} /${MT_OR_MD}d")
+      else()
+        set(CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}} /${MT_OR_MD}")
+      endif()
+    endforeach()
+  endif()
+endmacro()
+endif()
+
+
+# ==========================================================
+#   transactd_reset_MTMD
+# ==========================================================
+if(NOT COMMAND transactd_reset_MTMD)
+macro(transactd_reset_MTMD)
+  if(MSVC)
+    foreach(build_type "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
+      set(CMAKE_CXX_FLAGS${build_type} "${CMAKE_CXX_FLAGS${build_type}_BEFORE_${this_target}}")
+    endforeach()
+  endif()
+endmacro()
+endif()
+
+
+# ==========================================================
+#   transactd_has_MTMD_option
+# ==========================================================
+if(NOT COMMAND transactd_has_MTMD_option)
+macro(transactd_has_MTMD_option option_string)
+  set(transactd_has_MTMD_option_return OFF)
+  if(MSVC)
+    if( ("${option_string}" MATCHES "(.* )?/MT( .*)?$") OR
+        ("${option_string}" MATCHES "(.* )?/MTd( .*)?$") OR
+        ("${option_string}" MATCHES "(.* )?/MD( .*)?$") OR
+        ("${option_string}" MATCHES "(.* )?/MDd( .*)?$") )
+      set(transactd_has_MTMD_option_return ON)
+    endif()
+  endif()
+endmacro()
+endif()
+
+
 # ==========================================================
 #   transactd_link_boost_libraries MACRO
 #     boost_components  : "system;chrono;thread;filesystem"
@@ -222,14 +274,37 @@ macro(transactd_link_boost_libraries boost_components)
     if("${CMAKE_CONFIGURATION_TYPES}" STREQUAL "")
       set(CMAKE_CONFIGURATION_TYPES Debug Release RelWithDebInfo MinSizeRel)
     endif()
+    # find boost libraries with project compile flag
+    get_property(TMP_${this_target}_COMPILE_FLAGS
+      TARGET ${this_target} PROPERTY COMPILE_FLAGS)
+    transactd_has_MTMD_option("${TMP_${this_target}_COMPILE_FLAGS}")
+    if("${transactd_has_MTMD_option_return}" STREQUAL "ON")
+      get_boost_libs_from_compiler_flags("${TMP_${this_target}_COMPILE_FLAGS}")
+      set(boost_libs_for_${this_target} "${get_boost_libs_from_compiler_flags_return}")
+    else()
+      set(boost_libs_for_${this_target} "")
+    endif()
+    set(boost_libs_listlen 0)
     # buildtype-specified libraries
     foreach(BT_NAME "" ${CMAKE_CONFIGURATION_TYPES})
       if(NOT("${BT_NAME}" STREQUAL ""))
         set(BT_NAME "_${BT_NAME}")
         string(TOUPPER "${BT_NAME}" BT_NAME)
       endif()
-      get_boost_libs_from_CXXFLAGS("${CMAKE_CXX_FLAGS${BT_NAME}}")
-      set(boost_libs_for${BT_NAME} "${get_boost_libs_from_CXXFLAGS_return}")
+      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}")
+      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()
+      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})
       if(${boost_libs_listlen${BT_NAME}} GREATER ${boost_libs_listlen})
@@ -246,9 +321,11 @@ macro(transactd_link_boost_libraries boost_components)
             set(BT_NAME "_${BT_NAME}")
             string(TOUPPER "${BT_NAME}" BT_NAME)
           endif()
-          list(GET boost_libs_for${BT_NAME} ${i} boost_lib_tmp)
-          set_property(TARGET boostlibs_for_${this_target}_${idx} PROPERTY
-            IMPORTED_IMPLIB${BT_NAME} "${boost_lib_tmp}")
+          if(NOT("${boost_libs_for${BT_NAME}}" STREQUAL ""))
+            list(GET boost_libs_for${BT_NAME} ${i} boost_lib_tmp)
+            set_property(TARGET boostlibs_for_${this_target}_${idx} PROPERTY
+              IMPORTED_IMPLIB${BT_NAME} "${boost_lib_tmp}")
+          endif()
         endforeach()
         if(NOT "${boost_components}" STREQUAL "")
           target_link_libraries(${this_target} boostlibs_for_${this_target}_${idx})