mirror of
https://github.com/ruby-opencv/ruby-opencv
synced 2023-03-27 23:22:12 -04:00
Merge branch 'develop'
This commit is contained in:
commit
e01ef48716
3 changed files with 12 additions and 11 deletions
2
Rakefile
2
Rakefile
|
@ -30,7 +30,7 @@ hoespec = Hoe.spec 'ruby-opencv' do |s|
|
||||||
s.test_globs = ['test/test_*.rb']
|
s.test_globs = ['test/test_*.rb']
|
||||||
s.urls = ['https://github.com/ruby-opencv/ruby-opencv/']
|
s.urls = ['https://github.com/ruby-opencv/ruby-opencv/']
|
||||||
|
|
||||||
s.extra_dev_deps << ['rake-compiler', '>= 0'] << ['hoe-gemspec']
|
s.extra_dev_deps << ['rake-compiler', '~> 0'] << ['hoe-gemspec', '~> 0']
|
||||||
|
|
||||||
Rake::ExtensionTask.new('opencv', spec) do |ext|
|
Rake::ExtensionTask.new('opencv', spec) do |ext|
|
||||||
ext.lib_dir = 'lib'
|
ext.lib_dir = 'lib'
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
module OpenCV
|
module OpenCV
|
||||||
VERSION = '0.0.11'
|
VERSION = '0.0.12.pre'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
# -*- encoding: utf-8 -*-
|
# -*- encoding: utf-8 -*-
|
||||||
# stub: ruby-opencv 0.0.11.20140119025355 ruby lib
|
# stub: ruby-opencv 0.0.12.pre.20140119031203 ruby lib
|
||||||
# stub: ext/opencv/extconf.rb
|
# stub: ext/opencv/extconf.rb
|
||||||
|
|
||||||
Gem::Specification.new do |s|
|
Gem::Specification.new do |s|
|
||||||
s.name = "ruby-opencv"
|
s.name = "ruby-opencv"
|
||||||
s.version = "0.0.11.20140119025355"
|
s.version = "0.0.12.pre.20140119031203"
|
||||||
|
|
||||||
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
|
||||||
s.require_paths = ["lib"]
|
s.require_paths = ["lib"]
|
||||||
s.authors = ["lsxi", "ser1zw", "pcting"]
|
s.authors = ["lsxi", "ser1zw", "pcting"]
|
||||||
s.date = "2014-01-18"
|
s.date = "2014-01-18"
|
||||||
|
@ -28,19 +28,19 @@ Gem::Specification.new do |s|
|
||||||
|
|
||||||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
||||||
s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
|
s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
|
||||||
s.add_development_dependency(%q<rake-compiler>, [">= 0"])
|
s.add_development_dependency(%q<rake-compiler>, ["~> 0"])
|
||||||
s.add_development_dependency(%q<hoe-gemspec>, [">= 0"])
|
s.add_development_dependency(%q<hoe-gemspec>, ["~> 0"])
|
||||||
s.add_development_dependency(%q<hoe>, ["~> 3.8"])
|
s.add_development_dependency(%q<hoe>, ["~> 3.8"])
|
||||||
else
|
else
|
||||||
s.add_dependency(%q<rdoc>, ["~> 4.0"])
|
s.add_dependency(%q<rdoc>, ["~> 4.0"])
|
||||||
s.add_dependency(%q<rake-compiler>, [">= 0"])
|
s.add_dependency(%q<rake-compiler>, ["~> 0"])
|
||||||
s.add_dependency(%q<hoe-gemspec>, [">= 0"])
|
s.add_dependency(%q<hoe-gemspec>, ["~> 0"])
|
||||||
s.add_dependency(%q<hoe>, ["~> 3.8"])
|
s.add_dependency(%q<hoe>, ["~> 3.8"])
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
s.add_dependency(%q<rdoc>, ["~> 4.0"])
|
s.add_dependency(%q<rdoc>, ["~> 4.0"])
|
||||||
s.add_dependency(%q<rake-compiler>, [">= 0"])
|
s.add_dependency(%q<rake-compiler>, ["~> 0"])
|
||||||
s.add_dependency(%q<hoe-gemspec>, [">= 0"])
|
s.add_dependency(%q<hoe-gemspec>, ["~> 0"])
|
||||||
s.add_dependency(%q<hoe>, ["~> 3.8"])
|
s.add_dependency(%q<hoe>, ["~> 3.8"])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue