tiny_tds 1.3.0-x86-mingw32 → 2.0.0.pre1-x86-mingw32

data/lib/tiny_tds.rb

@@ -7,6 +7,7 @@ require 'tiny_tds/version'
 require 'tiny_tds/error'
 require 'tiny_tds/client'
 require 'tiny_tds/result'
+require 'tiny_tds/gem'
 
 # Support multiple ruby versions, fat binaries under Windows.
 if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
@@ -14,9 +15,12 @@ if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
   # Set the PATH environment variable, so that the DLLs can be found.
   old_path = ENV['PATH']
   begin
-    # Do the same host consolidation as in extconf.rb
-    ports_dir = RbConfig::CONFIG['host'].gsub('i686-pc-mingw32', 'i686-w64-mingw32')
-    ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
+    ENV['PATH'] = [
+      TinyTds::Gem.ports_bin_paths,
+      TinyTds::Gem.ports_lib_paths,
+      old_path
+    ].flatten.join File::PATH_SEPARATOR
+
     require "tiny_tds/#{ver}/tiny_tds"
   rescue LoadError
     require 'tiny_tds/tiny_tds'
@@ -27,7 +31,8 @@ else
   # Load dependent shared libraries into the process, so that they are already present,
   # when tiny_tds.so is loaded. This ensures, that shared libraries are loaded even when
   # the path is different between build and run time (e.g. Heroku).
-  ports_libs = File.expand_path("../../ports/#{RbConfig::CONFIG['host']}/lib/*.so", __FILE__)
+  ports_libs = File.join(TinyTds::Gem.ports_root_path,
+                         "#{RbConfig::CONFIG['host']}/lib/*.so")
   Dir[ports_libs].each do |lib|
     require 'fiddle'
     Fiddle.dlopen(lib)

data/lib/tiny_tds/bin.rb

@@ -1,40 +1,39 @@
 require_relative './version'
+require_relative './gem'
 require 'shellwords'
 
 module TinyTds
   class Bin
 
-    ROOT  = File.expand_path '../../..', __FILE__
-    PATHS = ENV['PATH'].split File::PATH_SEPARATOR
-    EXTS  = (ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']) | ['.exe']
-
     attr_reader :name
 
     class << self
-
       def exe(name, *args)
         bin = new(name)
         puts bin.info unless args.any? { |x| x == '-q' }
         bin.run(*args)
       end
-
     end
 
     def initialize(name)
+      @root = Gem.root_path
+      @exts = (ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']) | ['.exe']
+
       @name = name
       @binstub = find_bin
       @exefile = find_exe
     end
 
     def run(*args)
-      return nil unless path
-      Kernel.system Shellwords.join(args.unshift(path))
-      $CHILD_STATUS.to_i
+      with_ports_paths do
+        return nil unless path
+        Kernel.system Shellwords.join(args.unshift(path))
+        $CHILD_STATUS.to_i
+      end
     end
 
     def path
-      return @path if defined?(@path)
-      @path = @exefile && File.exist?(@exefile) ? @exefile : which
+      @path ||= @exefile && File.exist?(@exefile) ? @exefile : which
     end
 
     def info
@@ -43,22 +42,43 @@ module TinyTds
 
     private
 
+    def search_paths
+      ENV['PATH'].split File::PATH_SEPARATOR
+    end
+
+    def with_ports_paths
+      old_path = ENV['PATH']
+
+      begin
+        ENV['PATH'] = [
+          Gem.ports_bin_paths,
+          old_path
+        ].flatten.join File::PATH_SEPARATOR
+
+        yield if block_given?
+      ensure
+        ENV['PATH'] = old_path
+      end
+    end
+
     def find_bin
-      File.join ROOT, 'bin', name
+      File.join @root, 'bin', name
     end
 
     def find_exe
-      EXTS.each do |ext|
-        f = File.join ROOT, 'exe', "#{name}#{ext}"
-        return f if File.exist?(f)
+      Gem.ports_bin_paths.each do |bin|
+        @exts.each do |ext|
+          f = File.join bin, "#{name}#{ext}"
+          return f if File.exist?(f)
+        end
       end
       nil
     end
 
     def which
-      PATHS.each do |path|
-        EXTS.each do |ext|
-          exe = File.expand_path File.join(path, "#{name}#{ext}"), ROOT
+      search_paths.each do |path|
+        @exts.each do |ext|
+          exe = File.expand_path File.join(path, "#{name}#{ext}"), @root
           next if exe == @binstub
           next unless File.executable?(exe)
           next unless binary?(exe)
@@ -80,6 +100,5 @@ module TinyTds
       s = s.encode('US-ASCII', undef: :replace).split(//)
       ((s.size - s.grep(' '..'~').size) / s.size.to_f) > 0.30
     end
-
   end
 end

data/lib/tiny_tds/gem.rb

@@ -0,0 +1,32 @@
+require 'rbconfig'
+
+module TinyTds
+  module Gem
+    class << self
+      def root_path
+        File.expand_path '../../..', __FILE__
+      end
+
+      def ports_root_path
+        File.join(root_path,'ports')
+      end
+
+      def ports_bin_paths
+        Dir.glob(File.join(ports_root_path,ports_host,'**','bin'))
+      end
+
+      def ports_lib_paths
+        Dir.glob(File.join(ports_root_path,ports_host,'**','lib'))
+      end
+
+      def ports_host
+        h = RbConfig::CONFIG['host']
+
+        # Our fat binary builds with a i686-w64-mingw32 toolchain
+        # but ruby for windows x32-mingw32 reports i686-pc-mingw32
+        # so correct the host here
+        h.gsub('i686-pc-mingw32', 'i686-w64-mingw32')
+      end
+    end
+  end
+end

data/patches/libiconv/1.14/1-avoid-gets-error.patch

@@ -0,0 +1,17 @@
+--- a/srclib/stdio.in.h	2017-01-22 01:23:00.000000000 -0400
++++ b/srclib/stdio.in.h	2017-01-22 01:24:00.000000000 -0400
+@@ -695,8 +695,14 @@
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
++# ifdef __GLIBC_PREREQ 
++#  if !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#  endif
++# endif
++#endif
+ #endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

data/tasks/native_gem.rake

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+desc 'Build the windows binary gems per rake-compiler-dock'
+task 'gem:windows' => ['ports:cross'] do
+  require 'rake_compiler_dock'
+
+  # make sure to install our bundle
+  build = ['bundle']
+
+  # and finally build the native gem
+  build << 'rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 CFLAGS="-Wall"'
+
+  RakeCompilerDock.sh build.join(' && ')
+end

data/tasks/package.rake

@@ -0,0 +1,8 @@
+# encoding: UTF-8
+require 'rubygems/package_task'
+
+Gem::PackageTask.new(SPEC) do |pkg|
+  pkg.need_tar = false
+  pkg.need_zip = false
+end
+

data/tasks/ports.rake

@@ -0,0 +1,84 @@
+# encoding: UTF-8
+require 'mini_portile2'
+require 'fileutils'
+require_relative 'ports/libiconv'
+require_relative 'ports/openssl'
+require_relative 'ports/freetds'
+require_relative '../ext/tiny_tds/extconsts'
+
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if defined? OpenSSL
+
+namespace :ports do
+  openssl = Ports::Openssl.new(OPENSSL_VERSION)
+  libiconv = Ports::Libiconv.new(ICONV_VERSION)
+  freetds = Ports::Freetds.new(FREETDS_VERSION)
+
+  directory "ports"
+
+  task :openssl, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    openssl.files = [OPENSSL_SOURCE_URI]
+    openssl.host = args.host
+    openssl.cook
+    openssl.activate
+  end
+
+  task :libiconv, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    libiconv.files = [ICONV_SOURCE_URI]
+    libiconv.host = args.host
+    libiconv.cook
+    libiconv.activate
+  end
+
+  task :freetds, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    freetds.files = [FREETDS_SOURCE_URI]
+    freetds.host = args.host
+
+    if openssl
+      # freetds doesn't have an option that will provide an rpath
+      # so we do it manually
+      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{openssl.path}/lib"
+      freetds.configure_options << "--with-openssl=#{openssl.path}"
+    end
+
+    if libiconv
+      freetds.configure_options << "--with-libiconv-prefix=#{libiconv.path}"
+    end
+
+    freetds.cook
+    freetds.activate
+  end
+
+  task :compile, [:host] do |task,args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    puts "Compiling ports for #{args.host}..."
+
+    ['openssl','libiconv','freetds'].each do |lib|
+      Rake::Task["ports:#{lib}"].invoke(args.host)
+    end
+  end
+
+  desc 'Build the ports windows binaries via rake-compiler-dock'
+  task 'cross' do
+    require 'rake_compiler_dock'
+
+    # make sure to install our bundle
+    build = ['bundle']
+
+    # build the ports for all our cross compile hosts
+    GEM_PLATFORM_HOSTS.each do |gem_platform, host|
+      build << "rake ports:compile[#{host}]"
+    end
+
+    RakeCompilerDock.sh build.join(' && ')
+  end
+end
+
+desc 'Build ports and activate libraries for the current architecture.'
+task :ports => ['ports:compile']

data/tasks/ports/freetds.rb

@@ -0,0 +1,37 @@
+require_relative './recipe'
+
+module Ports
+  class Freetds < Recipe
+    def initialize(version)
+      super('freetds', version)
+
+      set_patches
+    end
+
+    private
+
+    def configure_defaults
+      opts = super
+
+      opts << '--with-pic'
+      opts << '--disable-odbc'
+
+      if version =~ /0\.91/
+        opts << '--with-tdsver=7.1'
+      else
+        opts << '--with-tdsver=7.3'
+      end
+
+      if windows?
+        opts << '--sysconfdir=C:\Sites'
+        opts << '--enable-sspi'
+      end
+
+      opts
+    end
+
+    def set_patches
+      self.patch_files.concat get_patches(name, version)
+    end
+  end
+end

data/tasks/ports/libiconv.rb

@@ -0,0 +1,43 @@
+require_relative './recipe'
+
+module Ports
+  class Libiconv < Recipe
+    def initialize(version)
+      super('libiconv', version)
+
+      set_patches
+    end
+
+    def cook
+      chdir_for_build do
+        super
+      end
+      self
+    end
+
+    private
+
+    # When using rake-compiler-dock on Windows, the underlying Virtualbox shared
+    # folders don't support symlinks, but libiconv expects it for a build on
+    # Linux. We work around this limitation by using the temp dir for cooking.
+    def chdir_for_build
+      build_dir = ENV['RCD_HOST_RUBY_PLATFORM'].to_s =~ /mingw|mswin|cygwin/ ? '/tmp' : '.'
+      Dir.chdir(build_dir) do
+        yield
+      end
+    end
+
+    def configure_defaults
+      [
+        "--host=#{@host}",
+        '--disable-static',
+        '--enable-shared',
+        'CFLAGS=-fPIC -O2'
+      ]
+    end
+
+    def set_patches
+      self.patch_files.concat get_patches(name, version)
+    end
+  end
+end

data/tasks/ports/openssl.rb

@@ -0,0 +1,75 @@
+require_relative './recipe'
+
+module Ports
+  class Openssl < Recipe
+    def initialize(version)
+      super('openssl', version)
+
+      set_patches
+    end
+
+    def configure
+      return if configured?
+
+      md5_file = File.join(tmp_path, 'configure.md5')
+      digest   = Digest::MD5.hexdigest(computed_options.to_s)
+      File.open(md5_file, "w") { |f| f.write digest }
+
+      # Windows doesn't recognize the shebang so always explicitly use sh
+      execute('configure', "sh -c \"./Configure #{computed_options.join(' ')}\"")
+    end
+
+    def install
+      unless installed?
+        execute('install', %Q(#{make_cmd} install_sw install_ssldirs))
+      end
+    end
+
+    private
+
+    def execute(action, command, options={})
+      prev_path = ENV['PATH']
+      if host =~ /mingw/
+        git_perl = 'C:/Program Files/Git/usr/bin'
+        if File.directory?(git_perl)
+          ENV['PATH'] = "#{git_perl}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+          ENV['PERL'] = 'perl'
+        end
+      end
+
+      super
+      ENV['PATH'] = prev_path
+    end
+
+    def configure_defaults
+      opts = [
+        'shared',
+        target_arch
+      ]
+
+      if cross_build?
+        opts << "--cross-compile-prefix=#{host}-"
+      end
+
+      opts
+    end
+
+    def target_arch
+      if windows?
+        arch = ''
+        arch = '64' if host=~ /x86_64/
+
+        "mingw#{arch}"
+      else
+        arch = 'x32'
+        arch = 'x86_64' if host=~ /x86_64/
+
+        "linux-#{arch}"
+      end
+    end
+
+    def set_patches
+      self.patch_files.concat get_patches(name, version)
+    end
+  end
+end