openbabel 2.3.2.1 → 2.3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4c03f43400bcca6ea043742d88a91f0ffb4b27
-  data.tar.gz: d716ff0e870245cd5566b6c9e338fdd640a9eb17
+  metadata.gz: aa9ca323e851eb2489c30ea3a98525d6cfe5a8bd
+  data.tar.gz: 0dad9d0991e79009b2407354f6cb474d0d13f5cc
 SHA512:
-  metadata.gz: 1d76d501a8d0f959d27ed0e1be4b9ec997f0deadd2f8ca658f99f93635d09bde8908298c7ca109ff36985a8ab248b32aaeda91c18d9935ee4680601dddbb04c5
-  data.tar.gz: 070471fa2298ad01ad3d8c5fb028b7d6a6093b07a7e778930658e65febf469b3fee6844315c176c050c67b8f6afdd21b708341ecaff8aad53844a90c4d5910c9
+  metadata.gz: 17debcb6ddd41aec78f9e864a1a52dea8fa3e2fc6d1285bd29f28a767c6542ae4d73b5f1c2dfa63629fb7e6f77c806a166b6b200cea4ad84d3bc3e9708ea5169
+  data.tar.gz: e8c75b99138f95b7d44c7184feb7ca8ea7a5cdd543ac0acfe17444fac9d99f3a37f88280f0ab192cff7d947e2962017d9abd0920895f7829d125ec2eab6b4577

data/ext/openbabel/extconf.rb

@@ -1,83 +1,57 @@
 require 'fileutils'
-require 'mkmf'
 require 'rbconfig'
-$:.unshift File.expand_path('../../../lib', __FILE__)
-require 'openbabel/version'
+require 'mkmf'
+
+main_dir = File.expand_path(File.join(File.dirname(__FILE__),"..",".."))
 
-ob_num_ver = OpenBabel::VERSION
-ob_ver     = "openbabel-"+ob_num_ver
+# install OpenBabel
 
-RUBY=File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+openbabel_version = "2.3.2"
 
-main_dir = File.expand_path(File.join(File.dirname(__FILE__),"..",".."))
-src_dir = File.join main_dir, ob_ver
-build_dir = File.join main_dir, "build"
-install_dir = main_dir 
+openbabel_dir = File.join main_dir, "openbabel"
+src_dir = openbabel_dir 
+build_dir = File.join src_dir, "build"
+install_dir = openbabel_dir 
 install_lib_dir = File.join install_dir, "lib"
-lib_dir = File.join main_dir, "lib", "openbabel"
+lib_dir = File.join openbabel_dir, "lib", "openbabel"
 ruby_src_dir = File.join src_dir, "scripts", "ruby"
 
 begin
-  nr_processors = `grep processor /proc/cpuinfo | wc -l` # speed up compilation, Linux only
+  nr_processors = `getconf _NPROCESSORS_ONLN`.to_i # should be POSIX compatible
 rescue
   nr_processors = 1
 end
 
-begin
-  Dir.chdir main_dir do
-    FileUtils.rm_rf src_dir
-    puts "Downloading OpenBabel sources"
-    system "curl -L -d use_mirror=netcologne 'http://downloads.sourceforge.net/project/openbabel/openbabel/#{ob_num_ver}/openbabel-#{ob_num_ver}.tar.gz' | tar xz"
-    system "sed -i -e 's/-Wl,-flat_namespace//;s/-flat_namespace//' #{File.join ruby_src_dir, "extconf.rb"}" # remove unrecognized compiler option
-    system "sed -i -e 's/Init_OpenBabel/Init_openbabel/g' #{File.join ruby_src_dir,"*cpp"}" # fix swig bindings
-    system "sed  -i -e 's/Config::CONFIG/RbConfig::CONFIG/' #{File.join src_dir, "scripts", "CMakeLists.txt" }" # fix Ruby Config
-    system "sed  -i -e 's/Config::CONFIG/RbConfig::CONFIG/' #{File.join ruby_src_dir, "extconf.rb" }" # fix Ruby Config
-  end
-  FileUtils.mkdir_p build_dir
-  FileUtils.mkdir_p install_dir
-  Dir.chdir build_dir do
-    puts "Configuring OpenBabel"
-    cmake = "cmake #{src_dir} -DCMAKE_INSTALL_PREFIX=#{install_dir} -DBUILD_GUI=OFF -DENABLE_TESTS=OFF -DRUBY_BINDINGS=ON"
-    # set rpath for local installations
-    # http://www.cmake.org/Wiki/CMake_RPATH_handling
-    # http://vtk.1045678.n5.nabble.com/How-to-force-cmake-not-to-remove-install-rpath-td5721193.html
-    cmake += " -DCMAKE_INSTALL_RPATH:STRING=\"#{install_lib_dir}\"" unless have_library('openbabel')
-    system cmake
-  end
-  unless have_library('openbabel')
-    # local installation in gem directory
-    Dir.chdir build_dir do
-      puts "OpenBabel not installed. Compiling sources."
-      system "make -j#{nr_processors}"
-      system "make install"
-      ENV["PKG_CONFIG_PATH"] = File.dirname(File.expand_path(Dir["#{install_dir}/**/openbabel*pc"].first))
-    end
-  end
-  # compile ruby bindings
-  puts "Compiling and installing OpenBabel Ruby bindings."
-  Dir.chdir ruby_src_dir do
-    # fix rpath
-    system "sed -i 's|with_ldflags.*$|with_ldflags(\"#\$LDFLAGS -dynamic -Wl,-rpath,#{install_lib_dir}\") do|' #{File.join(ruby_src_dir,'extconf.rb')}" unless have_library('openbabel')
-    # get include and lib from pkg-config
-    ob_include=`pkg-config openbabel-2.0 --cflags-only-I`.sub(/\s+/,'').sub(/-I/,'')
-    ob_lib=`pkg-config openbabel-2.0 --libs-only-L`.sub(/\s+/,'').sub(/-L/,'')
-    system "#{RUBY} extconf.rb --with-openbabel-include=#{ob_include} --with-openbabel-lib=#{ob_lib}"
-    system "make -j#{nr_processors}"
-  end
-  FileUtils.cp(ruby_src_dir+"/openbabel.#{RbConfig::CONFIG["DLEXT"]}", "./")
-	File.open('Makefile', 'w') do |makefile|
-		makefile.write <<"EOF"
-.PHONY: openbabel.#{RbConfig::CONFIG["DLEXT"]}
-openbabel.#{RbConfig::CONFIG["DLEXT"]}:
-	chmod 755 openbabel.#{RbConfig::CONFIG["DLEXT"]}
+FileUtils.mkdir_p openbabel_dir
+Dir.chdir main_dir do
+  FileUtils.rm_rf src_dir
+  puts "Downloading OpenBabel sources"
+  system "git clone https://github.com/openbabel/openbabel.git"
+end
+
+FileUtils.mkdir_p build_dir
+FileUtils.mkdir_p install_dir
+Dir.chdir build_dir do
+  puts "Configuring OpenBabel"
+  cmake = "cmake #{src_dir} -DCMAKE_INSTALL_PREFIX=#{install_dir} -DBUILD_GUI=OFF -DENABLE_TESTS=OFF -DRUN_SWIG=ON -DRUBY_BINDINGS=ON"
+  # set rpath for local installations
+  # http://www.cmake.org/Wiki/CMake_RPATH_handling
+  # http://vtk.1045678.n5.nabble.com/How-to-force-cmake-not-to-remove-install-rpath-td5721193.html
+  cmake += " -DCMAKE_INSTALL_RPATH:STRING=\"#{install_lib_dir}\"" 
+  system cmake
+end
 
-.PHONY: install
-install:
-	mkdir -p #{lib_dir}
-	mv openbabel.#{RbConfig::CONFIG["DLEXT"]} #{lib_dir}
-EOF
-  FileUtils.remove_entry_secure src_dir, build_dir
-	end
-ensure
-  # Do NOT remove scr_dir and build_dir after build fails, they are necessary for debugging.
+# local installation in gem directory
+Dir.chdir build_dir do
+  puts "Compiling OpenBabel sources."
+  system "make -j#{nr_processors}"
+  system "make install"
+  ENV["PKG_CONFIG_PATH"] = File.dirname(File.expand_path(Dir["#{install_dir}/**/openbabel*pc"].first))
 end
+
+# create a fake Makefile
+File.open(File.join(File.dirname(__FILE__),"Makefile"),"w+") do |makefile|
+  makefile.puts "all:\n\ttrue\n\ninstall:\n\ttrue\n"
+end
+
+$makefile_created = true

data/lib/openbabel.rb

@@ -1,4 +1,4 @@
-require 'openbabel/openbabel'
+require_relative '../openbabel/lib/openbabel'
 require 'openbabel/version'
 # http://sourceforge.net/mailarchive/message.php?msg_id=31065700
 OpenBabel::OBConversion.new # required to load plugins

data/lib/openbabel/version.rb

@@ -1,4 +1,4 @@
 module OpenBabel
   VERSION = '2.3.2'
-  GEMVERSION = VERSION + '.1'
+  GEMVERSION = VERSION + '.2'
 end

data/test/test_openbabel.rb

@@ -1,7 +1,5 @@
 require 'test/unit'
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-$:.unshift File.expand_path('../../ext', __FILE__)
 require 'openbabel'
 include OpenBabel
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openbabel
 version: !ruby/object:Gem::Version
-  version: 2.3.2.1
+  version: 2.3.2.2
 platform: ruby
 authors:
 - Andreas Maunz, Christoph Helma, Katsuhiko Nishimra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies: []
 description: OpenBabel as a GEM
 email:
@@ -26,7 +26,7 @@ files:
 - test/test_openbabel.rb
 homepage: http://github.com/opentox/openbabel-gem
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: OpenBabel!