transactd 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d4476167db8386d79022f49d8623266044df1b
-  data.tar.gz: 0e646030abc99d95589be9851a6c9ee9f2a8317a
+  metadata.gz: 2da0b9038e2306c9fb2404d8c8a519daf1481628
+  data.tar.gz: 4a86fa655c4da1ffa828dba27504271c2c073eb0
 SHA512:
-  metadata.gz: c8c1e2b9d5e81cf7fe8b02ffb59775a72bfabf7337fca99ef59b092f63ff805cced4d671292f28054bfd6266f4d2495869b5ceba05cb7b6ed1ccea2b242c1214
-  data.tar.gz: f8b2ea5deece11ed0584277dd654badec464b5fd49acf9bfc4e6fb520f16935272b6817b7aff39be1601373844bc49174a74350a9106598b509ccbdce00ac080
+  metadata.gz: 9b8441f3548c3ae079603917df147555c61593733a8cf4305a08ffec57be89a387de84024acff57042682e0fa492d6e55d39b7d45ea97e85b36d9bef4d3b1c54
+  data.tar.gz: 9e3442bee7906a55c8997e7ab9a79008670d86200d7a005f7d562b29e15d0b78776a265591f88ccc746a9dfa819d8d54339bfc0e33d800f77b721089804bad35

data/build/common/transactd_common.cmake

@@ -56,16 +56,18 @@ endif()
 if(NOT COMMAND transactd_read_build_number)
 macro(transactd_read_build_number TRANSACTD_ROOT)
   if(WIN32)
-    set(${this_target}_BuildNumber_path "${TRANSACTD_ROOT}/build/${this_target}/BUILDNUMBER.txt")
-    if(EXISTS "${${this_target}_BuildNumber_path}")
-      file(STRINGS "${${this_target}_BuildNumber_path}" TRANSACTD_BUILD_NUMBER_PRE)
-      MATH(EXPR TRANSACTD_BUILD_NUMBER "${TRANSACTD_BUILD_NUMBER_PRE} + 1")
-      file(WRITE "${${this_target}_BuildNumber_path}" "${TRANSACTD_BUILD_NUMBER}")
-      message(STATUS "${this_target} increment build number : ${TRANSACTD_BUILD_NUMBER_PRE} -> ${TRANSACTD_BUILD_NUMBER}")
-    else()
+    set(${this_target}_BN_PATH "${TRANSACTD_ROOT}/build/${this_target}/BUILDNUMBER.txt")
+    
+    transactd_read_file_to_int("${${this_target}_BN_PATH}")
+    set(TD_BUILD_NUMBER_PRE "${TRANSACTD_READ_FILE_TO_INT_RETURN}")
+    MATH(EXPR TRANSACTD_BUILD_NUMBER "${TD_BUILD_NUMBER_PRE} + 1")
+    if (TRANSACTD_BUILD_NUMBER LESS 1)
       set(TRANSACTD_BUILD_NUMBER 1)
-      message(STATUS "${this_target} BUILDNUMBER.txt not found so BuildNumber = ${TRANSACTD_BUILD_NUMBER}")
+      message(STATUS "${this_target} BUILDNUMBER.txt is invalid so BuildNumber = 1")
+    else()
+      message(STATUS "${this_target} increment build number : ${TD_BUILD_NUMBER_PRE} -> ${TRANSACTD_BUILD_NUMBER}")
     endif()
+    file(WRITE "${${this_target}_BN_PATH}" "${TRANSACTD_BUILD_NUMBER}")
   else()
     set(TRANSACTD_BUILD_NUMBER 1)
   endif()
@@ -73,6 +75,22 @@ endmacro()
 endif()
 
 
+# ==========================================================
+#   read file to integer
+# ==========================================================
+if(NOT COMMAND transactd_read_file_to_int)
+macro(transactd_read_file_to_int TD_READ_PATH)
+  set(TRANSACTD_READ_FILE_TO_INT_RETURN -1)
+  if(EXISTS "${TD_READ_PATH}")
+    file(STRINGS "${TD_READ_PATH}" TRANSACTD_READ_FILE_TO_INT_RETURN)
+    MATH(EXPR TRANSACTD_READ_FILE_TO_INT_RETURN "${TRANSACTD_READ_FILE_TO_INT_RETURN} + 0")
+  else()
+    message(STATUS "${TD_READ_PATH} not found.")
+  endif()
+endmacro()
+endif()
+
+
 # ==========================================================
 #   read version
 # ==========================================================

data/build/tdclrb/CMakeLists.txt

@@ -71,6 +71,8 @@ endif()
 # version info
 # ==========================================================
 transactd_read_version("${TRANSACTD_ROOT}")
+transactd_read_file_to_int("${TRANSACTD_ROOT}/build/tdclrb/GEM_RELEASE_VERSION")
+set(TDVER_RUBY_RELEASE "${TRANSACTD_READ_FILE_TO_INT_RETURN}")
 transactd_read_build_number("${TRANSACTD_ROOT}")
 set(TDVER_RUBY_BUILD "${TRANSACTD_BUILD_NUMBER}")
 
@@ -130,8 +132,8 @@ if(WIN32)
   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}.${TDVER_RUBY_BUILD}"
-    P_VER   "${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_CPP_INTERFACE_VER_RELEASE}.${TDVER_RUBY_BUILD}"
+    F_VER   "${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_RUBY_RELEASE}.${TDVER_RUBY_BUILD}"
+    P_VER   "${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_RUBY_RELEASE}.${TDVER_RUBY_BUILD}"
     P_NAME  "Transactd Client ${TRANSACTD_VER_POSTFIX}"
     F_DESC  "Transactd Ruby client"
   )
@@ -210,7 +212,7 @@ endif()
 if(UNIX)
   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})
+    VERSION ${TDVER_CPP_INTERFACE_VER_MAJOR}.${TDVER_CPP_INTERFACE_VER_MINOR}.${TDVER_RUBY_RELEASE})
 endif()
 
 

data/build/tdclrb/GEM_RELEASE_VERSION

@@ -0,0 +1 @@
+1

data/build/tdclrb/gem/Makefile.win32-VS

@@ -40,6 +40,8 @@ if ERRORLEVEL 1 (
 
 if "%~1" == "install" goto :INSTALLCMD
 if "%~1" == "site-install" goto :INSTALLCMD
+if "%~2" == "install" goto :INSTALLCMD
+if "%~2" == "site-install" goto :INSTALLCMD
 exit /b 0
 
 :INSTALLCMD

data/source/bzs/test/tdclphp/bench.php

@@ -214,7 +214,7 @@ function readRange($db, $tb) {
     $start = 1;
     while ($start < RECORD_COUNT) {
         $tb->clearBuffer();
-        $tb->setFilter('*', 1, RECORD_COUNT);
+        $tb->setFilter('*', 1, RECORD_UNIT);
         $tb->setFV(FDI_ID, $start);
         $tb->find(Bz\table::findForword);
         for ($i = $start; $i < $start + RECORD_UNIT; $i++) {
@@ -235,7 +235,7 @@ function readRangeSnapshot($db, $tb) {
     $start = 1;
     while ($start < RECORD_COUNT) {
         $tb->clearBuffer();
-        $tb->setFilter('*', 1, RECORD_COUNT);
+        $tb->setFilter('*', 1, RECORD_UNIT);
         $tb->setFV(FDI_ID, $start);
         $tb->find(Bz\table::findForword);
         for ($i = $start; $i < $start + RECORD_UNIT; $i++) {

data/transactd.gemspec

@@ -27,7 +27,7 @@ spec_build = Gem::Specification.new do |s|
   s.homepage    = 'http://www.bizstation.jp/ja/transactd'
   s.license     = 'GPL v2'
   
-  # read version from tdapcapi.h
+  # read major/minor version from tdapcapi.h
   verfile = 'source/bzs/db/protocol/tdap/tdapcapi.h'
   unless File.exist?(verfile)
     raise 'Can not found ' + verfile
@@ -42,13 +42,21 @@ spec_build = Gem::Specification.new do |s|
     }
   }
   unless (versions.has_key?(:CPP_INTERFACE_VER_MAJOR) &&
-          versions.has_key?(:CPP_INTERFACE_VER_MINOR) &&
-          versions.has_key?(:CPP_INTERFACE_VER_RELEASE))
+          versions.has_key?(:CPP_INTERFACE_VER_MINOR))
     raise 'Can not read versions from ' + verfile
   end
+  # read release version from GEM_RELEASE_VERSION
+  verfile = 'build/tdclrb/GEM_RELEASE_VERSION'
+  unless File.exist?(verfile)
+    raise 'Can not found ' + verfile
+  end
+  File.open(verfile, "r") {|f|
+    l = f.read.gsub(/\s\n/, '')
+    versions[:GEM_RELEASE_VERSION] = Integer(l)
+  }
   s.version = versions[:CPP_INTERFACE_VER_MAJOR].to_s + '.' + 
               versions[:CPP_INTERFACE_VER_MINOR].to_s + '.' + 
-              versions[:CPP_INTERFACE_VER_RELEASE].to_s
+              versions[:GEM_RELEASE_VERSION].to_s
   
   binary_file = File.join('bin', RUBY_VERSION.match(/\d+\.\d+/)[0], 'transactd.so')
   binarymode = File.exist?(binary_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp
@@ -323,6 +323,7 @@ files:
 - build/tdclrb/gem/Makefile.win32-VS
 - build/tdclrb/gem/transactd.rb
 - build/tdclrb/gem_output.cmake
+- build/tdclrb/GEM_RELEASE_VERSION
 - ./BUILD_UNIX-JA
 - ./BUILD_WIN-JA
 - ./CMakeLists.txt