cleaning rakefile, and structure of gem

This commit is contained in:
Leszek Zalewski 2012-06-10 21:08:25 +02:00
parent 96c63eac86
commit 636dfb2691
12 changed files with 72 additions and 59 deletions

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ log.txt
videowriter_result.avi
examples/contours/rotated-boxes-with-detected-bounding-rectangles.jpg
Gemfile.lock
.rvmrc

14
CHANGELOG.rdoc Normal file
View File

@ -0,0 +1,14 @@
=== 0.0.6 / 2012-01-19 00:15
* Improved gem layout
* moved extconf.rb to ext/opencv/extconf.rb
* moved ext/opencv/lib to root dir
* Cleaned Rakefile
=== 0.0.6 / 2008-06-27
* First gem release.
* Some OpenCV function wrapped.

View File

@ -4,3 +4,11 @@ gem "hoe"
gem "hoe-gemspec"
gem "rspec"
gem "rake-compiler"
group :development do
gem 'pry'
end
group :test do
gem 'rake'
end

View File

@ -1,5 +0,0 @@
=== 0.0.6 / 2008-06-27
* First gem release.
* Some OpenCV function wrapped.

View File

@ -1,9 +1,9 @@
.gitignore
Gemfile
History.txt
License.txt
Manifest.txt
README.rdoc
CHANGELOG.rdoc
Rakefile
examples/alpha_blend.rb
examples/box.png
@ -102,15 +102,13 @@ ext/opencv/cvutils.cpp
ext/opencv/cvutils.h
ext/opencv/cvvideowriter.cpp
ext/opencv/cvvideowriter.h
ext/opencv/extconf.rb
ext/opencv/gui.cpp
ext/opencv/gui.h
ext/opencv/iplconvkernel.cpp
ext/opencv/iplconvkernel.h
ext/opencv/iplimage.cpp
ext/opencv/iplimage.h
ext/opencv/lib/opencv.rb
ext/opencv/lib/opencv/psyched_yaml.rb
ext/opencv/lib/opencv/version.rb
ext/opencv/mouseevent.cpp
ext/opencv/mouseevent.h
ext/opencv/opencv.cpp
@ -121,11 +119,13 @@ ext/opencv/trackbar.cpp
ext/opencv/trackbar.h
ext/opencv/window.cpp
ext/opencv/window.h
extconf.rb
images/CvMat_sobel.png
images/CvMat_sub_rect.png
images/CvSeq_relationmap.png
images/face_detect_from_lena.jpg
lib/opencv.rb
lib/opencv/psyched_yaml.rb
lib/opencv/version.rb
opencv.gemspec
test/helper.rb
test/runner.rb

View File

@ -1,15 +1,17 @@
= OpenCV
The initial Open Computer Vision library was originally developed by Intel
Corporation. Recent development has been headed by Willow Garage, Inc.
* OpenCV project home http://opencv.willowgarage.com/wiki/
* OpenCV project home http://opencv.org | http://opencv.willowgarage.com/wiki/
* Download http://sourceforge.net/projects/opencvlibrary/
* Documentation http://docs.opencv.org/
* Ruby/OpenCV original author's web page http://blueruby.mydns.jp/opencv
== DESCRIPTION:
OpenCV wrapper for Ruby
OpenCV wrapper for Ruby. Currently wraps version 2.4, for olders,
checkout other branches.
The initial Open Computer Vision library was originally developed by Intel
Corporation. Recent development has been headed by Willow Garage, Inc.
== FEATURES/PROBLEMS:
@ -119,7 +121,7 @@ To add ruby-opencv in your Gemfile:
=== Face Detection
Here is a sample face detection program that doesn't rely on the GUI components.
In order for this to work you must copy the OpenCV haarcascades data into a
In order for this to work you must copy the OpenCV haarcascades data into a
subfolder called data.
#!/usr/bin/env ruby
@ -129,7 +131,7 @@ subfolder called data.
puts "Usage: your_app_name source dest"
exit
end
data = "./data/haarcascades/haarcascade_frontalface_alt.xml"
detector = OpenCV::CvHaarClassifierCascade::load(data)
image = OpenCV::IplImage.load(ARGV[0])

View File

@ -1,50 +1,43 @@
# -*- ruby -*-
require 'rubygems'
require './ext/opencv/lib/opencv/psyched_yaml'
require 'hoe'
require 'rake/extensiontask'
require './ext/opencv/lib/opencv/version'
require './lib/opencv/psyched_yaml'
Hoe.plugin :gemspec
hoespec = Hoe.spec 'opencv' do |p|
p.version = OpenCV::VERSION
p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
p.description = <<EOF
OpenCV wrapper for Ruby
EOF
p.rubyforge_name = 'opencv'
HOE = Hoe.spec 'opencv' do |p|
p.developer('lsxi', 'masakazu.yonekura@gmail.com')
p.developer('ser1zw', '')
p.developer('pcting', 'pcting@gmail.com')
p.developer('Leszek @zalesz Zalewski', 'contact@zalesz.com')
p.urls = ['https://github.com/ruby-opencv/ruby-opencv']
p.need_tar = false
p.need_zip = false
p.readme_file = 'README.rdoc'
p.history_file = 'History.txt'
p.spec_extras = {
:extensions => %w{extconf.rb}
}
p.summary = 'OpenCV wrapper for Ruby.'
p.history_file = 'CHANGELOG.rdoc'
p.spec_extras = { :extensions => 'ext/opencv/extconf.rb' }
p.test_globs = ['test/test_*.rb']
p.clean_globs << 'lib/*.so' << 'tmp'
p.urls = ['http://blueruby.mydns.jp/opencv']
p.extra_dev_deps << ['rake-compiler', '>= 0'] << ['hoe-gemspec'] << ['rspec']
Rake::ExtensionTask.new('opencv', spec) do |ext|
ext.lib_dir = File.join('lib', 'opencv')
end
end
hoespec.spec.files.delete('.gemtest')
hoespec.spec.files.delete('ruby-opencv.gemspec')
hoespec.spec.files.delete('opencv.gemspec')
hoespec.spec.cert_chain = []
hoespec.spec.signing_key = nil
require 'rake/extensiontask'
Rake::ExtensionTask.new(HOE.name, HOE.spec) do |ext|
ext.lib_dir = File.join('lib', 'opencv')
end
HOE.spec.files.delete('.gemtest')
HOE.spec.files.delete('ruby-opencv.gemspec')
HOE.spec.files.delete('opencv.gemspec')
HOE.spec.cert_chain = []
HOE.spec.signing_key = nil
Rake::Task[:test].prerequisites << :compile
# vim: syntax=Ruby
# vim: syntax=ruby

View File

@ -14,16 +14,17 @@ require "mkmf"
dir_config("opencv", "/usr/local/include", "/usr/local/lib")
dir_config("libxml2", "/usr/include", "/usr/lib")
opencv_headers = ["opencv2/core/core_c.h", "opencv2/core/core.hpp", "opencv2/imgproc/imgproc_c.h",
"opencv2/imgproc/imgproc.hpp", "opencv2/video/tracking.hpp", "opencv2/features2d/features2d.hpp",
"opencv2/flann/flann.hpp", "opencv2/calib3d/calib3d.hpp", "opencv2/objdetect/objdetect.hpp",
"opencv2/legacy/compat.hpp", "opencv2/legacy/legacy.hpp", "opencv2/highgui/highgui_c.h",
"opencv2/highgui/highgui.hpp", "opencv2/photo/photo.hpp", "opencv2/nonfree/nonfree.hpp"]
opencv_headers = %w(opencv2/core/core_c.h opencv2/core/core.hpp opencv2/imgproc/imgproc_c.h
opencv2/imgproc/imgproc.hpp opencv2/video/tracking.hpp opencv2/features2d/features2d.hpp
opencv2/flann/flann.hpp opencv2/calib3d/calib3d.hpp opencv2/objdetect/objdetect.hpp
opencv2/legacy/compat.hpp opencv2/legacy/legacy.hpp opencv2/highgui/highgui_c.h
opencv2/highgui/highgui.hpp opencv2/photo/photo.hpp opencv2/nonfree/nonfree.hpp)
opencv_libraries = ["opencv_calib3d", "opencv_contrib", "opencv_core", "opencv_features2d",
"opencv_flann", "opencv_gpu", "opencv_highgui", "opencv_imgproc",
"opencv_legacy", "opencv_ml", "opencv_objdetect", "opencv_video",
"opencv_photo", "opencv_nonfree"]
opencv_libraries = %w(opencv_calib3d opencv_contrib opencv_core opencv_features2d
opencv_flann opencv_gpu opencv_highgui opencv_imgproc
opencv_legacy opencv_ml opencv_objdetect opencv_video
opencv_photo opencv_nonfree)
puts ">> Check the required libraries..."
@ -61,5 +62,5 @@ have_header("stdarg.h")
$CFLAGS << " -I#{File.dirname(__FILE__)}/ext/opencv"
# Create Makefile
create_makefile("opencv", "./ext/opencv")
create_makefile("opencv/opencv")

View File

@ -1,3 +0,0 @@
require (File.dirname(__FILE__) + '/opencv/version')
require 'opencv.so'

2
lib/opencv.rb Normal file
View File

@ -0,0 +1,2 @@
require 'opencv/opencv'
require 'opencv/opencv.so'