pango 0.20.1 → 0.90.2

data/ChangeLog

@@ -1,3 +1,19 @@
+2010-09-23  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile: don't add .zip into gem.
+
+	* lib/pango.rb: support bundled Windows DLL.
+
+	* test/run-test.rb: fix extension library path.
+
+2010-09-21  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ./: make buildable by rake-compiler.
+
+	* src/ -> ext/pango/
+
+	* src/lib/: -> lib/
+
 2010-02-02  Hiroyuki Ito <ZXB01226@nifty.com>
 
 	* src/rbpangogravity.c (Init_pango_gravity): remove redundant

data/Rakefile

@@ -1,70 +1,83 @@
-require 'rake/clean'
-CLEAN.include '**/*.o'
-CLEAN.include "**/*.#{Config::MAKEFILE_CONFIG['DLEXT']}"
-CLOBBER.include 'doc'
-CLOBBER.include '**/*.log'
-CLOBBER.include '**/Makefile'
-CLOBBER.include '**/extconf.h'
+# -*- ruby -*-
 
-# Determine the current version of the software
-def ruby_pango_version
-  "0.20.1"
-end
-
-CURRENT_VERSION = ruby_pango_version
-
-desc "Default Task (Test project)"
-task :default => :test
-
-# Make tasks -----------------------------------------------------
-make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
-MAKECMD = ENV['MAKE_CMD'] || make_program
-MAKEOPTS = ENV['MAKE_OPTS'] || ''
+require 'pathname'
+require 'find'
+require 'rubygems'
+require 'rake/extensiontask'
 
-PANGO_SO = "src/pango.#{Config::MAKEFILE_CONFIG['DLEXT']}"
+@top_dir = Pathname(__FILE__).dirname.parent.expand_path
+@rb_glib2_dir = @top_dir + "glib2"
 
-file 'Makefile' => 'extconf.rb' do
-  sh "ruby extconf.rb #{ENV['EXTCONF_OPTS']}"
-end
+task :default => :build
 
-def make(target = '')
-  pid = system("#{MAKECMD} #{MAKEOPTS} #{target}")
-  $?.exitstatus
+def version
+  @version ||= ENV["VERSION"] || guess_version
 end
 
-# Let make handle dependencies between c/o/so - we'll just run it. 
-file PANGO_SO => (['Makefile'] + Dir['src/*.c'] + Dir['src/*.h']) do
-  m = make
-  fail "Make failed (status #{m})" unless m == 0
+def guess_version
+  versions = {}
+  rbglib_h_path = @rb_glib2_dir + "ext" + "glib2" + "rbglib.h"
+  rbglib_h_path.open do |rbglib_h|
+    rbglib_h.each_line do |line|
+      if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
+        versions[$1.downcase] = $2.to_i
+      end
+    end
+  end
+  ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
 end
 
-desc "Configure Pango"
-task :configure => ['Makefile']
+package_name = "pango"
 
-desc "Compile the shared object"
-task :compile => [PANGO_SO]
+spec = Gem::Specification.new do |s|
+  s.name = package_name
+  s.summary = "Ruby/Pango is a Ruby binding of pango-1.x."
+  s.description = "Ruby/Pango is a Ruby binding of pango-1.x."
+  s.author = "The Ruby-GNOME2 Proejct Team"
+  s.email = "ruby-gnome2-devel-en@lists.sourceforge.net"
+  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
+  s.version = version
+  s.platform = Gem::Platform::RUBY
+  s.add_dependency("cairo", ">= 1.10.0")
+  s.add_dependency("glib2", "= #{version}")
+  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
+  s.require_paths = ["lib"]
+  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
+                     "lib/**/*.rb", "{ext,sample,test}/**/*"]
+end
 
-desc "Run pango tests"
-task :test => :compile do
-  sh "ruby test/run-test.rb"
+Rake::GemPackageTask.new(spec) do |pkg|
 end
 
-desc 'Generate gem specification'
-task :gemspec do
-  require 'erb'
-  tspec = ERB.new(File.read(File.join(File.dirname(__FILE__),'src','pango.gemspec.erb')))
-  File.open(File.join(File.dirname(__FILE__),'pango.gemspec'),'wb') do|f|
-    f << tspec.result
+Rake::ExtensionTask.new(package_name, spec) do |ext|
+  ext.cross_compile = true
+  ext.cross_compiling do |spec|
+    if /mingw|mswin/ =~ spec.platform.to_s
+      win32_dir = File.join("vendor", "local")
+      win32_files = []
+      Find.find(win32_dir) do |file|
+        next if /\.zip\z/ =~ file
+        win32_files << file
+      end
+      spec.files += win32_files
+    end
   end
 end
 
-desc 'Build gem'
-task :package => :gemspec do
-  require 'rubygems/specification'
-  spec_source = File.read File.join(File.dirname(__FILE__),'pango.gemspec')
-  spec = nil
-  # see: http://gist.github.com/16215
-  Thread.new { spec = eval("$SAFE = 3\n#{spec_source}") }.join
-  spec.validate
-  Gem::Builder.new(spec).build
+namespace :win32 do
+  desc "download Windows binaries"
+  task :download do
+    $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
+    require 'gnome2-win32-binary-downloader'
+    GNOME2Win32BinaryDownloader.download(:packages => ["glib", "pango"],
+                                         :dependencies => ["gettext-runtime",
+                                                           "cairo",
+                                                           "cairo-dev",
+                                                           "libpng",
+                                                           "zlib",
+                                                           "expat",
+                                                           "expat",
+                                                           "fontconfig",
+                                                           "freetype"])
+  end
 end

data/ext/pango/Makefile

@@ -0,0 +1,172 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = Z:/home/kou/work/ruby/ruby-gnome2.win32/pango/src
+topdir = Z:/tmp/local/lib/ruby/1.8/i386-mingw32msvc
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+
+DESTDIR = Z:
+exec_prefix = $(prefix)
+prefix = $(DESTDIR)/tmp/local
+sharedstatedir = $(prefix)/com
+mandir = $(datarootdir)/man
+psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
+localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(exec_prefix)/libexec
+sitedir = $(libdir)/ruby/site_ruby
+htmldir = $(docdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+includedir = $(prefix)/include
+infodir = $(datarootdir)/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(prefix)/etc
+libdir = $(exec_prefix)/lib
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
+pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
+sitearchdir = $(sitelibdir)/$(sitearch)
+datadir = $(datarootdir)
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+
+CC = i586-mingw32msvc-gcc
+LIBRUBY = lib$(LIBRUBY_SO).a
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+cflags   = $(optflags) $(debugflags) $(warnflags)
+optflags = -O2
+debugflags = -g
+warnflags = -Wall -Wno-parentheses
+CFLAGS   =   $(cflags)  -mms-bitfields -I/home/kou/.wine/drive_c/gtk/include/pango-1.0 -I/home/kou/.wine/drive_c/gtk/include/glib-2.0 -I/home/kou/.wine/drive_c/gtk/lib/glib-2.0/include -mms-bitfields -I/home/kou/.wine/drive_c/gtk/include/pango-1.0 -I/home/kou/.wine/drive_c/gtk/include/cairo -I/home/kou/.wine/drive_c/gtk/include/libpng12 -I/home/kou/.wine/drive_c/gtk/include/glib-2.0 -I/home/kou/.wine/drive_c/gtk/lib/glib-2.0/include 
+INCFLAGS = -I. -IZ:/home/kou/work/ruby/ruby-gnome2.win32/glib/src -IZ:/home/kou/work/ruby/ruby-gnome2.win32/glib/src -I. -IZ:/tmp/local/lib/ruby/1.8/i386-mingw32msvc -IZ:/home/kou/work/ruby/ruby-gnome2.win32/pango
+DEFS     = 
+CPPFLAGS = -DHAVE_OBJECT_ALLOCATE -DRUBY_PANGO_COMPILATION    -IZ:/tmp/local/lib/ruby/site_ruby/1.8/i386-msvcrt 
+CXXFLAGS = $(CFLAGS) 
+ldflags  = -L.  -L/home/kou/.wine/drive_c/gtk/lib -L/home/kou/.wine/drive_c/gtk/lib -LZ:/home/kou/work/ruby/ruby-gnome2.win32/glib/src -LZ:/home/kou/work/ruby/ruby-gnome2.win32/glib/src
+dldflags =  -Wl,--enable-auto-image-base,--enable-auto-import,--export-all,--out-implib=libruby-pango.a
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = i586-mingw32msvc-gcc -shared -s
+AR = i586-mingw32msvc-ar
+EXEEXT = .exe
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = msvcrt-ruby18
+arch = i386-mingw32msvc
+sitearch = i386-msvcrt
+ruby_version = 1.8
+ruby = Z:/tmp/local/bin/ruby.exe
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = rbpangoinits.c rbpangoversion.h
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lpango-1.0 -lglib-2.0 -lintl -lgobject-2.0 -lgmodule-2.0 -lpangocairo-1.0 -lpango-1.0 -lglib-2.0 -lintl -lgobject-2.0 -lgmodule-2.0 -lcairo -lruby-glib2 -lruby-glib2 -lshell32 -lwsock32  
+SRCS = rbpangoglyphinfo.c rbpangoscript.c rbpangolayout.c rbpangotabarray.c rbpangoattrlist.c rbpangoanalysis.c rbpangorectangle.c rbpangocontext.c rbpangofont.c rbpangologattr.c rbpangocoverage.c rbpangoglyphstring.c rbpangofontdescription.c rbpangolayoutiter.c rbpangoglyphitem.c rbpangofontmap.c rbpangomain.c rbpangofontsetsimple.c rbpangofontface.c rbpangofontset.c rbpangoinits.c rbpangoitem.c rbpangoattribute.c rbpangoscriptiter.c rbpangofontfamily.c rbpangomatrix.c rbpangofontmetrics.c rbpangoengine.c rbpangolanguage.c rbpangolayoutline.c rbpangoattriterator.c rbpango.c rbpangocolor.c rbpangorenderer.c rbpangocairo.c
+OBJS = rbpangoglyphinfo.o rbpangoscript.o rbpangolayout.o rbpangotabarray.o rbpangoattrlist.o rbpangoanalysis.o rbpangorectangle.o rbpangocontext.o rbpangofont.o rbpangologattr.o rbpangocoverage.o rbpangoglyphstring.o rbpangofontdescription.o rbpangolayoutiter.o rbpangoglyphitem.o rbpangofontmap.o rbpangomain.o rbpangofontsetsimple.o rbpangofontface.o rbpangofontset.o rbpangoinits.o rbpangoitem.o rbpangoattribute.o rbpangoscriptiter.o rbpangofontfamily.o rbpangomatrix.o rbpangofontmetrics.o rbpangoengine.o rbpangolanguage.o rbpangolayoutline.o rbpangoattriterator.o rbpango.o rbpangocolor.o rbpangorenderer.o rbpangocairo.o
+TARGET = pango
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+pre-install-rb-default: $(RUBYLIBDIR)
+install-rb-default: $(RUBYLIBDIR)/pango.rb
+$(RUBYLIBDIR)/pango.rb: Z:/home/kou/work/ruby/ruby-gnome2.win32/pango/src/lib/pango.rb $(RUBYLIBDIR)
+	$(INSTALL_DATA) Z:/home/kou/work/ruby/ruby-gnome2.win32/pango/src/lib/pango.rb $(@D)
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+$(RUBYLIBDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+###
+install:
+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbpango.h $(sitearchdir)$(target_prefix)
+	@$(RUBY) -run -e install -- -m 0644 -v rbpangoversion.h $(sitearchdir)$(target_prefix)

data/ext/pango/depend

@@ -0,0 +1,7 @@
+install-so:
+	$(INSTALL_DATA) $(srcdir)/rbpango.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) rbpangoversion.h $(RUBYARCHDIR)
+
+install:
+	$(MAKEDIRS) $(libdir)/pkgconfig
+	$(INSTALL_DATA) ruby-pango.pc $(libdir)/pkgconfig

data/ext/pango/extconf.rb

@@ -0,0 +1,75 @@
+=begin
+extconf.rb for Ruby/Pango extention library
+=end
+
+require 'pathname'
+
+base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
+top_dir = base_dir.parent
+top_build_dir = Pathname(".").parent.parent.parent.expand_path
+
+mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
+version_suffix = ""
+unless mkmf_gnome2_dir.exist?
+  if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
+    version_suffix = $1
+    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
+  end
+end
+
+$LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
+
+module_name = "pango"
+package_id = "pango"
+
+require 'mkmf-gnome2'
+
+setup_win32(module_name, base_dir)
+
+PKGConfig.have_package(package_id) or exit 1
+
+pango_header = "pango/pango.h"
+have_func("pango_layout_iter_get_type", pango_header)
+have_func("pango_layout_set_ellipsize", pango_header)
+have_func("pango_layout_get_font_description", pango_header)
+have_func("pango_render_part_get_type", pango_header)
+have_func("pango_attr_strikethrough_color_new", pango_header)
+have_func("pango_attr_underline_color_new", pango_header)
+have_func("pango_glyph_item_free", pango_header)
+have_func("pango_glyph_item_get_type", pango_header)
+have_func("pango_attr_iterator_get_attrs", pango_header)
+have_func("pango_itemize_with_base_dir", pango_header)
+have_func("pango_font_family_is_monospace", pango_header)
+
+if PKGConfig.have_package('pangocairo')
+  options = {}
+  rcairo_source_dir_names = ["rcairo"]
+  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+    rcairo_source_dir_names.unshift("rcairo.win32")
+  end
+  rcairo_source_dir_names.each do |rcairo_source_dir_name|
+    rcairo_source_dir = top_dir.parent.expand_path + rcairo_source_dir_name
+    if rcairo_source_dir.exist?
+      options[:rcairo_source_dir] = rcairo_source_dir.to_s
+      break
+    end
+  end
+  check_cairo(options)
+end
+
+["glib2"].each do |package|
+  directory = "#{package}#{version_suffix}"
+  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  add_depend_package(package, "#{directory}/ext/#{package}",
+                     top_dir.to_s,
+                     :top_build_dir => top_build_dir.to_s,
+                     :target_build_dir => build_dir)
+end
+
+add_distcleanfile("rbpangoinits.c")
+
+make_version_header("PANGO", "pango", ".")
+
+create_pkg_config_file("Ruby/Pango", package_id)
+$defs << " -DRUBY_PANGO_COMPILATION"
+create_makefile(module_name)

data/ext/pango/pango.def

@@ -0,0 +1,18 @@
+EXPORTS
+    Init_pango
+    mPango     DATA
+    attrstring DATA
+    pattr      DATA
+    pattrbool  DATA
+    pattrcolor DATA
+    pattrfloat DATA
+    pattrint   DATA
+    pango_add_attribute
+    pango_attr_iter_get_type
+    pango_get_attribute
+    pango_get_attribute_klass
+    pango_item_get_type
+    pango_layout_iter_get_type
+    pango_layout_line_get_type
+    pango_make_attribute
+    pango_rectangle_get_type

data/{src → ext/pango}/rbpango.h

@@ -10,7 +10,6 @@
 ************************************************/
 
 #include "ruby.h"
-
 #define PANGO_ENABLE_ENGINE
 #define PANGO_ENABLE_BACKEND
 #include <pango/pango.h>

data/{src → ext/pango}/rbpangoversion.h

@@ -1,24 +1,24 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoversion.h -
-
-  This file was generated by mkmf-gnome2.rb.
-
-************************************************/
-
-#ifndef __RBPANGO_VERSION_H__
-#define __RBPANGO_VERSION_H__
-
-#define PANGO_MAJOR_VERSION (1)
-#define PANGO_MINOR_VERSION (24)
-#define PANGO_MICRO_VERSION (5)
-
-#define PANGO_CHECK_VERSION(major,minor,micro)    \
-    (PANGO_MAJOR_VERSION > (major) || \
-     (PANGO_MAJOR_VERSION == (major) && PANGO_MINOR_VERSION > (minor)) || \
-     (PANGO_MAJOR_VERSION == (major) && PANGO_MINOR_VERSION == (minor) && \
-      PANGO_MICRO_VERSION >= (micro)))
-
-
-#endif /* __RBPANGO_VERSION_H__ */
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
+
+  rbpangoversion.h -
+
+  This file was generated by mkmf-gnome2.rb.
+
+************************************************/
+
+#ifndef __RBPANGO_VERSION_H__
+#define __RBPANGO_VERSION_H__
+
+#define PANGO_MAJOR_VERSION (1)
+#define PANGO_MINOR_VERSION (20)
+#define PANGO_MICRO_VERSION (5)
+
+#define PANGO_CHECK_VERSION(major,minor,micro)    \
+    (PANGO_MAJOR_VERSION > (major) || \
+     (PANGO_MAJOR_VERSION == (major) && PANGO_MINOR_VERSION > (minor)) || \
+     (PANGO_MAJOR_VERSION == (major) && PANGO_MINOR_VERSION == (minor) && \
+      PANGO_MICRO_VERSION >= (micro)))
+
+
+#endif /* __RBPANGO_VERSION_H__ */

data/extconf.rb

@@ -1,68 +1,49 @@
-=begin
-extconf.rb for Ruby/Pango extention library
-=end
-
-PACKAGE_NAME = "pango"
-PACKAGE_ID   = "pango"
-
-begin
-  require 'rubygems'
-  require 'mkmf-gnome2'
-  USE_GNOME_GEMS = true
-  TOPDIR = File.expand_path(File.dirname(__FILE__) )
-  SRCDIR = TOPDIR + '/src'
-  require 'glib2'
-rescue LoadError => e
-
-  USE_GNOME_GEMS = false
-
-  TOPDIR = File.expand_path(File.dirname(__FILE__) + '/..')
-  MKMF_GNOME2_DIR = TOPDIR + '/glib/src/lib'
-  SRCDIR = TOPDIR + '/pango/src'
-
-  $LOAD_PATH.unshift MKMF_GNOME2_DIR
-  $LOAD_PATH << "E:\\ruby\\lib\\ruby\\1.8\\i386-mswin32"
-
-  require 'mkmf-gnome2'
-
+#!/usr/bin/env ruby
+
+require 'pathname'
+require 'mkmf'
+require 'rbconfig'
+require 'fileutils'
+
+package = "pango"
+
+base_dir = Pathname(__FILE__).dirname.expand_path
+ext_dir = base_dir + "ext" + package
+mkmf_gnome2_dir = base_dir + 'lib'
+
+ruby = File.join(RbConfig::CONFIG['bindir'],
+                 RbConfig::CONFIG['ruby_install_name'] +
+                 RbConfig::CONFIG["EXEEXT"])
+
+build_dir = Pathname("ext") + package
+FileUtils.mkdir_p(build_dir.to_s) unless build_dir.exist?
+extconf_rb_path = ext_dir + "extconf.rb"
+system(ruby, "-C", build_dir.to_s, extconf_rb_path.to_s, *ARGV) || exit(false)
+
+create_makefile(package)
+FileUtils.mv("Makefile", "Makefile.lib")
+
+File.open("Makefile", "w") do |makefile|
+  makefile.puts(<<-EOM)
+all:
+	(cd ext/#{package} && $(MAKE))
+	$(MAKE) -f Makefile.lib
+
+install:
+	(cd ext/#{package} && $(MAKE) install)
+	$(MAKE) -f Makefile.lib install
+
+site-install:
+	(cd ext/#{package} && $(MAKE) site-install)
+	$(MAKE) -f Makefile.lib site-install
+
+clean:
+	(cd ext/#{package} && $(MAKE) clean)
+	$(MAKE) -f Makefile.lib clean
+
+distclean:
+	(cd ext/#{package} && $(MAKE) distclean)
+	$(MAKE) -f Makefile.lib distclean
+	@rm -f Makefile.lib
+EOM
 end
-
-PKGConfig.have_package(PACKAGE_ID) or exit 1
-setup_win32(PACKAGE_NAME)
-
-pango_header = "pango/pango.h"
-have_func("pango_layout_iter_get_type", pango_header)
-have_func("pango_layout_set_ellipsize", pango_header)
-have_func("pango_layout_get_font_description", pango_header)
-have_func("pango_render_part_get_type", pango_header)
-have_func("pango_attr_strikethrough_color_new", pango_header)
-have_func("pango_attr_underline_color_new", pango_header)
-have_func("pango_glyph_item_free", pango_header)
-have_func("pango_glyph_item_get_type", pango_header)
-have_func("pango_attr_iterator_get_attrs", pango_header)
-have_func("pango_itemize_with_base_dir", pango_header)
-have_func("pango_font_family_is_monospace", pango_header)
-
-if PKGConfig.have_package('pangocairo')
-  check_cairo
-end
-
-if USE_GNOME_GEMS
-  # locate the latest glib2 install and add the package dependency
-  path = File.dirname(Gem.find_files('rbglib.h').first)
-  add_depend_package("glib2", path, '/')
-else
-  add_depend_package("glib2", "glib/src", TOPDIR)
-end
-
-add_distcleanfile("rbpangoinits.c")
-
-make_version_header("PANGO", "pango")
-
-create_pkg_config_file("Ruby/Pango", PACKAGE_ID)
-create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR, "-DRUBY_PANGO_COMPILATION") {
-  SRCDIR_QUOTED = SRCDIR.gsub(' ', '\ ')
-  system("#{$ruby} #{SRCDIR_QUOTED}/makeinits.rb #{SRCDIR_QUOTED}/*.c > rbpangoinits.c")
-}
-create_top_makefile
-

data/{src/lib → lib}/pango.rb

@@ -16,7 +16,17 @@ begin
   end
 rescue LoadError
 end
-require 'pango.so'
+
+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)
+begin
+  major, minor, micro, = RUBY_VERSION.split(/\./)
+  require "#{major}.#{minor}/pango.so"
+rescue LoadError
+  require "pango.so"
+end
 
 module Pango
   LOG_DOMAIN = "Pango"

data/test/run-test.rb

@@ -8,15 +8,16 @@ ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
 glib_base = File.join(ruby_gnome2_base, "glib")
 pango_base = File.join(ruby_gnome2_base, "pango")
 
-$LOAD_PATH.unshift(glib_base)
-require 'test/glib-test-init'
+$LOAD_PATH.unshift(File.join(glib_base, "test"))
+require 'glib-test-init'
 
-[glib_base, pango_base].each do |target|
+[[glib_base, "glib2"],
+ [pango_base, "pango"]].each do |target, module_name|
   if system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(1)
   end
-  $LOAD_PATH.unshift(File.join(target, "src"))
-  $LOAD_PATH.unshift(File.join(target, "src", "lib"))
+  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
+  $LOAD_PATH.unshift(File.join(target, "lib"))
 end
 
 $LOAD_PATH.unshift(File.join(pango_base, "test"))

metadata

@@ -1,133 +1,142 @@
 --- !ruby/object:Gem::Specification 
 name: pango
 version: !ruby/object:Gem::Version 
+  hash: 371
   prerelease: false
   segments: 
   - 0
-  - 20
-  - 1
-  version: 0.20.1
+  - 90
+  - 2
+  version: 0.90.2
 platform: ruby
 authors: 
-- ruby-gnome2/AUTHORS
+- The Ruby-GNOME2 Proejct Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 -04:00
+date: 2010-09-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: glib2
+  name: cairo
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
+        - 1
+        - 10
         - 0
-        version: "0"
+        version: 1.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: cairo
+  name: glib2
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 371
         segments: 
         - 0
-        version: "0"
+        - 90
+        - 2
+        version: 0.90.2
   type: :runtime
   version_requirements: *id002
 description: Ruby/Pango is a Ruby binding of pango-1.x.
-email: todd.fisher@gmail.com
+email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
 
 extensions: 
-- extconf.rb
-extra_rdoc_files: 
-- README
+- ext/pango/extconf.rb
+extra_rdoc_files: []
+
 files: 
 - ChangeLog
 - README
 - Rakefile
 - extconf.rb
-- src/lib/pango.rb
-- src/makeinits.rb
-- src/rbpango.c
-- src/rbpangoanalysis.c
-- src/rbpangoattribute.c
-- src/rbpangoattriterator.c
-- src/rbpangoattrlist.c
-- src/rbpangocairo.c
-- src/rbpangocolor.c
-- src/rbpangocontext.c
-- src/rbpangocoverage.c
-- src/rbpangoengine.c
-- src/rbpangofont.c
-- src/rbpangofontdescription.c
-- src/rbpangofontface.c
-- src/rbpangofontfamily.c
-- src/rbpangofontmap.c
-- src/rbpangofontmetrics.c
-- src/rbpangofontset.c
-- src/rbpangofontsetsimple.c
-- src/rbpangoglyphinfo.c
-- src/rbpangoglyphitem.c
-- src/rbpangoglyphstring.c
-- src/rbpangogravity.c
-- src/rbpangoinits.c
-- src/rbpangoitem.c
-- src/rbpangolanguage.c
-- src/rbpangolayout.c
-- src/rbpangolayoutiter.c
-- src/rbpangolayoutline.c
-- src/rbpangologattr.c
-- src/rbpangomain.c
-- src/rbpangomatrix.c
-- src/rbpangorectangle.c
-- src/rbpangorenderer.c
-- src/rbpangoscript.c
-- src/rbpangoscriptiter.c
-- src/rbpangotabarray.c
-- src/rbpango.h
-- src/rbpangoversion.h
+- lib/pango.rb
+- ext/pango/rbpangoglyphstring.c
+- ext/pango/rbpango.c
+- ext/pango/rbpangofontmetrics.c
+- ext/pango/rbpangogravity.c
+- ext/pango/rbpangoattribute.c
+- ext/pango/rbpangoglyphinfo.c
+- ext/pango/rbpangoversion.h
+- ext/pango/rbpangoglyphitem.c
+- ext/pango/rbpangolayout.c
+- ext/pango/rbpangoattriterator.c
+- ext/pango/Makefile
+- ext/pango/rbpangoinits.c
+- ext/pango/rbpangoattrlist.c
+- ext/pango/rbpangomain.c
+- ext/pango/rbpangofontsetsimple.c
+- ext/pango/rbpangoscript.c
+- ext/pango/rbpangolanguage.c
+- ext/pango/rbpangofont.c
+- ext/pango/extconf.rb
+- ext/pango/pango.def
+- ext/pango/rbpangofontdescription.c
+- ext/pango/rbpangofontmap.c
+- ext/pango/rbpangologattr.c
+- ext/pango/rbpango.h
+- ext/pango/rbpangolayoutiter.c
+- ext/pango/rbpangofontfamily.c
+- ext/pango/rbpangofontface.c
+- ext/pango/rbpangotabarray.c
+- ext/pango/rbpangoengine.c
+- ext/pango/rbpangocolor.c
+- ext/pango/rbpangoanalysis.c
+- ext/pango/rbpangomatrix.c
+- ext/pango/rbpangocoverage.c
+- ext/pango/rbpangorectangle.c
+- ext/pango/rbpangoscriptiter.c
+- ext/pango/rbpangorenderer.c
+- ext/pango/rbpangocairo.c
+- ext/pango/depend
+- ext/pango/rbpangolayoutline.c
+- ext/pango/rbpangocontext.c
+- ext/pango/rbpangofontset.c
+- ext/pango/rbpangoitem.c
 - sample/attribute.rb
-- sample/break.rb
-- sample/cairo.png
 - sample/gdk_layout.rb
-- sample/glyphstring.rb
-- sample/item.rb
+- sample/parse.rb
 - sample/label.rb
-- sample/layout.rb
+- sample/break.rb
 - sample/pango_cairo.rb
-- sample/parse.rb
 - sample/sample.txt
+- sample/layout.rb
+- sample/item.rb
+- sample/glyphstring.rb
 - sample/script.rb
 - test/pango-test-utils.rb
-- test/run-test.rb
+- test/test_layout.rb
 - test/test-attribute.rb
+- test/run-test.rb
 - test/test-language.rb
-- test/test_layout.rb
 has_rdoc: true
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README
+rdoc_options: []
+
 require_paths: 
-- src
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -136,19 +145,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: pango
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby pango bindings
-test_files: 
-- test/pango-test-utils.rb
-- test/run-test.rb
-- test/test-attribute.rb
-- test/test-language.rb
-- test/test_layout.rb
+summary: Ruby/Pango is a Ruby binding of pango-1.x.
+test_files: []
+

data/src/makeinits.rb

@@ -1,48 +0,0 @@
-=begin
-  makeinits.rb -
-
-  $Author: mutoh $
-  $Date: 2005/01/28 09:24:45 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-=end
-
-except_targets = ["Init_pango()"]
-
-def print_data(array, type, defs, extern = false)
-  if array[type]
-    extern_def = "extern void" if extern
-    print "##{defs} #{type}\n" if defs
-    array[type].each do |val|
-	   print "#{extern_def}   #{val};\n"
-    end
-    print "#endif\n" if defs
-  end
-end
-
-inits = Hash.new
-
-while gets
-  if ~ /^(Init_.*\(.*\))(.*)/
-	init = $1
-	unless except_targets.include?(init)
-	  flag = $2
-	  if flag.size > 0
-		if flag =~ /\/\*\s*(\w*)\s*\*\//
-		  inits[$1] = Array.new unless inits[$1]
-		  inits[$1] << init
-		end
-	  else
-		inits[""] = Array.new unless inits[""]
-		inits[""] << init
-	  end
-	end
-  end
-end
-
-print_data(inits, "", nil, true)
-
-puts "void Init_pango_inits()\n"
-puts "{\n"
-print_data(inits, "", nil)
-puts "}\n"