excel_to_code 0.2.30 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa73f5ef66a52e67a5026d4e791460a6b4a2544
-  data.tar.gz: add03f41738bc8df14386bfbb2cdadb25131a4ee
+  metadata.gz: cf2febec784c194d3e592c78776f535a15458009
+  data.tar.gz: 9e9a0c83fe42ba73acc0d0b579197194a0ee786b
 SHA512:
-  metadata.gz: dc43795e22c77771abf29b37a911149130c1686152c989cc9271ca06eb5b981aeeb709d4055f2160e98be0fd873f47964e7c90e8d0e9df723f48d9a1124429d1
-  data.tar.gz: bd26b2ab4e65db5fcbe19d57460be77bf23980a3410e45b84270bde1d0bf4e961218dfb44721afaa4f3c4e2799ef72f6bde1b3d6ba6818eb68fafd0a73ecdbfe
+  metadata.gz: b141c54fa32c28b2d320885323c7ebf77f941758d07996e5fe435354c1f1d8c1cc3928ebc22f27c2051e31f46a28f6bc86a576696651704a39f6206b429f79c9
+  data.tar.gz: 7eaac74f6bb96cb5c00537b018d80b925f72704545be91e0d83c7e03e9e3cf8c6996cfa1efd8174871d26fe7fa311b293c4bbcb83feb38e6235f327a3b028cbd

data/bin/excel_to_c

@@ -57,7 +57,23 @@ END
     command.should_inline_formulae_that_are_only_used_once = false
     command.extract_repeated_parts_of_formulae = false
   end
+
+  opts.on('--makefile', 'Generate a makefile') do
+    command.create_makefile = true
+  end
+
+  opts.on('--no-makefile', 'Do not generate a makefile (default)') do
+    command.create_makefile = false
+  end
   
+  opts.on('--rakefile', 'Generate a rakefile (default)') do
+    command.create_rakefile = true
+  end
+
+  opts.on('--no-rakefile', 'Do not generate a rakefile') do
+    command.create_rakefile = false
+  end
+
   opts.on("-h", "--help", "Show this message") do
     puts opts
     exit

data/src/commands/excel_to_c.rb

@@ -3,7 +3,18 @@ require_relative 'excel_to_x'
 require 'ffi'
 
 class ExcelToC < ExcelToX
+
+  # If true, creates a Rakefile, if false, doesn't (default true)
+  attr_accessor :create_rakefile
+  # If true, creates a Makefile, if false, doesn't (default false)
+  attr_accessor :create_makefile
   
+  def set_defaults
+    super
+    @create_rakefile = true if @create_rakefile == nil
+    @create_makefile = false if @create_makefile == nil
+  end
+
   def language
     "c"
   end
@@ -98,28 +109,75 @@ class ExcelToC < ExcelToX
   # is set properly
   def write_build_script
     log.info "Writing Build script"
+    write_makefile if create_makefile
+    write_rakefile if create_rakefile
+  end
+
+  def write_makefile
+    log.info "Writing Makefile"
 
-    o = output("Makefile")
     name = output_name.downcase
-    
+    o = output("Makefile")
+
     # Target for shared library
     shared_library_name = FFI.map_library_name(name)
     o.puts "#{shared_library_name}: #{name}.o"
     o.puts "\tgcc -shared -o #{shared_library_name} #{name}.o"
     o.puts
-    
+
     # Target for compiled version
     o.puts "#{name}.o:"
     o.puts "\tgcc -fPIC -c #{name}.c"
     o.puts
-    
+
     # Target for cleaning
     o.puts "clean:"
     o.puts "\trm #{name}.o"
     o.puts "\trm #{shared_library_name}"
-    
+
     close(o)
   end
+
+  def write_rakefile
+    log.info "Writing Rakefile"
+
+    o = output("Rakefile")
+    name = output_name.downcase
+    o.puts "require 'ffi'"
+    o.puts
+
+    o.puts "this_directory = File.dirname(__FILE__)"
+    o.puts
+    o.puts "COMPILER = 'gcc'"
+    o.puts "COMPILE_FLAGS = '-fPIC'"
+    o.puts "SHARED_LIBRARY_FLAGS = '-shared -fPIC'"
+    o.puts
+
+    o.puts "OUTPUT = FFI.map_library_name '#{name}'"
+    o.puts "OUTPUT_DIR = this_directory" 
+    o.puts "SOURCE = '#{name}.c'"
+    o.puts "OBJECT = '#{name}.o'"
+    o.puts
+
+    o.puts "task :default => [:build]"
+    o.puts
+    o.puts "desc 'Build the 2050 model, then install it'"
+    o.puts "task :build => [OUTPUT]"
+    o.puts
+
+    o.puts "file OUTPUT => OBJECT do"
+    o.puts '  puts "Turning #{OBJECT} and putting it in #{OUTPUT_DIR} as #{OUTPUT}"'
+    o.puts '  puts "Note that this is a really large c file, it may take tens of minutes to compile."'
+    o.puts '  sh "#{COMPILER} #{SHARED_LIBRARY_FLAGS} -o #{File.join(OUTPUT_DIR,OUTPUT)} #{OBJECT}"'
+    o.puts 'end'
+    o.puts
+
+    o.puts 'file OBJECT => SOURCE do'
+    o.puts '  puts "Building #{SOURCE}"'
+    o.puts '  puts "Note that this is a really large c file, it may take tens of minutes to compile."'
+    o.puts '  sh "#{COMPILER} #{COMPILE_FLAGS} -o #{OBJECT} -c #{SOURCE}"'
+    o.puts 'end'
+  end
   
   def write_fuby_ffi_interface
     log.info "Writing ruby FFI code"
@@ -131,7 +189,7 @@ class ExcelToC < ExcelToX
 require 'ffi'
 require 'singleton'
 
-class #{ruby_module_name}Shim
+class #{ruby_module_name}
 
   # WARNING: this is not thread safe
   def initialize
@@ -139,7 +197,7 @@ class #{ruby_module_name}Shim
   end
 
   def reset
-    #{ruby_module_name}.reset
+    C.reset
   end
 
   def method_missing(name, *arguments)
@@ -153,8 +211,8 @@ class #{ruby_module_name}Shim
   end
 
   def get(name)
-    return 0 unless #{ruby_module_name}.respond_to?(name)
-    ruby_value_from_excel_value(#{ruby_module_name}.send(name))
+    return 0 unless C.respond_to?(name)
+    ruby_value_from_excel_value(C.send(name))
   end
 
   def ruby_value_from_excel_value(excel_value)
@@ -167,11 +225,11 @@ class #{ruby_module_name}Shim
       r = excel_value[:rows]
       c = excel_value[:columns]
       p = excel_value[:array]
-      s = #{ruby_module_name}::ExcelValue.size
+      s = C::ExcelValue.size
       a = Array.new(r) { Array.new(c) }
       (0...r).each do |row|
         (0...c).each do |column|
-          a[row][column] = ruby_value_from_excel_value(#{ruby_module_name}::ExcelValue.new(p + (((row*c)+column)*s)))
+          a[row][column] = ruby_value_from_excel_value(C::ExcelValue.new(p + (((row*c)+column)*s)))
         end
       end 
       return a
@@ -184,11 +242,11 @@ class #{ruby_module_name}Shim
   def set(name, ruby_value)
     name = name.to_s
     name = "set_\#{name[0..-2]}" if name.end_with?('=')
-    return false unless #{ruby_module_name}.respond_to?(name)
-    #{ruby_module_name}.send(name, excel_value_from_ruby_value(ruby_value))
+    return false unless C.respond_to?(name)
+    C.send(name, excel_value_from_ruby_value(ruby_value))
   end
 
-  def excel_value_from_ruby_value(ruby_value, excel_value = #{ruby_module_name}::ExcelValue.new)
+  def excel_value_from_ruby_value(ruby_value, excel_value = C::ExcelValue.new)
     case ruby_value
     when Numeric
       excel_value[:type] = :ExcelNumber
@@ -212,10 +270,10 @@ class #{ruby_module_name}Shim
         excel_value[:columns] = ruby_value.size
       end
       ruby_values = ruby_value.flatten
-      pointer = FFI::MemoryPointer.new(#{ruby_module_name}::ExcelValue, ruby_values.size)
+      pointer = FFI::MemoryPointer.new(C::ExcelValue, ruby_values.size)
       excel_value[:array] = pointer
       ruby_values.each.with_index do |v,i|
-        excel_value_from_ruby_value(v, #{ruby_module_name}::ExcelValue.new(pointer[i]))
+        excel_value_from_ruby_value(v, C::ExcelValue.new(pointer[i]))
       end
     when Symbol
       excel_value[:type] = :ExcelError
@@ -226,28 +284,26 @@ class #{ruby_module_name}Shim
     excel_value
   end
 
-end
-    
 
-module #{ruby_module_name}
-  extend FFI::Library
-  ffi_lib  File.join(File.dirname(__FILE__),FFI.map_library_name('#{name}'))
-  ExcelType = enum :ExcelEmpty, :ExcelNumber, :ExcelString, :ExcelBoolean, :ExcelError, :ExcelRange
-                
-  class ExcelValue < FFI::Struct
-    layout :type, ExcelType,
-  	       :number, :double,
-  	       :string, :pointer,
-         	 :array, :pointer,
-           :rows, :int,
-           :columns, :int             
-  end
+  module C 
+    extend FFI::Library
+    ffi_lib  File.join(File.dirname(__FILE__),FFI.map_library_name('#{name}'))
+    ExcelType = enum :ExcelEmpty, :ExcelNumber, :ExcelString, :ExcelBoolean, :ExcelError, :ExcelRange
+                  
+    class ExcelValue < FFI::Struct
+      layout :type, ExcelType,
+             :number, :double,
+             :string, :pointer,
+             :array, :pointer,
+             :rows, :int,
+             :columns, :int             
+    end
   
 END
     o.puts code
     o.puts
-    o.puts "  # use this function to reset all cell values"
-    o.puts "  attach_function 'reset', [], :void"
+    o.puts "    # use this function to reset all cell values"
+    o.puts "    attach_function 'reset', [], :void"
 
 
     worksheets do |name, xml_filename|
@@ -258,7 +314,7 @@ END
       if settable_refs
         settable_refs = @formulae.keys.select { |k| k.first == name }.map { |k| k.last } if settable_refs == :all
         settable_refs.each do |ref|
-          o.puts "  attach_function 'set_#{c_name}_#{ref.downcase}', [ExcelValue.by_value], :void"
+          o.puts "    attach_function 'set_#{c_name}_#{ref.downcase}', [ExcelValue.by_value], :void"
         end
       end
 
@@ -272,26 +328,27 @@ END
       end
               
       getable_refs.each do |ref|
-        o.puts "  attach_function '#{c_name}_#{ref.downcase}', [], ExcelValue.by_value"
+        o.puts "    attach_function '#{c_name}_#{ref.downcase}', [], ExcelValue.by_value"
       end
         
-      o.puts "  # end of #{name}"
+      o.puts "    # end of #{name}"
     end
 
-    o.puts "  # Start of named references"
+    o.puts "    # Start of named references"
     # Getters
     @named_references_to_keep.each do |name|
-      o.puts "  attach_function '#{c_name_for(name)}', [], ExcelValue.by_value"
+      o.puts "    attach_function '#{c_name_for(name)}', [], ExcelValue.by_value"
     end
 
     # Setters
     @named_references_that_can_be_set_at_runtime.each do |name|
-      o.puts "  attach_function 'set_#{c_name_for(name)}', [ExcelValue.by_value], :void"
+      o.puts "    attach_function 'set_#{c_name_for(name)}', [ExcelValue.by_value], :void"
     end
 
-    o.puts "  # End of named references"
+    o.puts "    # End of named references"
 
-    o.puts "end"  
+    o.puts "  end # C module"  
+    o.puts "end # #{ruby_module_name}"  
     close(o)
   end
   
@@ -311,7 +368,7 @@ END
     o.puts "    methods = methods_matching(/^test_/)"
     o.puts "  end" 
     o.puts "  def worksheet; @worksheet ||= init_spreadsheet; end"
-    o.puts "  def init_spreadsheet; #{ruby_module_name}Shim.new end"
+    o.puts "  def init_spreadsheet; #{ruby_module_name}.new end"
     
     CompileToCUnitTest.rewrite(Hash[@references_to_test_array], sloppy_tests, @worksheet_c_names, @constants, o)
     o.puts "end"
@@ -321,8 +378,11 @@ END
   
   def compile_code
     return unless actually_compile_code || actually_run_tests
-    puts "Compiling the resulting c code"
-    puts `cd #{File.join(output_directory)}; make clean; make`
+    name = output_name.downcase
+    log.info "Compiling"
+    puts `cd #{output_directory}`
+    puts `gcc -fPIC -o #{name}.o -c #{name}.c`
+    puts `gcc -shared -fPIC -o #{FFI.map_library_name(name)} #{name}.o`
   end
   
   def run_tests

data/src/excel_to_code.rb

@@ -1,5 +1,5 @@
 class ExcelToCode
-  def self.version() "0.2.30" end
+  def self.version() "0.3.1" end
 end
 
 require_relative 'commands'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.3.1
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg