fxruby 1.6.32.pre1-x86-mingw32 → 1.6.32.pre2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e5e7cd46f52afe225d1e85ad3decbef00cb7dbd
-  data.tar.gz: 941c719f951e7f0c93ccb3e1c58eb45bbbd6c689
+  metadata.gz: e59b61f4c365d40f67de2544c6fcdcc811b65f01
+  data.tar.gz: 2bec786ad90d8c0ee2ec2fb38bec16ee2199e80e
 SHA512:
-  metadata.gz: eab80d0e82739585e6c944a039e2521054a9d0e2eed04f3951fabb8ba74182f5e6e738554b33073c876901f80b8c3119b83c0d183cbd43e60eeb169d0ab30ffb
-  data.tar.gz: 450524756d456a2e1864522c68f78cf76495dc63d8c6056f924e863bf1b3e95025e2b3dcc5c976770807126aebf12f9db6602fa38de317565702a058caf05df3
+  metadata.gz: 2b74fd7152adb6301a088483b2778df1a3dd7d14b360327c187bde113e208494470a31baedec248a76b15934959d9ab0b96547ad345064c2ee88a41c0af69ecc
+  data.tar.gz: b51e58802b0f274676d7482130a5fcf3be5ab8ef494221138c86b7ee6025bc937d486e690180cb1c3fe5183d6a1d75e3372bd404920034802f42ed1ee90bb8ce

data/History.txt

@@ -3,6 +3,8 @@
 * Avoid call to rb_class2name() during GC. Fixes #21
 * Use release mode, unless extconf.rb is called with --enable-debug,
   so that all FXTRACE() and FXASSERT() calls are skiped, per default.
+* Remove self made GC detection by ruby's rb_during_gc().
+* Fix Windows binary x86-mingw32.gem for Ruby versions < 2.0
 
 === 1.6.31 / 2015-07-21
 

data/Rakefile

@@ -98,19 +98,33 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
 
   # Add dependent DLLs to the cross gems
   ext.cross_compiling do |spec|
-    plat = spec.platform
-    dlls = Dir["tmp/#{plat}/#{ext.name}/*/*.dll"].map{|dll| File.basename(dll) }.uniq
-    spec.files += dlls.map{|dll| "lib/#{plat}/#{dll}" }
-
-    directory "tmp/#{plat}/stage/lib/#{plat}/"
-    dlls.each do |dll|
-      ENV['RUBY_CC_VERSION'].to_s.split(':').last.tap do |ruby_version|
-        file "tmp/#{plat}/stage/lib/#{plat}/#{dll}" => ["tmp/#{plat}/stage/lib/#{plat}/", "tmp/#{plat}/#{ext.name}/#{ruby_version}/#{dll}"] do
-          cp "tmp/#{plat}/#{ext.name}/#{ruby_version}/#{dll}", "tmp/#{plat}/stage/lib/#{plat}"
-          sh "x86_64-w64-mingw32-strip", "tmp/#{plat}/stage/lib/#{plat}/#{dll}"
+    platform_host_map =  {
+      'x86-mingw32' => ['i586-mingw32msvc', 'i686-w64-mingw32'],
+      'x64-mingw32' => ['x86_64-w64-mingw32'],
+    }
+
+    gemplat = spec.platform.to_s
+    platform_host_map[gemplat].each do |host|
+
+      gcc_shared_dlls = %w[libwinpthread-1.dll libgcc_s_dw2-1.dll libgcc_s_sjlj-1.dll libgcc_s_seh-1.dll libstdc++-6.dll]
+
+      dlls = gcc_shared_dlls.select{|dll| File.exist?("ports/#{host}/bin/#{dll}") }
+      dlls += [
+          "libfxscintilla-20.dll",
+          "libFOX-1.6-0.dll",
+          "libjpeg-8.dll",
+          "libpng15-15.dll",
+          "libtiff-5.dll",
+          "zlib1.dll",
+      ]
+
+      spec.files += dlls.map{|dll| "ports/#{host}/bin/#{dll}" }
+
+      dlls.each do |dll|
+        task "ports/#{host}/bin/#{dll}" do |t|
+          sh "x86_64-w64-mingw32-strip", t.name
         end
       end
-      file "lib/#{plat}/#{dll}" => "tmp/#{plat}/stage/lib/#{plat}/#{dll}"
     end
   end
 end

data/ext/fox16_c/extconf.rb

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require 'mkmf'
+require 'mini_portile'
 
 def find_installed_fox_version
   stddirs = ["/usr/include/fox-1.6",
@@ -103,19 +104,64 @@ LIBFOX_SOURCE_URI         = "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION
 LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
 LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
 
+
+class BuildRecipe < MiniPortile
+  def initialize(name, version, files)
+    super(name, version)
+    self.files = files
+    self.target = File.expand_path('../../../ports', __FILE__)
+    # Prefer host_alias over host in order to use i586-mingw32msvc as
+    # correct compiler prefix for cross build, but use host if not set.
+    self.host = consolidated_host(RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"])
+    self.patch_files = Dir[File.join(self.target, "patches", self.name, self.version, "*.diff")].sort
+  end
+
+  def consolidated_host(name)
+    name.gsub('i686-pc-mingw32', 'i586-mingw32msvc')
+  end
+
+  def configure_defaults
+    [
+      "--host=#{host}",    # build for specific target (host)
+      "--disable-static",
+      "--enable-shared",
+    ]
+  end
+
+  def port_path
+    "#{target}/#{host}"
+  end
+
+  # 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 cook_and_activate
+    checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    unless File.exist?(checkpoint)
+      chdir_for_build do
+        self.cook
+      end
+      FileUtils.touch checkpoint
+    end
+    self.activate
+    self
+  end
+end
+
 def do_rake_compiler_setup
   if enable_config("win32-cross")
     require 'mini_portile'
 
     dir_config("installed")
 
-    host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
-    libz_recipe = MiniPortile.new("libz", LIBZ_VERSION).tap do |recipe|
-      recipe.files = [LIBZ_SOURCE_URI]
-      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
-      # Prefer host_alias over host in order to use i586-mingw32msvc as
-      # correct compiler prefix for cross build, but use host if not set.
-      recipe.host = host
+    libz_recipe = BuildRecipe.new("libz", LIBZ_VERSION, [LIBZ_SOURCE_URI]).tap do |recipe|
       class << recipe
         def configure
           Dir.chdir work_path do
@@ -145,91 +191,30 @@ def do_rake_compiler_setup
         end
       end
 
-      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
-      unless File.exist?(checkpoint)
-        recipe.cook
-        FileUtils.touch checkpoint
-      end
-      recipe.activate
+      recipe.cook_and_activate
     end
 
-    libpng_recipe = MiniPortile.new("libpng", LIBPNG_VERSION).tap do |recipe|
-      recipe.files = [LIBPNG_SOURCE_URI]
-      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
-      # Prefer host_alias over host in order to use i586-mingw32msvc as
-      # correct compiler prefix for cross build, but use host if not set.
-      recipe.host = host
-      recipe.configure_options = [
-        "--host=#{recipe.host}",
-        "--enable-shared",
-        "--disable-static",
-        ]
-
-      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
-      unless File.exist?(checkpoint)
-        with_env(
-          'CPPFLAGS' => "-I#{libz_recipe.path}/include",
-          'LDFLAGS' => "-L#{libz_recipe.path}/lib"
-        ) do
-          recipe.cook
-          FileUtils.touch checkpoint
-        end
+    libpng_recipe = BuildRecipe.new("libpng", LIBPNG_VERSION, [LIBPNG_SOURCE_URI]).tap do |recipe|
+      with_env(
+        'CPPFLAGS' => "-I#{libz_recipe.path}/include",
+        'LDFLAGS' => "-L#{libz_recipe.path}/lib"
+      ) do
+        recipe.cook_and_activate
       end
-      recipe.activate
     end
 
-    libjpeg_recipe = MiniPortile.new("libjpeg", LIBJPEG_VERSION).tap do |recipe|
-      recipe.files = [LIBJPEG_SOURCE_URI]
-      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
-      # Prefer host_alias over host in order to use i586-mingw32msvc as
-      # correct compiler prefix for cross build, but use host if not set.
-      recipe.host = host
-      recipe.configure_options = [
-        "--host=#{recipe.host}",
-        "--enable-shared",
-        "--disable-static",
-        ]
-
-      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
-      unless File.exist?(checkpoint)
-        recipe.cook
-        FileUtils.touch checkpoint
-      end
-      recipe.activate
+    libjpeg_recipe = BuildRecipe.new("libjpeg", LIBJPEG_VERSION, [LIBJPEG_SOURCE_URI]).tap do |recipe|
+      recipe.cook_and_activate
     end
 
-    libtiff_recipe = MiniPortile.new("libtiff", LIBTIFF_VERSION).tap do |recipe|
-      recipe.files = [LIBTIFF_SOURCE_URI]
-      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
-      # Prefer host_alias over host in order to use i586-mingw32msvc as
-      # correct compiler prefix for cross build, but use host if not set.
-      recipe.host = host
-      recipe.configure_options = [
-        "--host=#{recipe.host}",
-        "--enable-shared",
-        "--disable-static",
-        ]
-
-      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
-      unless File.exist?(checkpoint)
-        recipe.cook
-        FileUtils.touch checkpoint
-      end
-      recipe.activate
+    libtiff_recipe = BuildRecipe.new("libtiff", LIBTIFF_VERSION, [LIBTIFF_SOURCE_URI]).tap do |recipe|
+      recipe.cook_and_activate
     end
 
-    libfox_recipe = MiniPortile.new("libfox", LIBFOX_VERSION).tap do |recipe|
-      recipe.files = [LIBFOX_SOURCE_URI]
-      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
-      # Prefer host_alias over host in order to use i586-mingw32msvc as
-      # correct compiler prefix for cross build, but use host if not set.
-      recipe.host = host
-      recipe.configure_options = [
-        "--host=#{recipe.host}",
+    libfox_recipe = BuildRecipe.new("libfox", LIBFOX_VERSION, [LIBFOX_SOURCE_URI]).tap do |recipe|
+      recipe.configure_options += [
         "--without-xft",
         "--without-x",
-        "--enable-shared",
-        "--disable-static",
         enable_config("debug") ? "--enable-debug" : "--enable-release",
         ]
       class << recipe
@@ -239,30 +224,15 @@ def do_rake_compiler_setup
         end
       end
 
-      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
-      unless File.exist?(checkpoint)
-        with_env(
-          "CPPFLAGS" => "-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include",
-          "LDFLAGS" => "-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib"
-        ) do
-          recipe.cook
-          FileUtils.touch checkpoint
-        end
+      with_env(
+        "CPPFLAGS" => "-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include",
+        "LDFLAGS" => "-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib"
+      ) do
+        recipe.cook_and_activate
       end
-      recipe.activate
     end
 
-    libfxscintills_recipe = MiniPortile.new("libfxscintilla", LIBFXSCINTILLA_VERSION).tap do |recipe|
-      recipe.files = [LIBFXSCINTILLA_SOURCE_URI]
-      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
-      # Prefer host_alias over host in order to use i586-mingw32msvc as
-      # correct compiler prefix for cross build, but use host if not set.
-      recipe.host = host
-      recipe.configure_options = [
-        "--host=#{recipe.host}",
-        "--enable-shared",
-        "--disable-static",
-        ]
+    libfxscintills_recipe = BuildRecipe.new("libfxscintilla", LIBFXSCINTILLA_VERSION, [LIBFXSCINTILLA_SOURCE_URI]).tap do |recipe|
       class << recipe
         attr_accessor :libfox_path
         def mk
@@ -282,44 +252,27 @@ def do_rake_compiler_setup
       end
       recipe.libfox_path = libfox_recipe.path
 
-      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
-      unless File.exist?(checkpoint)
-        with_env(
-          'PKG_CONFIG_PATH' => "#{libfox_recipe.path}/lib/pkgconfig"
-        ) do
-          recipe.cook
-          FileUtils.touch checkpoint
-        end
+      with_env(
+        'PKG_CONFIG_PATH' => "#{libfox_recipe.path}/lib/pkgconfig"
+      ) do
+        recipe.cook_and_activate
       end
-      recipe.activate
     end
     $autodetected_fxscintilla = true
 
     dir_config('libfox', "#{libfox_recipe.path}/include/fox-1.6", "#{libfox_recipe.path}/lib")
     dir_config('libfxscintilla', "#{libfxscintills_recipe.path}/include/fxscintilla", "#{libfxscintills_recipe.path}/lib")
 
-    shared_dlls = [
-        "#{libfxscintills_recipe.path}/bin/libfxscintilla-20.dll",
-        "#{libfox_recipe.path}/bin/libFOX-1.6-0.dll",
-        "#{libjpeg_recipe.path}/bin/libjpeg-8.dll",
-        "#{libpng_recipe.path}/bin/libpng15-15.dll",
-        "#{libtiff_recipe.path}/bin/libtiff-5.dll",
-        "#{libz_recipe.path}/bin/zlib1.dll",
-      ]
-    shared_dlls.each do |dll|
-      FileUtils.cp dll, '.', verbose: true
-    end
-
     gcc_shared_dlls = %w[libwinpthread-1.dll libgcc_s_dw2-1.dll libgcc_s_sjlj-1.dll libgcc_s_seh-1.dll libstdc++-6.dll]
     gcc_shared_dlls.each do |dll|
-      cmd = "#{CONFIG['CC']} -print-file-name=#{dll}"
+      cmd = "#{CONFIG['CC']} -print-file-name=\"#{dll}\""
       res = `#{cmd}`.chomp
       next if dll == res
       puts "#{cmd} => #{res}"
-      FileUtils.cp `#{cmd}`.chomp, '.', verbose: true
+      FileUtils.cp `#{cmd}`.chomp, "#{libfox_recipe.path}/bin/", verbose: true
     end
 
-    CONFIG['CXX'] = "#{host}-g++" # CXX setting must be prefixed for cross build
+    CONFIG['CXX'] = "#{libfox_recipe.host}-g++" # CXX setting must be prefixed for cross build
     CONFIG['CC'] += "\nCXX=#{CONFIG['CXX']}" # Hack CXX into Makefile for cross compilation
     CONFIG['LDSHARED'].gsub!('gcc', 'g++') # ensure C++ linker is used, so that libstdc++ is linked static
     $LDFLAGS += " -s" # remove symbol table informations from shared lib

data/lib/fox16.rb

@@ -6,11 +6,17 @@ rescue LoadError
     major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
       raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
 
-    # Set the PATH environment variable, so that libpq.dll can be found.
+    # Set the PATH environment variable, so that the DLLs can be found.
     old_path = ENV['PATH']
-    ENV['PATH'] = "#{File.expand_path("../#{RUBY_PLATFORM.gsub("i386", "x86")}", __FILE__)};#{old_path}"
-    require "#{major_minor}/fox16_c"
-    ENV['PATH'] = old_path
+    begin
+      ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32') do
+        major_minor < '2.0' ? 'i586-mingw32msvc' : 'i686-w64-mingw32'
+      end
+      ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
+      require "#{major_minor}/fox16_c"
+    ensure
+      ENV['PATH'] = old_path
+    end
   else
     raise
   end

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.32.pre1"
+    "1.6.32.pre2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.32.pre1
+  version: 1.6.32.pre2
 platform: x86-mingw32
 authors:
 - Lyle Johnson
@@ -491,15 +491,21 @@ files:
 - lib/fox16/tkcompat.rb
 - lib/fox16/undolist.rb
 - lib/fox16/version.rb
-- lib/x86-mingw32/libFOX-1.6-0.dll
-- lib/x86-mingw32/libfxscintilla-20.dll
-- lib/x86-mingw32/libgcc_s_sjlj-1.dll
-- lib/x86-mingw32/libjpeg-8.dll
-- lib/x86-mingw32/libpng15-15.dll
-- lib/x86-mingw32/libstdc++-6.dll
-- lib/x86-mingw32/libtiff-5.dll
-- lib/x86-mingw32/libwinpthread-1.dll
-- lib/x86-mingw32/zlib1.dll
+- ports/i586-mingw32msvc/bin/libFOX-1.6-0.dll
+- ports/i586-mingw32msvc/bin/libfxscintilla-20.dll
+- ports/i586-mingw32msvc/bin/libjpeg-8.dll
+- ports/i586-mingw32msvc/bin/libpng15-15.dll
+- ports/i586-mingw32msvc/bin/libtiff-5.dll
+- ports/i586-mingw32msvc/bin/zlib1.dll
+- ports/i686-w64-mingw32/bin/libFOX-1.6-0.dll
+- ports/i686-w64-mingw32/bin/libfxscintilla-20.dll
+- ports/i686-w64-mingw32/bin/libgcc_s_sjlj-1.dll
+- ports/i686-w64-mingw32/bin/libjpeg-8.dll
+- ports/i686-w64-mingw32/bin/libpng15-15.dll
+- ports/i686-w64-mingw32/bin/libstdc++-6.dll
+- ports/i686-w64-mingw32/bin/libtiff-5.dll
+- ports/i686-w64-mingw32/bin/libwinpthread-1.dll
+- ports/i686-w64-mingw32/bin/zlib1.dll
 - rdoc-sources/FX4Splitter.rb
 - rdoc-sources/FX7Segment.rb
 - rdoc-sources/FXAccelTable.rb