summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy.zurcher@heraeus.com>2011-04-20 09:47:47 +0200
committerJérémy Zurcher <jeremy.zurcher@heraeus.com>2011-04-20 09:47:47 +0200
commit1cc2c83a0241ff8d36811d40062ba26ae8e28485 (patch)
treec88feb9f3d012b8a9e9d7f286ea2bd8ae02233a3
parent0e9018d11822ba3afeea664dc9326de0d272602b (diff)
downloadffi-efl-1cc2c83a0241ff8d36811d40062ba26ae8e28485.zip
ffi-efl-1cc2c83a0241ff8d36811d40062ba26ae8e28485.tar.gz
set edje lib and specs, remove eina lib and specs
-rw-r--r--lib/e17/edje.rb20
-rw-r--r--lib/e17/eina.rb26
-rw-r--r--spec/edje_spec.rb14
-rw-r--r--spec/eina_spec.rb22
4 files changed, 9 insertions, 73 deletions
diff --git a/lib/e17/edje.rb b/lib/e17/edje.rb
index 1e5ff87..c86b431 100644
--- a/lib/e17/edje.rb
+++ b/lib/e17/edje.rb
@@ -1,26 +1,10 @@
#! /usr/bin/env ruby
# -*- coding: UTF-8 -*-
#
-require 'e17/ffi_helper'
+require 'e17/edje/edje-ffi'
#
module E17
- module EDJE
- #
- extend FFIHelper
- extend FFI::Library
- #
- ffi_lib 'edje'
- #
- fcts = [
- # TODO
- # http://docs.enlightenment.org/auto/edje/Edje_8h.html
- [ :edje_init, [], :int],
- [ :edje_shutdown, [], :int],
- ]
- #
- attach_fcts fcts
- #
- create_aliases 'edje_'.length, fcts
+ module Edje
#
end
end
diff --git a/lib/e17/eina.rb b/lib/e17/eina.rb
deleted file mode 100644
index 9309cfe..0000000
--- a/lib/e17/eina.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-require 'e17/ffi_helper'
-#
-module E17
- module EINA
- #
- extend FFIHelper
- extend FFI::Library
- #
- ffi_lib 'eina'
- #
- fcts = [
- [ :eina_init, [], :int],
- [ :eina_shutdown, [], :int],
- ]
- #
- attach_fcts fcts
- #
- create_aliases 'eina_'.length, fcts
- #
- end
-end
-#
-# EOF
diff --git a/spec/edje_spec.rb b/spec/edje_spec.rb
index 79bab21..9ec6686 100644
--- a/spec/edje_spec.rb
+++ b/spec/edje_spec.rb
@@ -3,20 +3,20 @@
#
require 'e17/edje'
#
-describe E17::EDJE do
+describe E17::Edje do
#
include E17
#
it "should init" do
- EDJE.init.should eql 1
- EDJE.init.should eql 2
- EDJE.init.should eql 3
+ Edje.init.should eql 1
+ Edje.init.should eql 2
+ Edje.init.should eql 3
end
#
it "should shutdown" do
- EDJE.shutdown.should eql 2
- EDJE.shutdown.should eql 1
- EDJE.shutdown.should eql 0
+ Edje.shutdown.should eql 2
+ Edje.shutdown.should eql 1
+ Edje.shutdown.should eql 0
end
#
end
diff --git a/spec/eina_spec.rb b/spec/eina_spec.rb
deleted file mode 100644
index c110d67..0000000
--- a/spec/eina_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-require 'e17/eina'
-#
-describe E17::EINA do
- #
- include E17
- #
- it "should init" do
- EINA.init.should eql 1
- EINA.init.should eql 2
- EINA.init.should eql 3
- end
- #
- it "should shutdown" do
- EINA.shutdown.should eql 2
- EINA.shutdown.should eql 1
- EINA.shutdown.should eql 0
- end
- #
-end