lib/ruby/1.8/syslog.rb lib/ruby/site_ruby/1.8/ffi/platform/darwin/platform.conf lib/ruby/site_ruby/1.8/ffi/platform/darwin/types.conf lib/ruby/site_ruby/1.8/ffi/platform/syslog.rb lib/ruby/site_ruby/1.8/ffi/tools/Rakefile lib/ruby/site_ruby/1.8/ffi/tools/platform.rake @@ -204,10 +204,44 @@ module JFFI # Use for a C struct with a char [] embedded inside. add_typedef(NativeType::CHAR_ARRAY, :char_array) - + + # Load all the platform dependent types/consts/struct members + class Config + CONFIG = Hash.new + begin + File.open(File.join(Platform::CONF_DIR, 'platform.conf'), "r") do |f| + typedef = "rbx.platform.typedef." + f.each_line { |line| + if line.index(typedef) == 0 + new_type, orig_type = line.chomp.slice(typedef.length..-1).split(/\s*=\s*/) + JFFI.add_typedef(orig_type.to_sym, new_type.to_sym) + else + key, value = line.chomp.split(/\s*=\s*/) + puts "key=#{key} value=#{value}" + CONFIG[key] = value + end + } + end + rescue Errno::ENOENT + end + def self.[](name) + + end + end # Load all the platform dependent types - require "ffi/platform/#{Config::CONFIG['host_os']}" - PlatformTypes.each_pair { |k, v| add_typedef(v.to_sym, k.to_sym) } + begin + File.open(File.join(Platform::CONF_DIR, 'types.conf'), "r") do |f| + prefix = "rbx.platform.typedef." + f.each_line { |line| + if line.index(prefix) == 0 + new_type, orig_type = line.chomp.slice(prefix.length..-1).split(/\s*=\s*/) +# puts "new type=#{new_type} orig_type=#{orig_type}" + add_typedef(orig_type.to_sym, new_type.to_sym) + end + } + end + rescue Errno::ENOENT + end TypeSizes = { 1 => :char, @@ -583,7 +617,7 @@ class FFI::Struct < JFFI::BaseStruct end def self.config(base, *fields) - config = Config::CONFIG + config = JFFI::Config::CONFIG @size = config["#{base}.sizeof"] builder = JFFI::StructLayoutBuilder.new lib/ruby/site_ruby/1.8/ffi/ffi.rb @@ -41,5 +41,13 @@ module JFFI IS_SOLARIS = OS_NAME_LC.index(SOLARIS) == 0 IS_BSD = IS_MAC || IS_FREEBSD ARCH = java.lang.System.getProperty("os.arch") + NAME = if IS_WINDOWS + "#{ARCH}-windows" + elsif IS_MAC + "darwin" + elsif IS_FREEBSD + "#{ARCH}-freebsd" + end + CONF_DIR = File.join(File.dirname(__FILE__), "platform", NAME) end end \ No newline at end of file lib/ruby/site_ruby/1.8/ffi/platform.rb 5745080d137e5a19f3a09ee82828725242240dad wmeissner wmeissner@961051c9-f516-0410-bf72-c9f7e237a7b7 http://github.com/vvs/jruby/commit/f0be9bbac71daf73dee5b7ab235c745fa1b75759 f0be9bbac71daf73dee5b7ab235c745fa1b75759 2008-07-23T05:02:45-07:00 2008-07-23T05:02:45-07:00 Merge branch 'ffi' git-svn-id: https://svn.codehaus.org/jruby/trunk/jruby@7271 961051c9-f516-0410-bf72-c9f7e237a7b7 ca42a9c23215d38fa581f073e38966ecc8bba9c9 wmeissner wmeissner@961051c9-f516-0410-bf72-c9f7e237a7b7