cxxproject 0.6.5 → 0.6.6

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -190,6 +190,7 @@ module Cxxproject
       if hasError
         if not errorPrinted
           Printer.printError "Error: system command failed"
+          Printer.printError console_output
           res = ErrorDesc.new
           res.file_name = @project_dir
           res.line_number = 0

data/lib/cxxproject/ext/rake.rb

@@ -263,7 +263,6 @@ module Rake
     end
 
     define_method(:invoke) do |*args|
-      Cxxproject::ExitHelper.set_exit_code(0)
       invoke_org.bind(self).call(*args)
       if @failure or Rake.application.idei.get_abort
         Cxxproject::ExitHelper.set_exit_code(1)

data/lib/cxxproject/torake.rb

@@ -19,15 +19,15 @@ require 'rubygems'
 module Cxxproject
 
   class CxxProject2Rake
-    attr_accessor :base, :all_tasks
+    attr_accessor :base_dir, :all_tasks
 
-    def initialize(projects, build_dir, toolchain_name, base='.', &option_block)
+    def initialize(projects, build_dir, toolchain_name, base_dir='.', &option_block)
       load_cxx_plugins
       option_block.call if option_block
       toolchain = Provider[toolchain_name]
       raise "no provider with name \"#{toolchain_name}\" found" unless toolchain
-      @base = base
-      cd(@base, :verbose => false) do
+      @base_dir = base_dir
+      cd(@base_dir, :verbose => false) do
         @projects = projects.to_a
       end
 
@@ -42,7 +42,6 @@ module Cxxproject
       initialize_logging(build_dir)
       @all_tasks = instantiate_tasks(toolchain, build_dir)
 
-
       create_generic_tasks
       create_console_colorization
       create_multitask
@@ -88,11 +87,13 @@ module Cxxproject
       @log.level = Logger::ERROR
       @log.level = Logger::INFO if RakeFileUtils.verbose == true
       @log.level = Logger::DEBUG if Rake::application.options.trace
-      @log.debug "initializing for build_dir: \"#{build_dir}\", base: \"#{@base}\""
+      @log.debug "initializing for build_dir: \"#{build_dir}\", base_dir: \"#{@base_dir}\""
     end
+
     def describe_clean_task
       Rake::Task[:clean].add_description('clean')
     end
+
     def create_bail_on_first_task
       desc 'set bail on first error'
       task :bail_on_first_error do
@@ -176,7 +177,7 @@ module Cxxproject
     end
 
     def check_for_project_configs
-      cd(@base, :verbose => false) do
+      cd(@base_dir, :verbose => false) do
         @projects.each do |p|
           abort "project config #{p} cannot be found!" unless File.exists?(p)
         end
@@ -190,7 +191,7 @@ module Cxxproject
     end
 
     def register_projects()
-      cd(@base,:verbose => false) do |b|
+      cd(@base_dir,:verbose => false) do |b|
         @projects.each_with_index do |project_file, i|
           @log.debug "register project #{project_file}"
           dirname = File.dirname(project_file)
@@ -202,6 +203,7 @@ module Cxxproject
         end
       end
     end
+
     def eval_file(b, project_file)
       loadContext = EvalContext.new
       begin
@@ -220,6 +222,7 @@ module Cxxproject
         end
       end
     end
+
     def define_project_info_task
       desc "shows your defined projects"
       task :project_info do

data/lib/cxxproject/utils/cleanup.rb

@@ -8,6 +8,7 @@ module Cxxproject
     def self.cleanup_rake()
       ALL_BUILDING_BLOCKS.clear
       Rake.application.clear
+      Cxxproject::ExitHelper.set_exit_code(nil)
       Rake.application.idei.set_abort(false)
       CLEAN.pending_add.clear
       CLEAN.items.clear

data/lib/cxxproject/utils/exit_helper.rb

@@ -3,7 +3,7 @@ module Cxxproject
   end
 
   class ExitHelper
-    @@exit_code = 0
+    @@exit_code = nil
     @@exit_test = false
 
     def self.set_exit_code(val)
@@ -36,5 +36,5 @@ module Cxxproject
 end
 
 at_exit do
-  exit(Cxxproject::ExitHelper.exit_code)
+  exit(Cxxproject::ExitHelper.exit_code) unless Cxxproject::ExitHelper.exit_code.nil?
 end

data/lib/cxxproject/version.rb

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

data/spec/building_block_spec.rb

@@ -5,6 +5,7 @@ require 'cxxproject'
 require 'cxxproject/utils/cleanup'
 
 describe Cxxproject::BuildingBlock do
+  compiler = 'gcc'
 
   before(:each) do
     Cxxproject::Utils.cleanup_rake
@@ -38,10 +39,10 @@ describe Cxxproject::BuildingBlock do
     lib2 = Cxxproject::SourceLibrary.new('lib2').set_sources(['test.cc']).set_output_dir('build2')
     lib2.set_project_dir(File.join(Dir.pwd, 'lib2'))
 
-    cxx = CxxProject2Rake.new([], 'build', "clang")
-    
-    cxx.prepare_block(lib1, Provider["clang"], "build")
-    cxx.prepare_block(lib2, Provider["clang"], "build")
+    cxx = CxxProject2Rake.new([], 'build', compiler)
+
+    cxx.prepare_block(lib1, Provider[compiler], "build")
+    cxx.prepare_block(lib2, Provider[compiler], "build")
 
     lib1.complete_output_dir.should eq(File.join(Dir.pwd, 'build'))
     lib2.complete_output_dir.should eq(File.join(Dir.pwd, 'lib2', 'build2'))
@@ -50,7 +51,7 @@ describe Cxxproject::BuildingBlock do
   it 'should raise exception if building block cannot be resolved' do
     expect do
       lib1 = Cxxproject::SourceLibrary.new('1').set_dependencies(['unresolved'])
-      cxx = CxxProject2Rake.new([], 'build', "clang")
+      cxx = CxxProject2Rake.new([], 'build', compiler)
     end.to raise_exception(RuntimeError, 'Error: while reading config file for 1: dependent building block "unresolved" was specified but not found!')
   end
 

data/spec/cxxproject_2_rake_spec.rb

@@ -34,14 +34,6 @@ def rebuild
   execute_all_tasks(tasks)
 end
 
-#def is_older? fileA, fileB
-#  File.mtime(fileA) < File.mtime(fileB)
-#end
-#
-#def is_newer? fileA, fileB
-#  File.mtime(fileA) > File.mtime(fileB)
-#end
-
 def check_rebuilding (end_product, prereq_file, should_rebuild = true)
   sleep(1)
   FileUtils.touch prereq_file
@@ -66,24 +58,13 @@ end
 def fresh_cxx
   Cxxproject::Utils.cleanup_rake
   outputdir = 'output'
-  CxxProject2Rake.new(Dir.glob('**/project.rb'), outputdir, "clang")
+  CxxProject2Rake.new(Dir.glob('**/project.rb'), outputdir, 'gcc')
 end
 
 def cleanup
   rm_r 'output' if File.directory?('output')
 end
 
-#def count_needed_tasks(tasks)
-#  needed = 0
-#  tasks.each do |tn|
-#    t = tn[:task]
-#    if t.needed?
-#      needed = needed + 1
-#    end
-#  end
-#  needed
-#end
-
 ONLY_ONE_HEADER = "#{RSPECDIR}/testdata/onlyOneHeader"
 describe CxxProject2Rake do
   before(:all) do

data/spec/ide_interface_spec.rb

@@ -25,8 +25,8 @@ describe Cxxproject::IDEInterface do
     error.file_name = 'filename'
     error.message = 'error'
     packet = ide.create_error_packet(error)
-    
-    if not Cxxproject::Utils.old_ruby? # in Ruby 1.8.6 there is no bytes methods...    
+
+    if not Cxxproject::Utils.old_ruby? # in Ruby 1.8.6 there is no bytes methods...
       e = packet.bytes
       e.next.should eq(1)
       check_long(e, 22)

data/spec/object_dependency_spec.rb

@@ -4,7 +4,7 @@ require 'cxxproject/ext/rake_listener.rb'
 require 'cxxproject/utils/cleanup'
 
 describe Rake::Task do
-
+  compiler = 'gcc'
   before(:each) do
     Rake::application.options.silent = true
     Cxxproject::Utils.cleanup_rake
@@ -17,7 +17,7 @@ describe Rake::Task do
     file 'test.cc' => 'compiler'
     File.delete('test.cc') if File.exists?('test.cc')
     sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    cxx = CxxProject2Rake.new([], 'build', "clang")
+    cxx = CxxProject2Rake.new([], 'build', compiler)
 
     task = Rake::application['lib:testlib']
     task.invoke
@@ -35,11 +35,11 @@ describe Rake::Task do
     end
 
     sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', "clang")
+    CxxProject2Rake.new([], 'build', compiler)
 
     task = Rake::application['lib:testlib']
     task.invoke
-    task.failure.should eq(false)
+    task.failure.should == false
 
     Cxxproject::Utils.cleanup_rake
 
@@ -48,36 +48,13 @@ describe Rake::Task do
     end
 
     sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', "clang")
+    CxxProject2Rake.new([], 'build', compiler)
 
     task = Rake::application['build/libs/libtestlib.a']
     task.invoke
-    task.failure.should eq(false)
+    task.failure.should == false
 
     FileUtils.rm_rf('test.cc')
   end
 
-  it 'should not fail if generated headerfile is missing' do
-    file 'test.h' do
-      sh 'touch test.h'
-    end
-
-    file 'test.cc' => 'test.h' do |t|
-      File.open(t.name, 'w') do |io|
-        io.puts('#include "test.h"')
-      end
-    end
-
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', "clang")
-
-    task = Rake::application['build/libs/libtestlib.a']
-    task.invoke
-    task.failure.should eq(false)
-
-    FileUtils.rm_rf('build')
-    FileUtils.rm_rf('test.cc')
-    FileUtils.rm_rf('test.h')
-  end
-
 end

data/spec/project_path_spec.rb

@@ -18,7 +18,7 @@ describe CxxProject2Rake do
     cd base do # have to be relative to base
       project_configs = Dir.glob('**/project.rb')
     end
-    CxxProject2Rake.new(project_configs, outputdir, "clang", base)
+    CxxProject2Rake.new(project_configs, outputdir, 'gcc', base)
   end
 
 
@@ -35,16 +35,16 @@ describe CxxProject2Rake do
     libTwo = "#{outputdir}/libs/lib2.a"
     exe = "#{outputdir}/basic.exe"
     exe2 = "#{outputdir}/debug.exe"
-
+    files = [libOne,libTwo,exe,exe2]
     rm_r outputdir if File.directory?(outputdir)
     tasks = fresh_cxx(outputdir, base).all_tasks
     CLOBBER.each { |fn| rm_r fn rescue nil }
 
-    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_false }
+    files.all? {|f| File.exists?(f).should be_false }
 
     execute_all_tasks(tasks)
 
-    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_true }
+    files.all? {|f| File.exists?(f).should be_true }
 
     # cleanup
     rm_r outputdir if File.directory?(outputdir)

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-06 00:00:00 Z
+date: 2012-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2926216662613263501
+      hash: -4017156678674831276
       segments: 
       - 0
       version: "0"