made extension more rake-compiler friendly, made the spec task depend on "compile"
This commit is contained in:
parent
fdf3e53933
commit
04b9fe17cc
11
Rakefile
11
Rakefile
@ -1,7 +1,7 @@
|
|||||||
# encoding: UTF-8
|
# encoding: UTF-8
|
||||||
begin
|
begin
|
||||||
require 'jeweler'
|
require 'jeweler'
|
||||||
Jeweler::Tasks.new do |gem|
|
JEWELER = Jeweler::Tasks.new do |gem|
|
||||||
gem.name = "mysql2"
|
gem.name = "mysql2"
|
||||||
gem.summary = "A simple, fast Mysql library for Ruby, binding to libmysql"
|
gem.summary = "A simple, fast Mysql library for Ruby, binding to libmysql"
|
||||||
gem.email = "seniorlopez@gmail.com"
|
gem.email = "seniorlopez@gmail.com"
|
||||||
@ -10,7 +10,7 @@ begin
|
|||||||
gem.require_paths = ["lib", "ext"]
|
gem.require_paths = ["lib", "ext"]
|
||||||
gem.extra_rdoc_files = `git ls-files *.rdoc`.split("\n")
|
gem.extra_rdoc_files = `git ls-files *.rdoc`.split("\n")
|
||||||
gem.files = `git ls-files`.split("\n")
|
gem.files = `git ls-files`.split("\n")
|
||||||
gem.extensions = ["ext/extconf.rb"]
|
gem.extensions = ["ext/mysql2/extconf.rb"]
|
||||||
gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
|
gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
|
||||||
# gem.rubyforge_project = "mysql2"
|
# gem.rubyforge_project = "mysql2"
|
||||||
end
|
end
|
||||||
@ -20,6 +20,8 @@ end
|
|||||||
|
|
||||||
require 'rake'
|
require 'rake'
|
||||||
require 'spec/rake/spectask'
|
require 'spec/rake/spectask'
|
||||||
|
gem 'rake-compiler', '>= 0.4.1'
|
||||||
|
require "rake/extensiontask"
|
||||||
|
|
||||||
desc "Run all examples with RCov"
|
desc "Run all examples with RCov"
|
||||||
Spec::Rake::SpecTask.new('spec:rcov') do |t|
|
Spec::Rake::SpecTask.new('spec:rcov') do |t|
|
||||||
@ -32,4 +34,7 @@ end
|
|||||||
Spec::Rake::SpecTask.new('spec') do |t|
|
Spec::Rake::SpecTask.new('spec') do |t|
|
||||||
t.spec_files = FileList['spec/']
|
t.spec_files = FileList['spec/']
|
||||||
t.spec_opts << '--options' << 'spec/spec.opts'
|
t.spec_opts << '--options' << 'spec/spec.opts'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Rake::ExtensionTask.new("mysql2", JEWELER.gemspec)
|
||||||
|
Rake::Task[:spec].prerequisites << :compile
|
||||||
|
@ -80,4 +80,4 @@ File.unlink 'confout'
|
|||||||
$CFLAGS << ' -Wall -Wextra -funroll-loops'
|
$CFLAGS << ' -Wall -Wextra -funroll-loops'
|
||||||
# $CFLAGS << ' -O0 -ggdb3'
|
# $CFLAGS << ' -O0 -ggdb3'
|
||||||
|
|
||||||
create_makefile('mysql2_ext')
|
create_makefile('mysql2/mysql2')
|
@ -753,7 +753,7 @@ static VALUE rb_raise_mysql2_error(MYSQL *client) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Ruby Extension initializer */
|
/* Ruby Extension initializer */
|
||||||
void Init_mysql2_ext() {
|
void Init_mysql2() {
|
||||||
rb_require("date");
|
rb_require("date");
|
||||||
rb_require("bigdecimal");
|
rb_require("bigdecimal");
|
||||||
|
|
@ -1,9 +1,9 @@
|
|||||||
# encoding: UTF-8
|
# encoding: UTF-8
|
||||||
require 'mysql2_ext'
|
require 'mysql2.so'
|
||||||
|
|
||||||
# = Mysql2
|
# = Mysql2
|
||||||
#
|
#
|
||||||
# A modern, simple and very fast Mysql library for Ruby - binding to libmysql
|
# A modern, simple and very fast Mysql library for Ruby - binding to libmysql
|
||||||
module Mysql2
|
module Mysql2
|
||||||
VERSION = "0.1.8"
|
VERSION = "0.1.8"
|
||||||
end
|
end
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
# encoding: UTF-8
|
# encoding: UTF-8
|
||||||
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
|
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
|
||||||
|
require 'rubygems'
|
||||||
require 'active_record'
|
require 'active_record'
|
||||||
require 'active_record/connection_adapters/mysql2_adapter'
|
require 'active_record/connection_adapters/mysql2_adapter'
|
||||||
|
|
||||||
@ -145,4 +146,4 @@ describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
|
|||||||
test.set_test.should eql('val1,val2')
|
test.set_test.should eql('val1,val2')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user