transactd 2.0.1-x64-mswin64-100 → 2.1.0-x64-mswin64-100

data/transactd.gemspec

@@ -27,36 +27,22 @@ spec_build = Gem::Specification.new do |s|
   s.homepage    = 'http://www.bizstation.jp/ja/transactd'
   s.license     = 'GPL v2'
   
-  # read major/minor version from tdapcapi.h
-  verfile = 'source/bzs/db/protocol/tdap/tdapcapi.h'
-  unless File.exist?(verfile)
-    raise 'Can not found ' + verfile
-  end
-  versions = {}
+  # read version from tdclrb.rc
+  verfile = 'build/tdclrb/tdclrb.rc'
+  raise 'Can not found ' + verfile unless File.exist?(verfile)
+  verpattern = /^[\t ]*VALUE[\t ]+"ProductVersion"[\t ]*,[\t ]*"([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)"[\t\r ]*$/i
+  ver_str = ''
   File.open(verfile, "r") {|f|
     f.each_line { |l|
-      if l.index("Build marker! Don't remove") != nil
-        l = l.sub(/#define/, '').sub(/\/\/.*$/, '').gsub('"', '').strip().split(/\s/)
-        versions[l[0].to_sym] = Integer(l[1]) if l.length == 2
+      m = verpattern.match(l)
+      if m != nil
+        ver_str = m[1].split('.').slice(0..2).join('.')
+        break
       end
     }
   }
-  unless (versions.has_key?(:CPP_INTERFACE_VER_MAJOR) &&
-          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[:GEM_RELEASE_VERSION].to_s
+  raise 'Can not read versions from ' + verfile + ' (' + ver_str + ')' if ver_str.length == 0
+  s.version = ver_str
   
   binary_file = File.join('bin', RUBY_VERSION.match(/\d+\.\d+/)[0], 'transactd.so')
   binarymode = File.exist?(binary_file)
@@ -83,8 +69,9 @@ spec_build = Gem::Specification.new do |s|
     s.files       = ['CMakeLists.txt']
     s.files      += Dir.glob('bin/common/*.dll') + Dir.glob('bin/common/*.so')
     s.files      += Dir.glob('source/**/*') + Dir.glob('build/common/**/*')
-    s.files      += Dir.glob('build/swig/**/*') + Dir.glob('build/tdclc/**/*')
-    s.files      += Dir.glob('build/tdclcpp/**/*') + Dir.glob('build/tdclrb/**/*')
+    s.files      += Dir.glob('build/swig/*') + Dir.glob('build/swig/ruby/*')
+    s.files      += Dir.glob('build/swig/ruby/**/*') + Dir.glob('build/tdclrb/**/*')
+    s.files      += Dir.glob('build/tdclc/**/*') + Dir.glob('build/tdclcpp/**/*')
     s.files      += Dir.glob('./*')
     if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
       # add prebuilt binary

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: x64-mswin64-100
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp
@@ -20,8 +20,8 @@ files:
 - bin/2.0/transactd.so
 - bin/2.1/transactd.so
 - build/tdclrb/bldgem/extconf.rb
-- bin/common/tdclcpp_vc100_64mr_2_0.dll
-- bin/common/tdclc_64_2_0.dll
+- bin/common/tdclcpp_vc100_64mr_2_1.dll
+- bin/common/tdclc_64_2_1.dll
 - build/tdclrb/gem/detect.rb
 - build/tdclrb/gem/helper.rb
 - build/tdclrb/gem/INSTALLLOG.win32