Upgrade to support native compiling on Ruby 1.9.x.

sethvargo · sethvargo · commit 17404f5ad754 · 2012-05-27T13:53:48.000-04:00
This patch has a number of fixes including:

* using the new gem/bundler gemspec format
* removing jewler
* RSTRING_PTR(arg) instead of RSTRING(arg)-&gt;ptr
* adds Gemfile
* adds .gitignore
* fixes Rakefile
* converted all docs to markdown
* added MIT license
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,31 +1,41 @@
+CHANGELOG
+=========
+
+v0.1.4
+------
+* Upgraded C-extension to compile natively on Ruby 1.9
+
+Old Changelog
+-------------
+
 Thu Aug 15 09:39:24 2002, pabs <pabs@pablotron.org>
-  * created changelog.
+  * created changelog
 
-Tue Nov 12 17:20:23 2002, pabs <pabs@pablotron.org
+Tue Nov 12 17:20:23 2002, pabs <pabs@pablotron.org>
   * made some changes according to the notes in the freetype2 headers:
   * ft2.c: removed FT2::PixelMode::RGB and FT2::PixelMode::RGBA constants
   * ft2.c: removed Ft2::PaletteMode
   * compiles clean with -W -Wall -pedantic again
 
-Fri Nov 15 03:27:50 2002, pabs <pabs@pablotron.org 
+Fri Nov 15 03:27:50 2002, pabs <pabs@pablotron.org>
   * ft2.c: finished documentation for FT2::Face methods.
 
-Fri Nov 15 03:52:46 2002, pabs <pabs@pablotron.org
+Fri Nov 15 03:52:46 2002, pabs <pabs@pablotron.org>
   * ft2.c: added FT2::Face#current_charmap
 
-Fri Nov 15 15:15:37 2002, pabs <pabs@pablotron.org
+Fri Nov 15 15:15:37 2002, pabs <pabs@pablotron.org>
   * ft2.c: finished documentation for FT2::GlyphMetrics methods.
 
-Sat Nov 16 01:45:42 2002, pabs <pabs@pablotron.org
+Sat Nov 16 01:45:42 2002, pabs <pabs@pablotron.org>
   * ft2.c: finished documentation for FT2::GlyphSlot methods.
 
-Wed Nov 20 16:11:10 2002, pabs <pabs@pablotron.org
+Wed Nov 20 16:11:10 2002, pabs <pabs@pablotron.org>
   * ft2.c: finished documenting the FT2::SizeMetrics methods (had to
     pull the documentation for them out of the second part of the
     FreeType2 tutorial, since they're not available in the API
     reference).
 
-Thu Nov 21 15:18:26 2002, pabs <pabs@pablotron.org
+Thu Nov 21 15:18:26 2002, pabs <pabs@pablotron.org>
   * ft2.c: finished documenting and implementing FT2::Glyph,
     FT2::BitmapGlyph, and FT2::OutlineGlyph.
   * ft2.c: compiles clean with -W -Wall -pedantic again
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2012 Paul Duncan
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/MANIFEST b/MANIFEST
diff --git a/README.md b/README.md
@@ -1,17 +1,14 @@
-FT2-Ruby 0.1.0 README
-=====================
+FT2-Ruby
+========
 
 This document was last updated on Sat Nov 16 17:51:41 2002.  Please see
 http://www.pablotron.org/software/ft2-ruby/ for the latest version of
 this software.
 
-Introduction
+Installation
 ============
-hum de dum dum
 
-Installing FT2-Ruby
-===================
-blah de blah blah
+    gem install ft2-ruby
 
 About the Author
 ================
diff --git a/Rakefile b/Rakefile
@@ -1,32 +1 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ft2-ruby"
-    gem.summary = %Q{Ruby libraries to FreeType2}
-    gem.email = "pabs@pablotron.org"
-    gem.homepage = "http://www.pablotron.org/"
-    gem.authors = ["Paul Duncan"]
-    gem.extensions = ["extconf.rb"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-# 
-# task :default => :test
-# 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ft2-ruby #{version}"
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('TODO')
-  rdoc.rdoc_files.include('ft2.c')
-end
+require 'bundler/gem_tasks'
diff --git a/TODO.md b/TODO.md
@@ -1,3 +1,6 @@
+TODO
+====
+
 * fixed point data conversions
 * face subglyph handling
 * test test test test!
diff --git a/VERSION b/VERSION
diff --git a/extconf.rb b/extconf.rb
@@ -7,4 +7,3 @@
 
 have_library("freetype", "FT_Init_FreeType") and
   create_makefile("ft2")
-
diff --git a/ft2-ruby.gemspec b/ft2-ruby.gemspec
@@ -0,0 +1,17 @@
+Gem::Specification.new do |gem|
+  gem.authors       = ["Paul Duncan"]
+  gem.email         = "pabs@pablotron.org"
+  gem.description   = %Q{Ruby libraries to FreeType2}
+  gem.summary       = %Q{Ruby libraries to FreeType2}
+  gem.homepage      = "http://www.pablotron.org/"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.extensions    = ['extconf.rb']
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "ft2-ruby"
+  gem.version       = '0.1.4'
+
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'rake'
+end
diff --git a/ft2.c b/ft2.c

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@`
`7`	`7`
`8`	`8`	`have_library("freetype", "FT_Init_FreeType") and`
`9`	`9`	`create_makefile("ft2")`
`10`		`-`