gobject-introspection 1.2.6 → 2.0.0

data/Rakefile

@@ -17,25 +17,102 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 $LOAD_PATH.unshift("./../glib2/lib")
-require "gnome2-raketask"
+require "gnome2/rake/package-task"
 
-package = GNOME2Package.new do |_package|
-  _package.summary = "Ruby/GObjectIntrospection is a Ruby binding of GObjectIntrospection."
-  _package.description = "Ruby/GObjectIntrospection is a Ruby binding of GObjectIntrospection."
-  _package.dependency.gem.runtime = ["glib2"]
-  _package.dependency.gem.development = [["test-unit", ">= 2"]]
-  _package.win32.packages = []
-  _package.win32.dependencies = []
-  _package.win32.build_dependencies = ["glib2"]
-  _package.win32.build_packages = [
+package = nil
+package_task = GNOME2::Rake::PackageTask.new do |_package|
+  package = _package
+  package.summary = "Ruby/GObjectIntrospection is a Ruby binding of GObjectIntrospection."
+  package.description = "Ruby/GObjectIntrospection is a Ruby binding of GObjectIntrospection."
+  package.dependency.gem.runtime = ["glib2"]
+  package.dependency.gem.development = [["test-unit", ">= 2"]]
+  package.windows.packages = []
+  package.windows.dependencies = []
+  package.windows.build_dependencies = ["glib2"]
+  package.external_packages = [
+    {
+      :name => "glib",
+      :download_site => :gnome,
+      :label => "GLib",
+      :version => "2.36.0",
+      :compression_method => "xz",
+      :windows => {
+        :build => false,
+      },
+      :native => {
+        :build => true,
+      },
+    },
     {
       :name => "gobject-introspection",
       :download_site => :gnome,
       :label => "gobject-introspection",
-      :version => "1.35.4",
-      :configure_args => [],
+      :version => "1.36.0",
       :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--with-g-ir-scanner=#{package.native.absolute_binary_dir}/bin/g-ir-scanner",
+          "--disable-tests",
+        ],
+        :patches => [
+          "0001-Support-external-g-ir-scanner.patch",
+        ],
+        :need_autoreconf => true,
+      },
+      :native => {
+        :build => true,
+        :patches => [
+          # "cross-compilable-g-ir-scanner.diff",
+        ],
+      }
     },
   ]
 end
-package.define_tasks
+package_task.define
+
+namespace :native do
+  namespace :"gobject-introspection" do
+    desc "Make g-ir-scanner workable for Windows on non Windows"
+    task :cross do
+      g_ir_scanner_dir = package.native.absolute_binary_dir
+      g_ir_scanner_dir += "lib/gobject-introspection/giscanner"
+      Dir.chdir(g_ir_scanner_dir.to_s) do
+        patch = "#{package.patches_dir}/cross-g-ir-scanner.diff"
+        sh("patch -p2 < #{patch}")
+      end
+    end
+  end
+
+  namespace :builder do
+    task :after => "native:gobject-introspection:cross"
+  end
+end
+
+namespace :win32 do
+  namespace :"gobject-introspection" do
+    desc "Use native tools"
+    task :cross do
+      pkg_config_dir = package.windows.absolute_binary_dir + "lib/pkgconfig"
+      pc_path = pkg_config_dir + "gobject-introspection-1.0.pc"
+      original_pc = pc_path.read
+      new_pc = ""
+      new_pc << "native_prefix=#{package.native.absolute_binary_dir}\n"
+      new_pc << "native_bindir=${native_prefix}/bin\n"
+      original_pc.each_line do |line|
+        case line
+        when /\Ag_ir_(scanner|compiler)=/
+          new_pc << line.gsub(/\${bindir}/, "${native_bindir}")
+        else
+          new_pc << line
+        end
+      end
+      pc_path.open("w") do |pc_file|
+        pc_file.write(new_pc)
+      end
+    end
+  end
+
+  namespace :builder do
+    task :after => "win32:gobject-introspection:cross"
+  end
+end

data/ext/gobject-introspection/gobject_introspection.def

@@ -0,0 +1,5 @@
+EXPORTS
+	Init_gobject_introspection
+
+	rb_gi_callback_data_free
+	rb_gi_callback_register_finder

data/lib/gobject-introspection.rb

@@ -16,10 +16,18 @@
 
 require "glib2"
 
-base_dir = Pathname.new(__FILE__).dirname.dirname.dirname.expand_path
+module GObjectIntrospection
+  class << self
+    def prepend_typelib_path(path)
+      GLib.prepend_path_to_environment_variable(path, "GI_TYPELIB_PATH")
+    end
+  end
+end
+
+base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
-GLib.prepend_environment_path(vendor_bin_dir)
+GLib.prepend_dll_path(vendor_bin_dir)
 begin
   major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/gobject_introspection.so"
@@ -27,10 +35,12 @@ rescue LoadError
   require "gobject_introspection.so"
 end
 
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
+
 module GObjectIntrospection
   LOG_DOMAIN = "GObjectIntrospection"
 end
-
 GLib::Log.set_log_domain(GObjectIntrospection::LOG_DOMAIN)
 
 require "gobject-introspection/repository"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - lib/gobject-introspection/union-info.rb
 - ext/gobject-introspection/depend
 - ext/gobject-introspection/extconf.rb
+- ext/gobject-introspection/gobject_introspection.def
 - ext/gobject-introspection/rb-gi-arg-info.c
 - ext/gobject-introspection/rb-gi-argument.c
 - ext/gobject-introspection/rb-gi-base-info.c