cxxproject 0.5.71 → 0.5.72

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -182,7 +182,7 @@ module Cxxproject
     def process_result(cmd, console_output, error_parser, alternate, success)
       hasError = (success == false)
       if (cmd != @lastCommand) or (@printedCmdAlternate and hasError)
-        printCmd(cmd, alternate, hasError)
+        printCmd(cmd, alternate, hasError && Rake::application.options.lint == false)
       end
       errorPrinted = process_console_output(console_output, error_parser)
 
@@ -192,7 +192,7 @@ module Cxxproject
           res = ErrorDesc.new
           res.file_name = @project_dir
           res.line_number = 0
-          res.message = "Unknown error, see log output. Maybe the lake error parser has to be updated..."
+          res.message = "Unknown error, see log output. Maybe the bake error parser has to be updated..."
           res.severity = ErrorParser::SEVERITY_ERROR
           Rake.application.idei.set_errors([res])
         end

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -345,7 +345,11 @@ module Cxxproject
               console_output = console_output_VS
             end
 
-            ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
+            if Cxxproject::GCCLintErrorParser === error_parser # hack: need to know if lint is enabled...
+              ret = error_descs.any? { |e| e.severity != ErrorParser::SEVERITY_OK }
+            else
+              ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
+            end
 
             console_output.gsub!(/[\r]/, "")
             highlighter = @tcs[:CONSOLE_HIGHLIGHTER]
@@ -358,6 +362,7 @@ module Cxxproject
             Rake.application.idei.set_errors(error_descs)
           rescue Exception => e
             Printer.printWarning "Parsing output failed (maybe language not set to English?): " + e.message
+            puts e.backtrace
             puts "Original output:"
             puts console_output
           end

data/lib/cxxproject/buildingblocks/lint.rb

@@ -0,0 +1,101 @@
+require 'cxxproject/buildingblocks/source_library'
+
+module Cxxproject
+  class Lint < SourceLibrary
+
+    def initialize(name)
+      super(name)
+      @lint_max = -1
+      @lint_min = -1
+    end
+
+    def set_lint_min(x)
+      @lint_min = x
+      self
+    end
+    
+    def set_lint_max(x)
+      @lint_max = x
+      self
+    end
+    
+    def get_task_name()
+      return @task_name if @task_name
+
+      parts = [@output_dir]
+      parts << 'lint' if @output_dir_abs
+      parts << "#{@name}_lint"
+      @task_name = File.join(parts)
+      @task_name = @project_dir + "/" + @task_name unless @output_dir_abs
+      @task_name
+    end    
+    
+    def convert_to_rake()
+      compiler = @tcs[:COMPILER][:CPP]
+      lintParam = @tcs[:LINT_PARAM]
+      lintParam.init_vars
+      
+      res = typed_file_task Rake::Task::LINT, get_task_name do
+        dir = @project_dir
+        
+        Dir.chdir(dir) do
+          srcs = calc_sources_to_build.keys
+          
+          if @lint_min >= 0 and @lint_min >= srcs.length
+            Printer.printError "Error: lint_min is set to #{@lint_min}, but only #{srcs.length} file(s) are specified to lint"
+            ExitHelper.exit(1) 
+          end
+          
+          if @lint_max >= 0 and @lint_max >= srcs.length
+            Printer.printError "Error: lint_max is set to #{@lint_max}, but only #{srcs.length} file(s) are specified to lint"
+            ExitHelper.exit(1) 
+          end      
+          
+          @lint_min = 0 if @lint_min < 0
+          @lint_max = -1 if @lint_max < 0
+          srcs = srcs[@lint_min..@lint_max]    
+
+          cmd = [compiler[:COMMAND]]
+          cmd += compiler[:COMPILE_FLAGS]
+            
+          cmd += lintParam.internalIncludes
+            cmd += lintParam.internalDefines
+            
+          cmd += @include_string[:CPP]
+          cmd += @define_string[:CPP]
+            
+          cmd += @tcs[:LINT_POLICY]
+          
+          cmd += srcs
+  
+          if Cxxproject::Utils.old_ruby?
+            cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
+            
+            cmdLine = cmd.join(" ")
+            if cmdLine.length > 8000
+              inputName = aname+".tmp"
+              File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
+              success, consoleOutput = ProcessHelper.safeExecute() { `#{compiler[:COMMAND] + " @" + inputName}` }
+            else
+              success, consoleOutput = ProcessHelper.safeExecute() { `#{cmd.join(" ")} 2>&1` }
+            end
+          else
+            rd, wr = IO.pipe
+            cmd << {:err=>wr,:out=>wr}
+            success, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
+            cmd.pop
+          end          
+          
+          process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "Linting #{name}", success)
+        end
+      end
+
+      def res.needed?
+        true
+      end
+      
+      return res
+    end
+
+  end
+end

data/lib/cxxproject/errorparser/gcc_lint_error_parser.rb

@@ -0,0 +1,34 @@
+require 'cxxproject/errorparser/error_parser'
+
+module Cxxproject
+  class GCCLintErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /([^:]*):([0-9]+): ([A-Za-z]+)(.+)/
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutputFullnames = ""
+      consoleOutput.each_line do |l|
+        d = ErrorDesc.new
+        scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
+        if scan_res.length > 0
+          if (scan_res[0][0] == "")
+            d.file_name = proj_dir
+          else
+            d.file_name = File.expand_path(scan_res[0][0])
+          end
+          d.line_number = scan_res[0][1].to_i
+          d.severity = get_severity(scan_res[0][2])
+          d.message = scan_res[0][3]
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

data/lib/cxxproject/ext/rake.rb

@@ -24,10 +24,15 @@ module Rake
     attr_writer :consoleOutput_fullnames
     attr_writer :consoleOutput_visualStudio
     attr_writer :addEmptyLine
+    attr_writer :debug
     def max_parallel_tasks
       @max_parallel_tasks ||= 8
     end
     
+    def debug
+      @debug ||= false
+    end    
+    
     def addEmptyLine
       @addEmptyLine ||= false
     end
@@ -245,6 +250,7 @@ module Rake
     RUN         = 0x0800 #
     CUSTOM      = 0x1000 # x
     COMMANDLINE = 0x2000 # x
+    LINT        = 0x4000 #
 
     STANDARD    = 0x371A # x above means included in STANDARD
     attr_reader :ignore
@@ -305,7 +311,7 @@ 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"
               Rake.application.idei.set_abort(true)
@@ -367,6 +373,7 @@ module Rake
       if not Rake.application.idei.get_abort()
         if not isSysCmd
           Cxxproject::Printer.printError "Error for task #{@name}: #{ex1.message}"
+          Cxxproject::Printer.printError(ex1.backtrace) if Rake.application.debug
         end
       end
       begin

data/lib/cxxproject/toolchain/gcc_lint.rb

@@ -0,0 +1,73 @@
+require 'cxxproject/utils/utils'
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/errorparser/error_parser'
+require 'cxxproject/errorparser/gcc_lint_error_parser'
+
+module Cxxproject
+  module Toolchain
+
+    class GCC_Param
+    
+          def initialize
+            @incs = []
+            @defs = []
+          end
+          
+          def init_vars
+            @incs = []
+            @defs = []
+              
+            begin
+              isCygwin = system("cygpath --version > /dev/null 2>&1")
+              
+              incStart = false
+              defRegex = /^#define (\S+) (.*)/
+              
+              gccString = `echo "" | g++ -x c++ -E -dM -v - 2>&1` 
+              
+              gccString.lines.map(&:chomp).each do |line|
+                if line.include?"#include <...> search starts here:"
+                  incStart = true
+                elsif line.include?"End of search list."
+                  incStart = false
+                elsif incStart
+                  inc = line.strip
+                  inc = `cygpath -w #{line.strip}`.strip if isCygwin
+                  @incs << "--i#{inc}"
+                elsif regRes = line.match(defRegex)
+                  @defs << "-D#{regRes[1]}=\"#{regRes[2]}\""
+                end
+              end
+              
+            rescue Exception=>e
+              Printer.printError "Error: could not determine GCC's internal includes and defines"
+              raise
+            end
+            
+          end
+          
+          def internalIncludes
+            @incs
+          end
+          
+          def internalDefines
+            @defs
+          end
+        end      
+    
+    GCCLintChain = Provider.add("GCC_Lint")
+
+    GCCLintChain[:COMPILER][:CPP].update({
+      :COMMAND => "lint-nt.exe",
+      :DEFINE_FLAG => "-D",
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => ["-b","-\"format=%f%(:%l:%) %t %n: %m\"", "-width(0)", "-hF1"], # array, not string!
+    })
+
+    GCCLintChain[:COMPILER][:CPP][:ERROR_PARSER] = GCCLintErrorParser.new
+    GCCLintChain[:LINT_PARAM] = GCC_Param.new
+
+    
+      
+  end
+end

data/lib/cxxproject/toolchain/gcc_param.rb

@@ -0,0 +1,7 @@
+module Cxxproject
+  module Toolchain
+    
+    
+    
+  end
+end

data/lib/cxxproject/toolchain/provider.rb

@@ -91,7 +91,9 @@ module Cxxproject
           :CLEAN => "clean"
         },
         
-        :CONSOLE_HIGHLIGHTER => ColorizingFormatter.new
+        :CONSOLE_HIGHLIGHTER => ColorizingFormatter.new,
+        
+        :LINT_POLICY => []
       }
 
       def self.add(name, basedOn = nil)
@@ -124,7 +126,7 @@ module Cxxproject
       end
 
       def self.list
-        return @@settings
+        return @@settings.delete_if {|x| x.include?"_Lint" }
       end
 
     end
@@ -134,6 +136,7 @@ end
 
 require 'cxxproject/toolchain/diab'
 require 'cxxproject/toolchain/gcc'
+require 'cxxproject/toolchain/gcc_lint'
 require 'cxxproject/toolchain/clang'
 require 'cxxproject/toolchain/ti'
 require 'cxxproject/toolchain/greenhills'

data/lib/cxxproject/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.71
+  version: 0.5.72
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-07 00:00:00 Z
+date: 2014-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -52,6 +52,7 @@ files:
 - lib/cxxproject/buildingblocks/has_includes_mixin.rb
 - lib/cxxproject/buildingblocks/has_libraries_mixin.rb
 - lib/cxxproject/buildingblocks/has_sources_mixin.rb
+- lib/cxxproject/buildingblocks/lint.rb
 - lib/cxxproject/buildingblocks/makefile.rb
 - lib/cxxproject/buildingblocks/module.rb
 - lib/cxxproject/buildingblocks/single_source.rb
@@ -61,6 +62,7 @@ files:
 - lib/cxxproject/errorparser/error_parser.rb
 - lib/cxxproject/errorparser/gcc_compiler_error_parser.rb
 - lib/cxxproject/errorparser/gcc_linker_error_parser.rb
+- lib/cxxproject/errorparser/gcc_lint_error_parser.rb
 - lib/cxxproject/errorparser/greenhills_compiler_error_parser.rb
 - lib/cxxproject/errorparser/greenhills_linker_error_parser.rb
 - lib/cxxproject/errorparser/keil_compiler_error_parser.rb
@@ -80,6 +82,8 @@ files:
 - lib/cxxproject/toolchain/colorizing_formatter.rb
 - lib/cxxproject/toolchain/diab.rb
 - lib/cxxproject/toolchain/gcc.rb
+- lib/cxxproject/toolchain/gcc_lint.rb
+- lib/cxxproject/toolchain/gcc_param.rb
 - lib/cxxproject/toolchain/greenhills.rb
 - lib/cxxproject/toolchain/keil.rb
 - lib/cxxproject/toolchain/provider.rb