summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLionel Orry <lionel.orry@gmail.com>2011-04-29 09:54:57 +0200
committerjeremyz <jeremy@asynk.ch>2011-04-29 15:46:12 +0200
commitcd09ccaf2c48dce97c8df94a922ead968549a494 (patch)
tree25a9b85fcc1611a2c4af83596fae4073b50b853a
parent06bc980aebf49a717bf9e46fc816ca14ae4740cc (diff)
downloadffi-efl-cd09ccaf2c48dce97c8df94a922ead968549a494.zip
ffi-efl-cd09ccaf2c48dce97c8df94a922ead968549a494.tar.gz
make genruby.rb compliant with ruby 1.8.
The 'typedef enum' regexp has been simplified a lot, it seems to me that it's sufficient like that.
-rwxr-xr-xtools/genruby.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/genruby.rb b/tools/genruby.rb
index fafa6a9..4177447 100755
--- a/tools/genruby.rb
+++ b/tools/genruby.rb
@@ -157,7 +157,7 @@ def gen_enums path, indent
r = []
open(path+'-enums','r').readlines.each do |l|
l.strip!
- if not l=~/(typedef enum(?: \w+)?) {([A-Z0-9_ (\s*=\s*-?[\d+]),]+)} (\w+);/
+ if not l=~/(typedef enum(?: \w+)?) \{([-A-Z0-9_=, ]+)\} (\w+);/
r << indent+"# #{l}\n#{indent}# FIXME"
next
end
@@ -239,12 +239,12 @@ def gen_functions path, indent
r
end
#
-Dir.mkdir lib_path unless Dir.exists? lib_path
+Dir.mkdir lib_path unless (File.exists? lib_path)
#
libraries.collect do |header,module_name,fct_prefix,lib, output|
base = File.join path, 'api', header
output = File.join lib_path, output
- Dir.mkdir File.dirname output unless Dir.exists? File.dirname output
+ Dir.mkdir File.dirname(output) unless File.exists? File.dirname(output)
printf "%-60s", "parse #{base}-*"
r = [lib, output, module_name, fct_prefix ]
print "enums, "