fxruby 1.6.35-x64-mingw32 → 1.6.36-x64-mingw32

data/ext/fox16_c/extconf.rb

@@ -6,86 +6,18 @@ require 'mkmf'
 gem 'mini_portile2', '~>2.1'
 require 'mini_portile2'
 
-def find_installed_fox_version
-  stddirs = ["/usr/include/fox-1.6",
-             "/usr/local/include/fox-1.6",
-             "/sw/include/fox-1.6",
-            "/opt/local/include/fox-1.6"]
-  usrdirs = []
-  ARGV.each do |arg|
-    if arg =~ /--with-fox-include/
-      option, value = arg.split('=')
-      usrdirs = [ value ] + usrdirs
-    end
-  end
-  incdirs = usrdirs + stddirs
-  incdirs.uniq! # remove duplicates
-
-  incdirs.each do |incdir|
-    filename = File.join(incdir, "fxver.h")
-    if FileTest.exist?(filename)
-      idircflag = "-I" + incdir
-      $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
-      return
-    end
-  end
-
-  # Couldn't find it; this should have been caught by the pre-config script
-  raise RuntimeError, "couldn't find FOX header files"
-end
-
 $autodetected_fxscintilla = false
 
-def find_installed_fxscintilla_version
-  stddirs = ["/usr/include/fxscintilla",
-             "/usr/local/include/fxscintilla",
-             "/sw/include/fxscintilla",
-	     "/opt/local/include/fxscintilla"]
-  usrdirs = []
-  ARGV.each do |arg|
-    if arg =~ /--with-fxscintilla-include/
-      option, value = arg.split('=')
-      usrdirs = [ value ] + usrdirs
-    end
-  end
-  incdirs = usrdirs + stddirs
-  incdirs.uniq! # remove duplicates
-
-  incdirs.each do |incdir|
-    filename = File.join(incdir, "FXScintilla.h")
-    if FileTest.exist?(filename)
-      $autodetected_fxscintilla = true
-      idircflag = "-I" + incdir
-      $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
-      return
-    end
-  end
-end
-
 def is_fxscintilla_build?
   # No means no
   return false if fxscintilla_support_suppressed?
 
   # Check arguments
-  args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) }
-  (args.length > 0) || $autodetected_fxscintilla
+  with_config("fxscintilla", false) || $autodetected_fxscintilla
 end
 
 def fxscintilla_support_suppressed?
-  ARGV.include? "--without-fxscintilla"
-end
-
-def with_env(hash)
-  hash.each do |k, v|
-    ENV[k] = v
-  end
-  begin
-    yield
-  ensure
-    hash.each do |k, v|
-      ENV.delete(k)
-    end
-  end
+  !with_config("fxscintilla", true)
 end
 
 # Stick at zlib-1.2.7 for compatibility to MSYS1 based RubyInstaller.
@@ -95,7 +27,7 @@ LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.26'
 LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
 
-LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '8d'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '9b'
 LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
 
 LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.7'
@@ -106,17 +38,20 @@ 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"
+# LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '3.5.2'
+# LIBFXSCINTILLA_SOURCE_URI         = "https://github.com/yetanothergeek/fxscintilla/archive/FXSCINTILLA-#{LIBFXSCINTILLA_VERSION.gsub(".","_")}.tar.gz"
 
 
 class BuildRecipe < MiniPortile
   def initialize(name, version, files)
     super(name, version)
     self.files = files
-    self.target = File.expand_path('../../../ports', __FILE__)
+    rootdir = File.expand_path('../../..', __FILE__)
+    self.target = File.join(rootdir, "ports")
     # 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
+    self.patch_files = Dir[File.join(rootdir, "patches", self.name, self.version, "*.diff")].sort
   end
 
   def consolidated_host(name)
@@ -196,12 +131,11 @@ def do_rake_compiler_setup
     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.configure_options += [
+        "CPPFLAGS=-I#{libz_recipe.path}/include",
+        "LDFLAGS=-L#{libz_recipe.path}/lib",
+      ]
+      recipe.cook_and_activate
     end
 
     libjpeg_recipe = BuildRecipe.new("libjpeg", LIBJPEG_VERSION, [LIBJPEG_SOURCE_URI]).tap do |recipe|
@@ -213,11 +147,14 @@ def do_rake_compiler_setup
     end
 
     libfox_recipe = BuildRecipe.new("libfox", LIBFOX_VERSION, [LIBFOX_SOURCE_URI]).tap do |recipe|
+      debug = enable_config("debug")
       recipe.configure_options += [
         "--without-xft",
         "--without-x",
-        enable_config("debug") ? "--enable-debug" : "--enable-release",
-        ]
+        debug ? "--enable-debug" : "--enable-release",
+        "CPPFLAGS=-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include -DUNICODE=1 #{debug ? "-ggdb" : ""}",
+        "LDFLAGS=-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib #{debug ? "-ggdb" : ""}",
+      ]
       class << recipe
         def compile
           # Add param -no-undefined to libtool to build a win32 shared lib
@@ -225,12 +162,7 @@ def do_rake_compiler_setup
         end
       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.cook_and_activate
     end
 
     libfxscintills_recipe = BuildRecipe.new("libfxscintilla", LIBFXSCINTILLA_VERSION, [LIBFXSCINTILLA_SOURCE_URI]).tap do |recipe|
@@ -240,6 +172,12 @@ def do_rake_compiler_setup
           "#{ENV['MAKE'] || "make"}"
         end
 
+#         # This can be uncommented when fxscintilla is used from the source repository.
+#         def configure
+#           execute "bootstrap", "./bootstrap.sh"
+#           super
+#         end
+
         def compile
           execute "compile_lexers", "cd lexers && #{mk}"
           execute "compile_lexlib", "cd lexlib && #{mk}"
@@ -253,13 +191,11 @@ def do_rake_compiler_setup
       end
       recipe.libfox_path = libfox_recipe.path
 
-      with_env(
-        'PKG_CONFIG_PATH' => "#{libfox_recipe.path}/lib/pkgconfig"
-      ) do
-        recipe.cook_and_activate
-      end
+      recipe.configure_options += [
+        "PKG_CONFIG_PATH=#{libfox_recipe.path}/lib/pkgconfig",
+      ]
+      recipe.cook_and_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")
@@ -277,6 +213,7 @@ def do_rake_compiler_setup
     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
+    $libs = append_library($libs, "fxscintilla")
 
   elsif RUBY_PLATFORM =~ /mingw/
     $CFLAGS = $CFLAGS + " -I/usr/local/include"
@@ -306,15 +243,11 @@ def do_rake_compiler_setup
   $libs = append_library($libs, "FOX-1.6")
   $INCFLAGS << " -I#{File.join(File.dirname(__FILE__), 'include')}"
   if is_fxscintilla_build?
-    FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
     $CPPFLAGS = $CPPFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
-    find_library("fxscintilla", nil) || find_library(":libfxscintilla.so.19", nil) || ($libs = append_library($libs, "fxscintilla"))
-  else
-    FileUtils.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exist?('scintilla_wrap.cpp')
   end
 
   checking_for("thread local variables") do
-    $defs.push( "-DHAVE___THREAD" ) if try_compile(<<-EOT)
+    $defs.push( "-DHAVE___THREAD" ) if try_compile <<-EOT
       __thread int x=1;
       #if defined(__MINGW32__)
         #include <windows.h>
@@ -342,7 +275,9 @@ dir_config('fox', '/usr/local/include/fox-1.6', '/usr/local/lib')
 dir_config('fxscintilla', '/usr/local/include/fxscintilla', '/usr/local/lib')
 
 unless enable_config("win32-cross")
-  find_installed_fox_version
+  checking_for "fox per pkg-config" do
+    pkg_config("fox")
+  end
 
   #
   # Check for FXScintilla header files, unless FXScintilla support has
@@ -350,13 +285,31 @@ unless enable_config("win32-cross")
   #
 
   unless fxscintilla_support_suppressed?
-    find_installed_fxscintilla_version
+    checking_for "fxscintilla per pkg-config" do
+      $autodetected_fxscintilla = pkg_config("fxscintilla")
+    end
+
+    unless $autodetected_fxscintilla
+      checking_for "fxscintilla on Ubuntu with missing libfxscintilla.so link" do
+        if find_library(":libfxscintilla.so.19", nil) && (cflags = RUBY_VERSION>="2.1" ? pkg_config("fxscintilla", "cflags") : `pkg-config --cflags fxscintilla`)
+          $CXXFLAGS += " " + cflags
+          $autodetected_fxscintilla = true
+        end
+      end
+    end
+  end
+  checking_for "fxscintilla build" do
+    is_fxscintilla_build?
   end
 end
 
-unless enable_config("debug")
+if enable_config("debug")
+  $CPPFLAGS += " -ggdb"
+  $LDFLAGS += " -ggdb"
+else
   $CPPFLAGS += " -DNDEBUG"
 end
+$CPPFLAGS += " -Wno-unused-function"
 
 # Platform-specific modifications
 do_rake_compiler_setup

data/ext/fox16_c/impl.cpp

@@ -652,6 +652,8 @@ IMPLEMENT_FXWINDOW_STUBS(FXRbMessageBox)
 IMPLEMENT_FXTOPWINDOW_STUBS(FXRbMessageBox)
 IMPLEMENT_FXDIALOGBOX_STUBS(FXRbMessageBox)
 
+/* Start stub implementations for class FXRbObjRegistry */
+
 /* Start stub implementations for class FXRbObject */
 IMPLEMENT_FXOBJECT_STUBS(FXRbObject)
 

data/ext/fox16_c/include/FXRbObjRegistry.h

@@ -0,0 +1,101 @@
+/***********************************************************************
+ * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
+ * Copyright (c) 2017-2017 by Lyle Johnson. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For further information please contact the author by e-mail
+ * at "lars@greiz-reinsdorf.de".
+ ***********************************************************************/
+
+#ifndef FXRBOBJREGISTRY_H
+#define FXRBOBJREGISTRY_H
+
+#include <ruby.h>
+#include "fx.h"
+
+extern "C" {
+  // Opaque type declaration for SWIG runtime support
+  struct swig_type_info;
+}
+
+class FXRbObjRegistry {
+
+  /**
+  * The FXRuby_Objects hash table basically maps C++ objects to Ruby instances.
+  * Each key in the table is a pointer to a C++ object we've seen before, and
+  * the corresponding value is an FXRubyObjDesc struct (see below) that tells
+  * us which Ruby instance corresponds to that C++ object.
+  */
+
+  st_table * FXRuby_Objects;
+
+  /**
+  * Each value in the FXRuby_Objects hash table is an instance of this
+  * struct. It identifies the Ruby instance associated with a C++ object.
+  * It also indicates whether this is merely a "borrowed" reference to
+  * some C++ object (i.e. it's not one we need to destroy later).
+  *
+  * in_gc is set for FXWindows that are in garbage collection and must
+  * not call ruby code anymore.
+  */
+
+  enum ObjType { own, borrowed, callback };
+
+  struct ObjDesc {
+    VALUE obj;
+    enum ObjType type;
+    bool in_gc;
+  };
+
+  const char * safe_rb_obj_classname(VALUE obj);
+
+public:
+
+  FXRbObjRegistry();
+
+  /**
+  * NewBorrowedObj() is a wrapper around SWIG_Ruby_NewPointerObj() that also
+  * registers this C++ object & Ruby instance pair in our FXRuby_Objects
+  * hash table. This function should only get called for methods that return
+  * a reference to an already-existing C++ object (i.e. one that FOX "owns")
+  * and for that reason we mark these objects as "borrowed".
+  */
+  VALUE NewBorrowedObj(void *ptr,swig_type_info* ty);
+
+  // Register this Ruby class instance
+  void RegisterRubyObj(VALUE rubyObj,const void* foxObj);
+
+  void UnregisterRubyObj(const void* foxObj, bool alsoOwned);
+
+  /**
+  * Return the registered Ruby class instance associated with this
+  * FOX object, or Qnil if not found.
+  */
+  VALUE GetRubyObj(const void *foxObj,bool alsoBorrowed, bool in_gc_mark=false);
+
+  /**
+  * FXRbIsBorrowed() returns true if the specified C++ object is one that
+  * FOX owns (i.e. it's borrowed).
+  */
+  bool IsBorrowed(void* ptr);
+
+  bool SetInGC(const void* ptr, bool enabled);
+  bool IsInGC(const void* ptr);
+
+  static FXRbObjRegistry main;
+};
+
+#endif

data/ext/fox16_c/include/FXRuby.h

@@ -86,7 +86,6 @@ void FXRbRegisterRubyObj(VALUE rubyObj, const void* foxObj);
 // Remove mapping for this FOX object and zero out any pointers
 // to this (now dead) C++ object held by any Ruby object
 void FXRbUnregisterRubyObj(const void* foxObj);
-void FXRbUnregisterRubyObj2(const void* foxObj, bool alsoOwned=true);
 void FXRbUnregisterBorrowedRubyObj(const void* foxObj);
 void FXRbUnregisterBorrowedRubyObj(FXlong foxObj);
 void FXRbUnregisterBorrowedRubyObj(FXString& foxObj);
@@ -110,7 +109,7 @@ void FXRbDestroyAppSensitiveObjects();
  * FOX object (if any). If searchBoth is false, only considers the
  * Ruby-owned objects; otherwise considers all outstanding references.
  */
-VALUE FXRbGetRubyObj(const void *foxObj, bool searchBoth, bool in_gc=false);
+VALUE FXRbGetRubyObj(const void *foxObj, bool searchBoth, bool in_gc_mark=false);
 
 /**
  * Return the registered Ruby class instance associated with this

data/ext/fox16_c/markfuncs.cpp

@@ -531,7 +531,6 @@ void FXRbTableItem::freefunc(FXTableItem* self){
 
 
 void FXRbTable::markfunc(FXTable* self){
-  register FXTableItem* item;
   FXRbScrollArea::markfunc(self);
   if(self){
     FXRbGcMark(self->FXTable::getFont());
@@ -539,7 +538,7 @@ void FXRbTable::markfunc(FXTable* self){
     FXRbGcMark(self->FXTable::getColumnHeaderFont());
     for(FXint row=0;row<self->FXTable::getNumRows();row++){
       for(FXint col=0;col<self->FXTable::getNumColumns();col++){
-        item=self->FXTable::getItem(row,col);
+        FXTableItem* item=self->FXTable::getItem(row,col);
         FXRbGcMark(item);
         }
       }

data/fxruby.gemspec

@@ -0,0 +1,53 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fox16/version'
+
+SWIG_MODULES = {
+  "core.i" => "core_wrap.cpp",
+  "dcmodule.i" => "dc_wrap.cpp",
+  "dialogs.i" => "dialogs_wrap.cpp",
+  "framesmodule.i" => "frames_wrap.cpp",
+  "iconlistmodule.i" => "iconlist_wrap.cpp",
+  "icons.i" => "icons_wrap.cpp",
+  "image.i" => "image_wrap.cpp",
+  "labelmodule.i" => "label_wrap.cpp",
+  "layout.i" => "layout_wrap.cpp",
+  "listmodule.i" => "list_wrap.cpp",
+  "mdi.i" => "mdi_wrap.cpp",
+  "menumodule.i" => "menu_wrap.cpp",
+  "fx3d.i" => "fx3d_wrap.cpp",
+  "scintilla.i" => "scintilla_wrap.cpp",
+  "table-module.i" => "table_wrap.cpp",
+  "text-module.i" => "text_wrap.cpp",
+  "treelist-module.i" => "treelist_wrap.cpp",
+  "ui.i" => "ui_wrap.cpp"
+}
+
+Gem::Specification.new do |spec|
+  spec.name          = "fxruby"
+  spec.version       = Fox.fxrubyversion
+  spec.authors       = ["Lyle Johnson", "Lars Kanis"]
+  spec.email         = ["lyle@lylejohnson.name", "lars@greiz-reinsdorf.de"]
+
+  spec.summary       = %q{FXRuby is the Ruby binding to the FOX GUI toolkit.}
+  spec.homepage      = "http://fxruby.org/"
+  spec.license       = 'LGPL-2.1'
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f=~/^fox-includes|^web/
+  end
+  spec.files += SWIG_MODULES.values.map{|f| File.join("ext/fox16_c", f) }
+  spec.files << 'ext/fox16_c/include/inlinestubs.h'
+  spec.files << 'ext/fox16_c/swigruby.h'
+  spec.files << 'doap.rdf'
+  spec.files << 'lib/fox16/kwargs.rb'
+
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions = ["ext/fox16_c/extconf.rb"]
+  spec.metadata['msys2_mingw_dependencies'] = 'fox'
+
+  spec.add_runtime_dependency 'mini_portile2', '~> 2.1'
+end