cxxproject 0.5.47 → 0.5.48

data/Rakefile.rb

@@ -52,7 +52,7 @@ begin
       puts 'please gem install roodi'
   end
 rescue LoadError => e
-    puts "please missing gems #{e}" 
+    puts "please missing gems #{e}"
 end
 
 def two_digits(x)
@@ -67,7 +67,7 @@ begin
   require 'grit'
   include Grit
 
-  def git_history      
+  def git_history
     repo = Repo.new('.')
     tag_names = repo.tags.collect {|t| t.name }
     relevant_tags = repo.tags.reject {|t| !t.name.start_with?("v_")}
@@ -83,7 +83,7 @@ begin
       change_text << "#{a.name} => #{b.name}"
       change_text << ""
       cs = repo.commits_between(a.commit, b.commit)
-      cm = cs.each do |c| 
+      cm = cs.each do |c|
         change_lines = c.message.lines.to_a
         first = change_lines.first
         change_text << "    * " + first + "#{change_lines[1..-1].collect {|l| "      #{l}"}.join("")}"
@@ -91,7 +91,7 @@ begin
     end
     change_text
   end
-      
+
   desc 'generate version history'
   task :generate_history do
     puts git_history

data/lib/cxxproject/buildingblocks/executable.rb

@@ -25,7 +25,7 @@ module Cxxproject
       @mapfile = x
       self
     end
-    
+
     def initialize(name)
       super(name)
       @linker_script = nil
@@ -85,14 +85,14 @@ module Cxxproject
 
     def calc_linker_lib_string_recursive(d)
       res = []
-    
+
       return res if @dep_set.include?d
       @dep_set << d
-    
+
       if HasLibraries === d
         prefix = nil
         linker = @tcs[:LINKER]
-      
+
         d.lib_elements.each do |elem|
           case elem[0]
             when HasLibraries::LIB
@@ -116,7 +116,7 @@ module Cxxproject
           end
         end
       end
-      
+
       res
     end
 
@@ -145,7 +145,7 @@ module Cxxproject
 
           mapfileStr = @mapfile ? " >#{@mapfile}" : ""
           if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
+            cmd.map! {|c| ((c.include?(" ")) ? ("\""+c+"\"") : c )}
 
             # TempFile used, because some compilers, e.g. diab, uses ">" for piping to map files:
             cmdLine = cmd.join(" ") + " 2>" + get_temp_filename
@@ -157,7 +157,7 @@ module Cxxproject
             else
               consoleOutput = `#{cmd.join(" ") + mapfileStr + " 2>" + get_temp_filename}`
             end
-            consoleOutput.concat(read_file_or_empty_string(get_temp_filename))          
+            consoleOutput.concat(read_file_or_empty_string(get_temp_filename))
           else
             rd, wr = IO.pipe
             cmd << {
@@ -171,9 +171,9 @@ module Cxxproject
             cmd << " >#{@mapfile}" if @mapfile
             consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
           end
-          
+
           process_result(cmd, consoleOutput, linker[:ERROR_PARSER], "Linking #{get_executable_name}")
-            
+
           check_config_file()
         end
       end
@@ -183,7 +183,7 @@ module Cxxproject
       add_output_dir_dependency(get_task_name, res, true)
       add_grouping_tasks(get_task_name)
       setup_rake_dependencies(res, object_multitask)
-      
+
       # check that all source libs are checked even if they are not a real rake dependency (can happen if "build this project only")
       begin
         libChecker = task get_task_name+"LibChecker" do
@@ -209,7 +209,6 @@ module Cxxproject
       libChecker.transparent_timestamp = true
       res.enhance([libChecker])
 
-      
       return res
     end
 
@@ -225,15 +224,21 @@ module Cxxproject
       namespace 'run' do
         desc "run executable #{executable}"
         res = task name => executable do |t|
-          run_command(t, executable)
+          sh executable
         end
         res.type = Rake::Task::RUN
         res
       end
-    end
-
-    def run_command(task, command)
-      sh "#{command}"
+      if Valgrind::available?
+        namespace 'valgrind' do
+          desc "run executable #{executable} with valgrind"
+          res = task name => executable do |t|
+            sh "valgrind #{executable}"
+          end
+          res.type = Rake::Task::RUN
+          res
+        end
+      end
     end
 
     def get_temp_filename

data/lib/cxxproject/torake.rb

@@ -12,6 +12,7 @@ require 'cxxproject/buildingblocks/custom_building_block'
 require 'cxxproject/buildingblocks/command_line'
 require 'cxxproject/toolchain/colorizing_formatter'
 require 'cxxproject/eval_context'
+require 'cxxproject/utils/valgrind'
 
 module Cxxproject
   class CxxProject2Rake
@@ -30,7 +31,7 @@ module Cxxproject
         toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
         toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
       end
-      
+
       Rake::application.deriveIncludes = true
 
       initialize_logging
@@ -93,7 +94,12 @@ module Cxxproject
     end
 
     def create_generic_tasks
-      [:lib, :exe, :run, nil].each { |i| create_filter_task_with_namespace(i) }
+      tasks = [:lib, :exe, :run]
+      if Cxxproject::Valgrind::available?
+        tasks << :valgrind
+      end
+      tasks << nil
+      tasks.each { |i| create_filter_task_with_namespace(i) }
     end
 
     def create_filter_task_with_namespace(basename)

data/lib/cxxproject/utils/valgrind.rb

@@ -0,0 +1,11 @@
+module Cxxproject
+  class Valgrind
+    @@valgrind_available = nil
+    def self.available?
+      if @@valgrind_available == nil
+        @@valgrind_available = `which valgrind`.strip.length > 0
+      end
+      return @@valgrind_available
+    end
+  end
+end

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      "0.5.47"
+      "0.5.48"
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.47
+  version: 0.5.48
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-13 00:00:00 Z
+date: 2011-12-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -67,6 +67,7 @@ files:
 - lib/cxxproject/utils/graphstream.rb
 - lib/cxxproject/utils/progress.rb
 - lib/cxxproject/utils/rbcurse_executable_ext.rb
+- lib/cxxproject/utils/valgrind.rb
 - lib/cxxproject/utils/progress_helper.rb
 - lib/cxxproject/utils/stats.rb
 - lib/cxxproject/utils/optional.rb
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Cpp Support for Rake.