fxruby 1.6.28-x86-mingw32 → 1.6.29-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: d2d5a7e838ffbb025dc6f829d77df527c98bbafc
-  metadata.gz: d5801b4b7146ce705975270e067013563c65e741
-SHA512: 
-  data.tar.gz: 8d481648d5e950f2cbc418ea78a9a8d7e64c74b330d8156af55e313e7b267bb2938ff0d3313dd3376fd69f1426da71aec17a7904ec6a1f928b0baf2b7d1a7672
-  metadata.gz: 1f26f6fb4551ed5b22834d2a870c7a5dab1fa32cea61888e41e9c8285b1d3f0abc2b5acd4002a5f4f7995843d647a7be080e5b844d9452bbfcdf2ce31e41f34c
+---
+SHA1:
+  metadata.gz: 5623ef4817f21110e4c2d53053569acaaa6f2ce8
+  data.tar.gz: 29c507a0b45a9380fb745c337c56919477a2c15f
+SHA512:
+  metadata.gz: b02139de06f426f3a1e4ff172a67e6a4f276ac1d100e297ed3767cb7701ceec9458fda8f1b0acfff70813ff7e040f1976c098efb0e2bdf76c35c58054a4d2858
+  data.tar.gz: a2ce5927d1950531934f07cb855f9f4c05fec71f5a43d9c1d3de768721a00b74266040d94e8c72f6cd306b5c05c6222bde4f6f89d64b23f3466d79a1a5a14a66

data/.gitignore

@@ -6,7 +6,7 @@ ext/fox16_c/*_wrap.cpp
 ext/fox16_c/*.o
 ext/fox16_c/conftest.dSYM
 ext/fox16_c/include/inlinestubs.h
-ext/fox16_c/librb.c
+ext/fox16_c/swigruby.h
 ext/fox16_c/fox16.bundle
 ext/fox16_c/mkmf.log
 lib/fox16/kwargs.rb

data/History.txt

@@ -1,6 +1,18 @@
-=== 1.6.28 / 2013-06-28
+=== 1.6.29 / 2015-02-17
+
+* Add Windows binaries for Ruby-2.1 and 2.2.
+* Use shared libs for Windows binary gems to reduce gem size.
+* Allow non owned assignment of image data to FXImage derivations
+  without copy'ing pixel data.
+* Allow retrival of parts of the pixel data.
+* Fix namespace specifier for FXRGB in kwargs.rb.
+* Change GC'ing of TreeListBox and FXTreeItem. Fixes #10
+* Update to swig version 2.0 or newer. Fixes #13
+
+=== 1.6.28 / 2013-07-05
 
 * Fix build for Ruby-2.0.0-p127+
+* Update libraries for win32 build: libfox-1.6.49
 
 === 1.6.27 / 2013-04-05
 

data/Manifest.txt

@@ -5,7 +5,6 @@ History.txt
 Manifest.txt
 README.rdoc
 Rakefile
-Rakefile.cross
 TODO
 doap.rdf.erb
 examples/RAA.rb
@@ -1182,6 +1181,7 @@ test/TC_FXVec3d.rb
 test/TC_FXVec3f.rb
 test/TC_FXVec4f.rb
 test/TC_FXViewport.rb
+test/TC_FXWindow.rb
 test/TC_FXXBMIcon.rb
 test/TC_FXXBMImage.rb
 test/TC_FXXPMIcon.rb

data/Rakefile

@@ -3,7 +3,6 @@ require 'hoe'
 require 'erb'
 require 'rake/extensiontask'
 require './lib/fox16/version.rb'
-load 'Rakefile.cross'
 
 # Use forked process for chdir'ed environment, to allow parallel execution with drake
 module FileUtils
@@ -19,11 +18,9 @@ end
 
 # Some constants we'll need
 PKG_VERSION = Fox.fxrubyversion
-# TODO: Don't depend on cross compilation task
-FXSCINTILLA_INSTALL_DIR = Pathname( CrossLibraries.first.static_libfxscintilla_builddir ).expand_path
 
-SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig-1.3.22.exe" : "swig-1.3.22"
-SWIGFLAGS = "-fcompact -noruntime -c++ -ruby -no_default -I../fox-includes"
+SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig.exe" : "swig"
+SWIGFLAGS = "-c++ -ruby -nodefaultdtor -nodefaultctor -w302 -features compactdefaultargs -I../fox-includes"
 SWIG_LIB = `#{SWIG} -swiglib`.chomp
 SWIG_MODULES = {
   "core.i" => "core_wrap.cpp",
@@ -50,7 +47,7 @@ SWIG_MODULES = {
 hoe = Hoe.spec "fxruby" do
   # ... project specific data ...
   self.blog_categories = %w{FXRuby}
-  self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/include/swigrubyrun.h", "ext/fox16_c/*_wrap.cpp"]
+  self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/include/swigrubyrun.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp"]
   developer("Lyle Johnson", "lyle@lylejohnson.name")
   developer("Lars Kanis", "kanis@comcard.de")
   self.extra_rdoc_files = ["rdoc-sources", File.join("rdoc-sources", "README.rdoc")]
@@ -70,7 +67,7 @@ hoe = Hoe.spec "fxruby" do
   spec_extras[:files] = File.read_utf("Manifest.txt").split(/\r?\n\r?/).reject{|f| f=~/^fox-includes|^web/ }
   spec_extras[:files] += SWIG_MODULES.values.map{|f| File.join("ext/fox16_c", f) }
   spec_extras[:files] << 'ext/fox16_c/include/inlinestubs.h'
-  spec_extras[:files] << 'ext/fox16_c/librb.c'
+  spec_extras[:files] << 'ext/fox16_c/swigruby.h'
   spec_extras[:files] << 'doap.rdf'
   spec_extras[:files] << 'lib/fox16/kwargs.rb'
 end
@@ -92,28 +89,40 @@ task :test => [:compile]
 
 Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
   ext.cross_compile = true
-  ext.cross_platform = CrossLibraries.map &:ruby_platform
-
-  ext.cross_config_options += CrossLibraries.map do |lib|
-    {
-      lib.ruby_platform => [
-        "--with-fox-include=#{lib.static_installdir}/include/fox-1.6",
-        "--with-fxscintilla-include=#{lib.static_installdir}/include/fxscintilla",
-        "--with-installed-include=#{lib.static_installdir}/include",
-        "--with-installed-lib=#{lib.static_installdir}/lib",
-        "--enable-win32-static-build",
-        "--with-fxscintilla",
-      ]
-    }
+  ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
+
+  ext.cross_config_options += [
+      "--enable-win32-cross",
+      "--with-fxscintilla",
+    ]
+
+  # 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}"
+        end
+      end
+      file "lib/#{plat}/#{dll}" => "tmp/#{plat}/stage/lib/#{plat}/#{dll}"
+    end
   end
-
 end
 
-CrossLibraries.each do |lib|
-  ENV['RUBY_CC_VERSION'].split(":").each do |ruby_version|
-    task "copy:fox16_c:#{lib.ruby_platform}:#{ruby_version}" do |t|
-      sh "#{lib.host_platform}-strip -S tmp/#{lib.ruby_platform}/stage/lib/#{ruby_version[0,3]}/fox16_c.so"
-    end
+# To reduce the gem file size strip mingw32 dlls before packaging
+ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
+  task "tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so" do |t|
+    sh "i686-w64-mingw32-strip -S tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so"
+  end
+
+  task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so" do |t|
+    sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so"
   end
 end
 
@@ -145,20 +154,14 @@ namespace :swig do
     sed wrapper_src_file_name
   end
 
-  task :swig_librb => ["ext/fox16_c/librb.c"]
-  file "ext/fox16_c/librb.c" do |task|
+  task :swigruby_h => ["ext/fox16_c/swigruby.h"]
+  file "ext/fox16_c/swigruby.h" do |task|
     puts "generate #{task.name}"
-    File.open(task.name, "w") do |io|
-      io.puts "#define SWIG_GLOBAL 1"
-      io.write(IO.read(File.join(SWIG_LIB, "ruby", "precommon.swg")))
-      io.write(IO.read(File.join(SWIG_LIB, "common.swg")))
-      io.write(IO.read(File.join(SWIG_LIB, "ruby", "rubyhead.swg")))
-      io.write(IO.read(File.join(SWIG_LIB, "ruby", "rubydef.swg")))
-    end
+    system "#{SWIG} -ruby -external-runtime #{task.name}"
   end
 
   desc "Run SWIG to generate the wrapper files."
-  task :swig => [:swig_librb] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
+  task :swig => [:swigruby_h] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
   # add dependencies for compile *.i to *_wrap.cpp
   SWIG_MODULES.each do |ifile, cppfile|
@@ -218,12 +221,19 @@ namespace :fxruby do
     make_impl
   end
 
-  file "ext/fox16_c/extconf.rb" => ['ext/fox16_c/librb.c', 'ext/fox16_c/impl.cpp', 'ext/fox16_c/include/inlinestubs.h'] +
+  file "ext/fox16_c/extconf.rb" => ['ext/fox16_c/swigruby.h', 'ext/fox16_c/impl.cpp', 'ext/fox16_c/include/inlinestubs.h'] +
       SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
+  directory "tmp/fxscintilla"
+  task "tmp/fxscintilla/fxscintilla-2.28.0/include/Scintilla.iface" => ["tmp/fxscintilla", "ports/archives/fxscintilla-2.28.0.tar.gz"] do
+    chdir "tmp/fxscintilla" do
+      sh "tar xzf ../../ports/archives/fxscintilla-2.28.0.tar.gz"
+    end
+  end
+
   task :scintilla => 'lib/fox16/scintilla.rb'
-  file 'lib/fox16/scintilla.rb' => [FXSCINTILLA_INSTALL_DIR, 'scripts/iface.rb'] do
-    ruby "scripts/iface.rb -i #{FXSCINTILLA_INSTALL_DIR}/include/Scintilla.iface -o lib/fox16/scintilla.rb"
+  file 'lib/fox16/scintilla.rb' => ["tmp/fxscintilla/fxscintilla-2.28.0/include/Scintilla.iface", 'scripts/iface.rb'] do
+    ruby "scripts/iface.rb -i tmp/fxscintilla/fxscintilla-2.28.0/include/Scintilla.iface -o lib/fox16/scintilla.rb"
   end
 
   task :generate_kwargs_lib => 'lib/fox16/kwargs.rb'

data/examples/RAA.rb

@@ -1,5 +1,11 @@
-require 'soap/rpc/driver'
-require 'iRAA'
+begin
+  require 'soap/rpc/driver'
+  require 'iRAA'
+rescue LoadError
+  warn("Sorry, at the moment this example is not working.")
+  sleep(5)
+  exit(false)
+end
 
 module RAA
   extend SOAP

data/examples/WhatAQuietStiff.rb

@@ -38,11 +38,11 @@ class WhatAQuietWindow < FXMainWindow
     super(app, "What a Quiet Stiff", :opts => DECOR_ALL, :width => 850, :height => 600, :padLeft => 0, :padRight => 0)
 
     # Icons for list items
-    File.open("icons/bluebullet14x14.gif", "rb") do |f|
+    File.open(File.expand_path("../icons/bluebullet14x14.gif", __FILE__), "rb") do |f|
       bytes = f.read
       @itemIcon = FXGIFIcon.new(getApp(), bytes)
     end
-    File.open("icons/transpbullet14x14.gif", "rb") do |f|
+    File.open(File.expand_path("../icons/transpbullet14x14.gif", __FILE__), "rb") do |f|
       bytes = f.read
       @transpIcon = FXGIFIcon.new(getApp(), bytes)
     end

data/examples/babelfish.rb

@@ -1,7 +1,14 @@
 #!/usr/bin/env ruby
 
 require 'fox16'
-require 'tranexp'
+
+begin
+  require 'tranexp'
+rescue LoadError
+  warn("LoadError: To execute this app you need to have 'tranexp' gem installed.")
+  sleep(5)
+  exit(false)
+end
 
 include Fox
 
@@ -26,7 +33,7 @@ class Babelfish < FXMainWindow
     FXLabel.new(controlsFrame, " to:")
     @toCombo = FXComboBox.new(controlsFrame, 15, :opts => COMBOBOX_STATIC|FRAME_SUNKEN|FRAME_THICK)
     @toCombo.numVisible = 6
-    Tranexp::Codes.constants.each do |lang|
+    Tranexp::Codes.constants.map(&:to_s).each do |lang|
       @fromCombo.appendItem(lang)
       @toCombo.appendItem(lang)
     end

data/examples/browser.rb

@@ -41,7 +41,7 @@ class ClassTree
 
     # Get an hash containing class names for Fox
     classes = {}
-    @mFox.constants.each do |name|
+    @mFox.constants.map(&:to_s).each do |name|
       c = @mFox.const_get(name)
       if c.kind_of? Class
 	parentclass = c.superclass.name.sub("Fox::", "")

data/examples/button.rb

@@ -134,15 +134,9 @@ class ButtonWindow < FXMainWindow
 
   # Load the named icon from a file
   def loadIcon(filename)
-    begin
-      filename = File.join("icons", filename)
-      icon = nil
-      File.open(filename, "rb") do |f|
-        icon = FXPNGIcon.new(getApp(), f.read)
-      end
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end
 

data/examples/canvasdemo.rb

@@ -1,5 +1,5 @@
 require 'fox16'
-require '../lib/fox16/canvas'
+require 'fox16/canvas'
 
 include Fox
 include Canvas
@@ -10,7 +10,7 @@ class CanvasDemo < FXMainWindow
     super(app, "Canvas Demo", nil, nil, DECOR_ALL, 0, 0, 800, 600)
 
     # Menu bar
-    menu_bar = FXMenubar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+    menu_bar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
     # File menu
     file_menu = FXMenuPane.new(self)
@@ -53,7 +53,7 @@ class CanvasDemo < FXMainWindow
     FXMenuTitle.new(menu_bar, "&Help", nil, help_menu)
 
     # Status bar
-    FXStatusbar.new(self,
+    FXStatusBar.new(self,
       LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER)
 
     # Shapes canvas fills the remainder

data/examples/charts.rb

@@ -1,6 +1,13 @@
 require 'fox16'
-require 'google_chart'
-require 'open-uri'
+
+begin
+  require 'google_chart'
+  require 'open-uri'
+rescue LoadError
+  warn("LoadError: To execute this app you need to have 'google_chart' gem installed.")
+  sleep(5)
+  exit(false)
+end
 
 include Fox
 

data/examples/dctest.rb

@@ -532,7 +532,7 @@ class DCTestWindow < FXMainWindow
     FXMenuCommand.new(@filemenu, "&Quit\tCtl-Q", nil, getApp(), FXApp::ID_QUIT)
     FXMenuTitle.new(menubar, "&File", nil, @filemenu)
 
-    @birdImage = FXPNGImage.new(getApp(), File.open("icons/dippy.png", "rb").read)
+    @birdImage = FXPNGImage.new(getApp(), File.open(File.expand_path("../icons/dippy.png", __FILE__), "rb").read)
     @bitmap = FXBitmap.new(getApp(), $bitmap_bits, 0, 64, 64)
 
     @function = BLT_SRC
@@ -674,15 +674,9 @@ class DCTestWindow < FXMainWindow
 
   # Load the named icon from a file
   def loadIcon(filename, clr = FXRGB(192, 192, 192), opts = 0)
-    begin
-      filename = File.join("icons", filename)
-      icon = nil
-      File.open(filename, "rb") { |f|
-        icon = FXPNGIcon.new(getApp(), f.read, clr, opts)
-      }
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end
 end

data/examples/gembrowser.rb

@@ -37,7 +37,7 @@ class GemBrowser
   # Return an array of the installed specifications.
   def cache
 #   Gem.cache
-    Gem::Cache.from_installed_gems
+    Gem::SourceIndex.from_installed_gems
   end
 end
 
@@ -53,7 +53,7 @@ class GemInfoPanel < FXVerticalFrame
 
     self.backColor = FXRGB(255, 255, 255)
 
-    File.open(File.join("icons", "gem_big.png"), "rb") do |f|
+    File.open(File.expand_path("../icons/gem_big.png", __FILE__), "rb") do |f|
       @bigIcon = FXPNGIcon.new(getApp(), f.read)
     end
 
@@ -107,10 +107,10 @@ class GemsPanel < FXVerticalFrame
     # Save a reference to the browser
     @browser = br
 
-    File.open(File.join("icons", "gem_big.png"), "rb") do |f|
+    File.open(File.expand_path("../icons/gem_big.png", __FILE__), "rb") do |f|
       @bigIcon = FXPNGIcon.new(getApp(), f.read)
     end
-    File.open(File.join("icons", "gem_small.png"), "rb") do |f|
+    File.open(File.expand_path("../icons/gem_small.png", __FILE__), "rb") do |f|
       @smallIcon = FXPNGIcon.new(getApp(), f.read)
     end
 

data/examples/gltest.rb

@@ -3,12 +3,12 @@
 require 'fox16'
 begin
   require 'opengl'
+  require 'glu'
 rescue LoadError
   require 'fox16/missingdep'
   MSG = <<EOM
-  Sorry, this example depends on the OpenGL extension. Please
-  check the Ruby Application Archives for an appropriate
-  download site.
+  Sorry, this example depends on the opengl gems. Please execute:
+    gem install opengl glu
 EOM
   missingDependency(MSG)
 end

data/examples/glviewer.rb

@@ -152,15 +152,9 @@ class GLViewWindow < FXMainWindow
 
   # Load the named PNG icon from a file
   def loadIcon(filename)
-    begin
-      filename = File.join("icons", filename) + ".png"
-      icon = nil
-      File.open(filename, "rb") do |f|
-        icon = FXPNGIcon.new(getApp(), f.read)
-      end
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}.png", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end
 

data/examples/groupbox.rb

@@ -8,15 +8,9 @@ class GroupWindow < FXMainWindow
 
   # Convenience function to load & construct an icon
   def getIcon(filename)
-    begin
-      filename = File.join("icons", filename)
-      icon = nil
-      File.open(filename, "rb") { |f|
-        icon = FXPNGIcon.new(getApp(), f.read)
-      }
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end