cxxproject 0.6.0 → 0.6.1

data/lib/cxxproject/buildingblocks/executable.rb

@@ -71,10 +71,9 @@ module Cxxproject
       if File.is_absolute?(v)
         tmp = v
       else
-        prefix ||= File.rel_from_to_project(@project_dir,d.project_dir)
+        prefix ||= File.rel_from_to_project(@project_dir, d.project_dir)
         tmp = File.add_prefix(prefix, v)
       end
-      tmp = "\"" + tmp + "\"" if tmp.include?(" ")
       [tmp, prefix]
     end
 
@@ -86,8 +85,7 @@ module Cxxproject
 
     def calc_linker_lib_string_recursive(d)
       res = []
-
-      return res if @dep_set.include?d
+      return res if @dep_set.include?(d)
       @dep_set << d
 
       if HasLibraries === d
@@ -105,12 +103,12 @@ module Cxxproject
               res <<  tmp
             when HasLibraries::SEARCH_PATH
               tmp, prefix = adaptPath(elem[1], d, prefix)
-              if not @lib_path_set.include?tmp
+              if not @lib_path_set.include?(tmp)
                 @lib_path_set << tmp
                 res << "#{linker[:LIB_PATH_FLAG]}#{tmp}"
               end
             when HasLibraries::DEPENDENCY
-              if ALL_BUILDING_BLOCKS.include?elem[1]
+              if ALL_BUILDING_BLOCKS.include?(elem[1])
                 bb = ALL_BUILDING_BLOCKS[elem[1]]
                 res += calc_linker_lib_string_recursive(bb)
               end
@@ -231,7 +229,7 @@ module Cxxproject
       namespace 'run' do
         desc "run executable #{executable}"
         res = task name => executable do |t|
-          sh executable
+          sh "\"#{executable}\""
         end
         res.type = Rake::Task::RUN
         res

data/lib/cxxproject/buildingblocks/has_libraries_mixin.rb

@@ -1,10 +1,10 @@
 module Cxxproject
   module HasLibraries
-    LIB = 1
-    USERLIB = 2
-    LIB_WITH_PATH = 3
-    SEARCH_PATH = 4
-    DEPENDENCY = 5
+    LIB = :lib
+    USERLIB = :userlib
+    LIB_WITH_PATH = :lib_with_path
+    SEARCH_PATH = :search_path
+    DEPENDENCY = :dependency
 
     def lib_elements
       @lib_elements ||= []

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -17,8 +17,8 @@ module Cxxproject
 
     def complete_init()
       if @output_dir_abs
-        add_lib_element(HasLibraries::SEARCH_PATH, File.join(@output_dir, 'libs'), true)
         add_lib_element(HasLibraries::LIB, @name, true)
+        add_lib_element(HasLibraries::SEARCH_PATH, File.join(@output_dir, 'libs'), true)
       else
         add_lib_element(HasLibraries::LIB_WITH_PATH, File.join(@output_dir,"lib#{@name}.a"), true)
       end
@@ -78,7 +78,7 @@ module Cxxproject
           cmd += objs
 
           if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
+            cmd.map! {|c| c.include?(' ') ? "\"#{c}\"" : c }
 
             cmdLine = cmd.join(" ")
             if cmdLine.length > 8000
@@ -89,10 +89,11 @@ module Cxxproject
               consoleOutput = `#{cmd.join(" ")} 2>&1`
             end
           else
+            cmd.map! {|c| c.include?(' ') ? "\"#{c}\"" : c }
             rd, wr = IO.pipe
             cmd << {
-             :err=>wr,
-             :out=>wr
+             :err => wr,
+             :out => wr
             }
             sp = spawn(*cmd)
             cmd.pop

data/lib/cxxproject/ext/rake.rb

@@ -26,11 +26,11 @@ module Rake
     def max_parallel_tasks
       @max_parallel_tasks ||= 8
     end
-    
+
     def addEmptyLine
       @addEmptyLine ||= false
     end
-    
+
     def check_unnecessary_includes
       @check_unnecessary_includes ||= false
     end
@@ -49,14 +49,14 @@ module Rake
       @command_line_number += 1
       res
     end
-    
+
     def makefile_number
       @makefile_number ||= 1
       res = @makefile_number
       @makefile_number += 1
       res
     end
-    
+
     def deriveIncludes
       @deriveIncludes ||= false
     end
@@ -68,7 +68,7 @@ module Rake
     def consoleOutput_fullnames
       @consoleOutput_fullnames ||= false
     end
-    
+
   end
 
   class Jobs
@@ -105,7 +105,7 @@ module Rake
     def set_building_block(bb)
       @bb = bb
     end
-    
+
     def invoke_prerequisites(args, invocation_chain)
       super(args, invocation_chain)
 
@@ -131,28 +131,28 @@ module Rake
             return
           end
         end
-      
+
         file_tasks = @bb.create_object_file_tasks
-        
+
         if file_tasks == nil # = error
           set_failed
           return
         end
-        
+
         enhance(file_tasks)
         return if file_tasks.length == 0
-        
+
         @error_strings = {}
-        
+
         Jobs.new(file_tasks, application.max_parallel_tasks) do |jobs|
           handle_jobs(jobs, args, invocation_chain)
         end.join
-        
+
         # can only happen in case of bail_on_first_error.
         # if not sorted, it may be confusing when builing more than once and the order of the error appearances changes from build to build
         # (it is not deterministic which file compilation finishes first)
-        @error_strings.sort.each {|es| puts es[1]} 
-      
+        @error_strings.sort.each {|es| puts es[1]}
+
         if Rake.application.check_unnecessary_includes
           if not @failure # otherwise the dependency files might be incorrect or not complete
             @bb.incArray.each do |i|
@@ -165,15 +165,15 @@ module Rake
                 res.line_number = 0
                 res.severity = Cxxproject::ErrorParser::SEVERITY_INFO
                 res.message = msg
-                Rake.application.idei.set_errors([res])              
+                Rake.application.idei.set_errors([res])
               end
             end
           end
         end
-      
+
       end
-      
-      
+
+
     end
 
     def handle_jobs(jobs, args, invocation_chain)
@@ -302,9 +302,9 @@ module Rake
             Cxxproject::Printer.printError "Error #{name}: #{e.message}"
             if RakeFileUtils.verbose
               puts e.backtrace
-            end            
+            end
             set_failed
-            if e.message.include?"Circular dependency detected"
+            if e.message.include?('Circular dependency detected')
               Rake.application.idei.set_abort(true)
             end
           end
@@ -321,14 +321,14 @@ module Rake
     end
 
     define_method(:execute) do |arg|
-      
+
       if Rake::application.preproFlags
         if  self.type == SOURCEMULTI
           @failure = true
           break
         end
       end
-       
+
       break if @failure # check if a prereq has failed
       break if Rake.application.idei.get_abort
       new_execute(execute_org, arg)
@@ -352,7 +352,7 @@ module Rake
       rescue Exception => ex1
         handle_error(ex1, false)
       end
-      
+
       if not @immediate_output
         self.output_string = s.string
         Thread.current[:stdout] = tmp

data/lib/cxxproject/utils/exit_helper.rb

@@ -5,7 +5,7 @@ module Cxxproject
   class ExitHelper
     @@exit_code = 0
     @@exit_test = false
-    
+
     def self.set_exit_code(val)
       @@exit_code = val
     end
@@ -16,16 +16,16 @@ module Cxxproject
 
     def self.reset_exit_code()
       @@exit_code = 0
-    end    
+    end
 
     def self.enable_exit_test()
       @@exit_test = true
-    end    
-    
+    end
+
     def self.disable_exit_test()
       @@exit_test = false
     end
-        
+
     def self.exit(val)
       raise ExitHelperException.new if @@exit_test
       @@exit_code = val

data/lib/cxxproject/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-28 00:00:00 Z
+date: 2012-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -54,85 +54,85 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/cxxproject.rb
-- lib/tools/project_wizard.rb
+- lib/cxxproject/errorparser/ti_linker_error_parser.rb
 - lib/cxxproject/errorparser/diab_linker_error_parser.rb
-- lib/cxxproject/errorparser/gcc_compiler_error_parser.rb
+- lib/cxxproject/errorparser/gcc_linker_error_parser.rb
 - lib/cxxproject/errorparser/diab_compiler_error_parser.rb
+- lib/cxxproject/errorparser/gcc_compiler_error_parser.rb
 - lib/cxxproject/errorparser/ti_compiler_error_parser.rb
-- lib/cxxproject/errorparser/gcc_linker_error_parser.rb
-- lib/cxxproject/errorparser/ti_linker_error_parser.rb
 - lib/cxxproject/errorparser/error_parser.rb
+- lib/cxxproject/utils/optional.rb
+- lib/cxxproject/utils/cleanup.rb
+- lib/cxxproject/utils/exit_helper.rb
+- lib/cxxproject/utils/rbcurse_progress.rb
+- lib/cxxproject/utils/process.rb
+- lib/cxxproject/utils/ubigraph.rb
+- lib/cxxproject/utils/printer.rb
+- lib/cxxproject/utils/stats.rb
+- lib/cxxproject/utils/rbcurse.rb
+- lib/cxxproject/utils/progress_helper.rb
+- lib/cxxproject/utils/rbcurse_executable_ext.rb
+- lib/cxxproject/utils/utils.rb
+- lib/cxxproject/utils/rbcurse_tasktable.rb
+- lib/cxxproject/utils/console.rb
+- lib/cxxproject/utils/progress.rb
+- lib/cxxproject/utils/graphstream.rb
+- lib/cxxproject/toolchain/toolchain_benchmark.rb
+- lib/cxxproject/toolchain/diab.rb
+- lib/cxxproject/toolchain/gcc.rb
+- lib/cxxproject/toolchain/provider.rb
+- lib/cxxproject/toolchain/clang.rb
+- lib/cxxproject/toolchain/ti.rb
+- lib/cxxproject/toolchain/colorizing_formatter.rb
+- lib/cxxproject/toolchain/toolchain.rb
 - lib/cxxproject/version.rb
-- lib/cxxproject/torake.rb
 - lib/cxxproject/ide_interface.rb
-- lib/cxxproject/ext/file.rb
-- lib/cxxproject/ext/rake_dirty.rb
+- lib/cxxproject/ext/rake_listener.rb
 - lib/cxxproject/ext/filelist.rb
 - lib/cxxproject/ext/string.rb
-- lib/cxxproject/ext/rake_listener.rb
-- lib/cxxproject/ext/stdout.rb
 - lib/cxxproject/ext/rake.rb
 - lib/cxxproject/ext/progressbar.rb
+- lib/cxxproject/ext/stdout.rb
+- lib/cxxproject/ext/rake_dirty.rb
+- lib/cxxproject/ext/file.rb
+- lib/cxxproject/torake.rb
+- lib/cxxproject/buildingblocks/building_block.rb
 - lib/cxxproject/buildingblocks/has_libraries_mixin.rb
-- lib/cxxproject/buildingblocks/executable.rb
-- lib/cxxproject/buildingblocks/has_includes_mixin.rb
-- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
 - lib/cxxproject/buildingblocks/custom_building_block.rb
+- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/has_includes_mixin.rb
+- lib/cxxproject/buildingblocks/has_sources_mixin.rb
 - lib/cxxproject/buildingblocks/binary_library.rb
+- lib/cxxproject/buildingblocks/executable.rb
 - lib/cxxproject/buildingblocks/module.rb
-- lib/cxxproject/buildingblocks/building_block.rb
-- lib/cxxproject/buildingblocks/source_library.rb
 - lib/cxxproject/buildingblocks/single_source.rb
-- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
+- lib/cxxproject/buildingblocks/source_library.rb
 - lib/cxxproject/buildingblocks/command_line.rb
-- lib/cxxproject/buildingblocks/has_sources_mixin.rb
-- lib/cxxproject/utils/rbcurse_progress.rb
-- lib/cxxproject/utils/ubigraph.rb
-- lib/cxxproject/utils/graphstream.rb
-- lib/cxxproject/utils/progress.rb
-- lib/cxxproject/utils/stats.rb
-- lib/cxxproject/utils/utils.rb
-- lib/cxxproject/utils/optional.rb
-- lib/cxxproject/utils/console.rb
-- lib/cxxproject/utils/progress_helper.rb
-- lib/cxxproject/utils/exit_helper.rb
-- lib/cxxproject/utils/cleanup.rb
-- lib/cxxproject/utils/rbcurse_tasktable.rb
-- lib/cxxproject/utils/rbcurse_executable_ext.rb
-- lib/cxxproject/utils/rbcurse.rb
-- lib/cxxproject/utils/printer.rb
-- lib/cxxproject/utils/process.rb
-- lib/cxxproject/toolchain/clang.rb
-- lib/cxxproject/toolchain/provider.rb
-- lib/cxxproject/toolchain/toolchain.rb
-- lib/cxxproject/toolchain/ti.rb
-- lib/cxxproject/toolchain/colorizing_formatter.rb
-- lib/cxxproject/toolchain/gcc.rb
-- lib/cxxproject/toolchain/toolchain_benchmark.rb
-- lib/cxxproject/toolchain/diab.rb
 - lib/cxxproject/eval_context.rb
+- lib/tools/project_wizard.rb
+- lib/cxxproject.rb
 - Rakefile.rb
-- spec/testdata/onlyOneHeader/Rakefile.rb
-- spec/testdata/onlyOneHeader/project.rb
+- spec/string_spec.rb
+- spec/project_path_spec.rb
+- spec/ide_interface_spec.rb
+- spec/spec_helper.rb
+- spec/object_dependency_spec.rb
+- spec/building_block_spec.rb
+- spec/file_ext_spec.rb
+- spec/testdata/basic/exe12/project.rb
 - spec/testdata/basic/lib1/project.rb
 - spec/testdata/basic/lib2/project.rb
-- spec/testdata/basic/exe12/project.rb
-- spec/testdata/multiple_levels/mainproject/basic/project.rb
+- spec/testdata/onlyOneHeader/Rakefile.rb
+- spec/testdata/onlyOneHeader/project.rb
 - spec/testdata/multiple_levels/libs/lib1/project.rb
 - spec/testdata/multiple_levels/libs/lib2/project.rb
-- spec/string_spec.rb
+- spec/testdata/multiple_levels/mainproject/basic/project.rb
 - spec/cxxproject_2_rake_spec.rb
-- spec/project_path_spec.rb
-- spec/building_block_spec.rb
-- spec/file_ext_spec.rb
-- spec/spec_helper.rb
-- spec/ide_interface_spec.rb
-- spec/object_dependency_spec.rb
-- spec/rake_listener_ext_spec.rb
 - spec/toolchain_spec.rb
-- lib/tools/project.rb.template
+- spec/rake_listener_ext_spec.rb
 - lib/tools/Rakefile.rb.template
+- lib/tools/project.rb.template
 - bin/cxx
 homepage: https://github.com/marcmo/cxxproject
 licenses: []
@@ -147,6 +147,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -1979026599221260154
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false