rbplusplus 0.1 → 0.1.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/rdoctask'
 require 'rake/contrib/sshpublisher'
 
 PROJECT_NAME = "rb++"
-RBPLUSPLUS_VERSION = "0.1"
+RBPLUSPLUS_VERSION = "0.1.1"
 
 task :default => :test
 
@@ -57,7 +57,8 @@ Rb++ combines the powerful query interface of rbgccxml and the Rice library to
 make Ruby wrapping extensions easier to write than ever.
   END
 
-  s.add_dependency "rbgccxml", "=0.1"
+  s.add_dependency "rbgccxml", "0.1.1"
+  s.add_dependency "rice", "1.0.1"
 
   patterns = [
     'TODO',

data/lib/rbplusplus/extension.rb

@@ -54,6 +54,12 @@ module RbPlusPlus
     # List of libraries to link
     attr_accessor :libraries
 
+    # List of extra CXXFLAGS that might need to be added to compile lines
+    attr_accessor :cxxflags
+
+    # List of extra LDFLAGS that might need to be added to compile lines
+    attr_accessor :ldflags
+
     # Create a new Ruby extension with a given name. This name will be
     # the module built into the extension. 
     # This constructor can be standalone or take a block. 
@@ -64,6 +70,8 @@ module RbPlusPlus
       @includes = []
       @lib_paths = []
       @libraries = []
+      @cxxflags = []
+      @ldflags = []
 
       if block
         build_working_dir(&block)
@@ -83,6 +91,8 @@ module RbPlusPlus
     # * <tt>:include_paths</tt> - An array or string of full paths to be added as -I flags
     # * <tt>:library_paths</tt> - An array or string of full paths to be added as -L flags
     # * <tt>:libraries</tt> - An array or string of full paths to be added as -l flags
+    # * <tt>:cxxflags</tt> - An array or string of flags to be added to command line for parsing / compiling
+    # * <tt>:ldflags</tt> - An array or string of flags to be added to command line for linking
     def sources(dirs, options = {})
       parser_options = {}
 
@@ -99,6 +109,15 @@ module RbPlusPlus
         @libraries << libs
       end
 
+      if (flags = options.delete(:cxxflags))
+        @cxxflags << flags
+        parser_options[:cxxflags] = @cxxflags
+      end
+
+      if (flags = options.delete(:ldflags))
+        @ldflags << flags
+      end
+
       @parser = RbGCCXML.parse(dirs, parser_options)
     end
 
@@ -151,6 +170,8 @@ module RbPlusPlus
       extconf.includes = @includes
       extconf.library_paths = @lib_paths
       extconf.libraries = @libraries
+      extconf.cxxflags = @cxxflags
+      extconf.ldflags = @ldflags
       extconf.write
     end
 

data/lib/rbplusplus/writers/extension.rb

@@ -15,19 +15,28 @@ module RbPlusPlus
       # List of -l directives
       attr_accessor :libraries
 
+      # Extra CXXFLAGS
+      attr_accessor :cxxflags
+
+      # Extra LDFLAGS
+      attr_accessor :ldflags
+
       def write
         extconf = File.join(working_dir, "extconf.rb")
 
         @includes ||= []
 
         inc_str = @includes.flatten.uniq.map {|i| "-I#{i}"}.join(" ")
+        inc_str += " " + @cxxflags.flatten.join(" ")
         lib_path_str = @library_paths.flatten.uniq.map {|i| "-L#{i}"}.join(" ")
         lib_str = @libraries.flatten.uniq.map {|i| "-l#{i}"}.join(" ")
+        lib_str += " " + @ldflags.flatten.join(" ")
 
         File.open(extconf, "w+") do |file|
           file.puts "require \"rubygems\""
           file.puts "require \"mkmf-rice\""
-          file.puts %Q($CPPFLAGS = $CPPFLAGS + " -I#{working_dir} #{inc_str} #{lib_path_str} #{lib_str}")
+          file.puts %Q($CPPFLAGS = $CPPFLAGS + " -I#{working_dir} #{inc_str}")
+          file.puts %Q($LDFLAGS = $LDFLAGS + " #{lib_path_str} #{lib_str}")
           file.puts "create_makefile(\"#{builder.name}\")"
         end
       end

data/lib/rbplusplus.rb

@@ -5,6 +5,7 @@ gem 'rbgccxml'
 require 'rbgccxml'
 
 require 'inflector'
+require 'fileutils'
 require 'rbplusplus/rbplusplus'
 
 module RbPlusPlus

data/test/compiling_test.rb

@@ -82,4 +82,48 @@ context "Compiler settings" do
     contents.should.match(%r(-lwonko))
     contents.should.match(%r(-lprankit))
   end
+
+  specify "can add extra cxxflags for gccxml and compiling" do
+    e = Extension.new "flags_test" 
+    e.working_dir = full_dir("generated")
+    e.sources full_dir("headers/empty.h"),
+      :cxxflags => "-I/i/love/scotch -D__AND_DEFINE_THAT"
+    e.build
+    e.write
+
+    ext_file = full_dir("generated/extconf.rb")
+
+    contents = File.read(ext_file)
+
+    contents.should.match(%r(-I/i/love/scotch))
+    contents.should.match(%r(-D__AND_DEFINE_THAT))
+  end
+
+  specify "can add extra ldflags for gccxml and compiling" do
+    e = Extension.new "flags_test" 
+    e.working_dir = full_dir("generated")
+    e.sources full_dir("headers/empty.h"),
+      :ldflags => "-R/wootage/to/you -lthisandthat -nothing_here"
+    e.build
+    e.write
+
+    ext_file = full_dir("generated/extconf.rb")
+
+    contents = File.read(ext_file)
+
+    contents.should.match(%r(-R/wootage/to/you))
+    contents.should.match(%r(-lthisandthat))
+    contents.should.match(%r(-nothing_here))
+  end
+
+  specify "should pass cxxflags to rbgccxml" do
+    should.not.raise do
+      e = Extension.new "parsing_test" 
+      e.working_dir = full_dir("generated")
+      e.sources full_dir("headers/requires_define.h"),
+        :cxxflags => "-DMUST_BE_DEFINED"
+      e.build
+      e.write
+    end
+  end
 end

data/test/generated/extconf.rb

@@ -0,0 +1,5 @@
+require "rubygems"
+require "mkmf-rice"
+$CPPFLAGS = $CPPFLAGS + " -I/home/roelofs/projects/rbplusplus/test/generated  "
+$LDFLAGS = $LDFLAGS + "   "
+create_makefile("adder")

data/test/headers/requires_define.h

@@ -0,0 +1,9 @@
+/**
+ * Test file that's for ensuring that extra CXXFLAGS are
+ * properly sent to GCCXML for when the preprocessor is 
+ * looking for other defines
+ */
+
+#ifndef MUST_BE_DEFINED
+  #error "You're not defining the key that must be defined!"
+#endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbplusplus
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jason Roelofs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -04:00
+date: 2008-05-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,16 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: 0.1.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rice
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
     version: 
 description: Rb++ combines the powerful query interface of rbgccxml and the Rice library to  make Ruby wrapping extensions easier to write than ever.
 email: jameskilton@gmail.com
@@ -76,6 +85,7 @@ summary: Ruby library to generate Rice wrapper code
 test_files: 
 - test/classes_test.rb
 - test/extension_test.rb
+- test/generated/extconf.rb
 - test/compiling_test.rb
 - test/modules_test.rb
 - test/functions_test.rb
@@ -84,6 +94,7 @@ test_files:
 - test/headers/Subtracter.hpp
 - test/headers/functions.h
 - test/headers/empty.h
+- test/headers/requires_define.h
 - test/headers/nested_classes.h
 - test/headers/with_includes.h
 - test/headers/include