cxxproject 0.5.67 → 0.5.68

data/lib/cxxproject/buildingblocks/executable.rb

@@ -80,9 +80,16 @@ module Cxxproject
     end
 
     def linker_lib_string()
-      @lib_path_set = Set.new
+      @lib_path_set = []
       @dep_set = Set.new
-      calc_linker_lib_string_recursive(self)
+      res = calc_linker_lib_string_recursive(self)
+      return res if (@tcs[:LINKER][:LIST_MODE] == false)
+      
+      res.map { |x| x+"(*.o)"}
+      if not (@lib_path_set.empty?)
+        res << (@tcs[:LINKER][:LIB_PATH_FLAG] + @lib_path_set.join(","));
+      end
+      res
     end
 
     def calc_linker_lib_string_recursive(d)
@@ -108,7 +115,7 @@ module Cxxproject
               tmp, prefix = adaptPath(elem[1], d, prefix)
               if not @lib_path_set.include?tmp
                 @lib_path_set << tmp
-                res << "#{linker[:LIB_PATH_FLAG]}#{tmp}"
+                res << "#{linker[:LIB_PATH_FLAG]}#{tmp}" if linker[:LIST_MODE] == false
               end
             when HasLibraries::DEPENDENCY
               if ALL_BUILDING_BLOCKS.include?elem[1]
@@ -134,19 +141,19 @@ module Cxxproject
 
           cmd = [linker[:COMMAND]] # g++
           cmd += linker[:MUST_FLAGS].split(" ")
-          cmd += Cxxproject::Utils::flagSplit(linker[:FLAGS])
+          cmd += Cxxproject::Utils::flagSplit(linker[:FLAGS],true)
           cmd << linker[:EXE_FLAG]
           cmd << get_executable_name # -o debug/x.exe
           cmd += @objects
           cmd << linker[:SCRIPT] if @linker_script # -T
           cmd << @linker_script if @linker_script # xy/xy.dld
-          cmd << linker[:MAP_FILE_FLAG] if @mapfile # -Wl,-m6
-          if not linker[:MAP_FILE_PIPE]
+          cmd += linker[:MAP_FILE_FLAG].split(" ") if @mapfile # -Wl,-m6
+          if not linker[:MAP_FILE_PIPE] and @mapfile 
             cmd[cmd.length-1] << @mapfile 
           end
-          cmd += Cxxproject::Utils::flagSplit(linker[:LIB_PREFIX_FLAGS]) # "-Wl,--whole-archive "
+          cmd += Cxxproject::Utils::flagSplit(linker[:LIB_PREFIX_FLAGS],true) # "-Wl,--whole-archive "
           cmd += linker_lib_string
-          cmd += Cxxproject::Utils::flagSplit(linker[:LIB_POSTFIX_FLAGS]) # "-Wl,--no-whole-archive "
+          cmd += Cxxproject::Utils::flagSplit(linker[:LIB_POSTFIX_FLAGS],true) # "-Wl,--no-whole-archive "
 
           mapfileStr = (@mapfile and linker[:MAP_FILE_PIPE]) ? " >#{@mapfile}" : ""
           if Cxxproject::Utils.old_ruby?

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -269,12 +269,11 @@ module Cxxproject
             end
           end
           cmd += compiler[:PREPRO_FLAGS].split(" ") if Rake::application.preproFlags
-          cmd += Cxxproject::Utils::flagSplit(compiler[:FLAGS])
+          cmd += Cxxproject::Utils::flagSplit(compiler[:FLAGS],true)
           cmd += i_array
           cmd += d_array
           cmd += (compiler[:OBJECT_FILE_FLAG] + objectRel).split(" ")
           cmd << sourceRel
-
           if Cxxproject::Utils.old_ruby?
             cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
             cmdLine = cmd.join(" ")

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -79,7 +79,7 @@ module Cxxproject
             end
             
             cmd = [archiver[:COMMAND]] # ar
-            cmd += Cxxproject::Utils::flagSplit(archiver[:FLAGS]) # --all_load
+            cmd += Cxxproject::Utils::flagSplit(archiver[:FLAGS],true) # --all_load
             cmd += archiver[:ARCHIVE_FLAGS].split(" ")
             cmd << aname
             cmd += objs

data/lib/cxxproject/errorparser/error_parser.rb

@@ -22,11 +22,11 @@ module Cxxproject
     end
 
     def get_severity(str)
-      if str == "info" || str == "note"
+      if str.downcase == "info" || str.downcase == "note"
         SEVERITY_INFO
-      elsif str == "warning"
+      elsif str.downcase == "warning"
         SEVERITY_WARNING
-      elsif str == "error"
+      elsif str.downcase == "error" 
         SEVERITY_ERROR
       else
         raise "Unknown severity: #{str}"

data/lib/cxxproject/errorparser/keil_compiler_error_parser.rb

@@ -0,0 +1,40 @@
+require 'cxxproject/errorparser/error_parser'
+
+module Cxxproject
+  class KeilCompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression_start = /\"(.+)\", line ([0-9]+): (?!included)(catastrophic |fatal )*([A-Za-z]+)[:]* (.+)/  
+      @error_expression_end = /^[ \t]*\^/ # well, it may end without "^"... in this case the error will last the next one starts or console text ends
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      error_severity = 255
+      consoleOutputFullnames = ""
+      consoleOutput.each_line do |l|
+        d = ErrorDesc.new
+        lstripped = l.rstrip
+        scan_res = lstripped.scan(@error_expression_start)
+        if scan_res.length == 0
+          d.severity = error_severity
+          d.message = lstripped 
+          if lstripped.scan(@error_expression_end).length > 0
+            error_severity = 255 
+          end
+        else
+          d.file_name = File.expand_path(scan_res[0][0])
+          d.line_number = scan_res[0][1].to_i
+          d.message = scan_res[0][4]
+          d.severity = get_severity(scan_res[0][3])
+          error_severity = d.severity
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

data/lib/cxxproject/errorparser/keil_linker_error_parser.rb

@@ -0,0 +1,35 @@
+require 'cxxproject/errorparser/error_parser'
+
+module Cxxproject
+  class KeilLinkerErrorParser < ErrorParser
+
+    def initialize()
+      @error_exclude = /Finished: [0-9]+ information, [0-9]+ warning and [0-9]+ error messages./
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutput.each_line do |l|
+        l.rstrip!
+        scan_res = l.scan(@error_exclude)
+        d = ErrorDesc.new
+        if scan_res.length == 0
+          d.file_name = proj_dir
+          d.line_number = 0
+          d.message = l
+          if l.length == 0
+            d.severity = SEVERITY_OK
+          elsif l.include?" Warning:" 
+            d.severity = SEVERITY_WARNING
+          else
+            d.severity = SEVERITY_ERROR
+          end
+        end
+        res << d
+      end
+      [res, consoleOutput]
+    end
+
+
+  end
+end

data/lib/cxxproject/ide_interface.rb

@@ -102,11 +102,13 @@ module Cxxproject
         merged_messages = []
         last_msg = nil
         error_array.each do |msg|
-          if msg.file_name.nil?
-            last_msg.message += "\r\n#{msg.message}" if last_msg
-          else
-            last_msg = msg.dup
-            merged_messages << last_msg
+          if msg.severity != 255
+            if msg.file_name.nil?
+              last_msg.message += "\r\n#{msg.message}" if last_msg
+            else
+              last_msg = msg.dup
+              merged_messages << last_msg
+            end
           end
         end
 

data/lib/cxxproject/toolchain/keil.rb

@@ -0,0 +1,52 @@
+require 'cxxproject/utils/utils'
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/errorparser/error_parser'
+require 'cxxproject/errorparser/keil_compiler_error_parser'
+require 'cxxproject/errorparser/keil_linker_error_parser'
+
+module Cxxproject
+  module Toolchain
+
+    KeilChain = Provider.add("Keil")
+
+    KeilChain[:COMPILER][:CPP].update({
+      :COMMAND => "armcc",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o ",
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "--depend=",
+      :DEP_FLAGS_SPACE => false,
+      :PREPRO_FLAGS => "-E -P"
+    })
+
+    KeilChain[:COMPILER][:C] = Utils.deep_copy(KeilChain[:COMPILER][:CPP])
+    KeilChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+
+    KeilChain[:COMPILER][:ASM] = Utils.deep_copy(KeilChain[:COMPILER][:C])
+    KeilChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    KeilChain[:COMPILER][:ASM][:COMMAND] = "armasm"
+    KeilChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
+      
+    KeilChain[:ARCHIVER][:COMMAND] = "armar"
+    KeilChain[:ARCHIVER][:ARCHIVE_FLAGS] = "--create"
+
+    KeilChain[:LINKER][:COMMAND] = "armlink"
+    KeilChain[:LINKER][:SCRIPT] = "--scatter"
+    KeilChain[:LINKER][:USER_LIB_FLAG] = ""
+    KeilChain[:LINKER][:EXE_FLAG] = "-o"
+    KeilChain[:LINKER][:LIB_FLAG] = ""
+    KeilChain[:LINKER][:LIB_PATH_FLAG] = "--userlibpath="
+    KeilChain[:LINKER][:MAP_FILE_FLAG] = "--map --list="
+    KeilChain[:LINKER][:MAP_FILE_PIPE] = false   
+    KeilChain[:LINKER][:LIST_MODE] = true  
+      
+    keilCompilerErrorParser =                   KeilCompilerErrorParser.new
+    KeilChain[:COMPILER][:C][:ERROR_PARSER] =   keilCompilerErrorParser
+    KeilChain[:COMPILER][:CPP][:ERROR_PARSER] = keilCompilerErrorParser
+    KeilChain[:COMPILER][:ASM][:ERROR_PARSER] = keilCompilerErrorParser
+    KeilChain[:ARCHIVER][:ERROR_PARSER] =       keilCompilerErrorParser
+    KeilChain[:LINKER][:ERROR_PARSER] =         KeilLinkerErrorParser.new
+
+  end
+end

data/lib/cxxproject/toolchain/provider.rb

@@ -78,7 +78,8 @@ module Cxxproject
           :MAP_FILE_FLAG => "",
           :MAP_FILE_PIPE => true,
           :OUTPUT_ENDING => ".exe", # or .elf
-          :ERROR_PARSER => nil
+          :ERROR_PARSER => nil,
+          :LIST_MODE => false
         },
 
         :MAKE =>
@@ -136,3 +137,4 @@ require 'cxxproject/toolchain/gcc'
 require 'cxxproject/toolchain/clang'
 require 'cxxproject/toolchain/ti'
 require 'cxxproject/toolchain/greenhills'
+require 'cxxproject/toolchain/keil'

data/lib/cxxproject/utils/utils.rb

@@ -1,22 +1,31 @@
 module Cxxproject
   module Utils
   
-    def self.flagSplit(str)
+    def self.flagSplit(str, removeQuotes)
       hasQuote = false
       hasDoubleQuote = false
+      hadQuote = false
       ar = []
       s = ""
   
+      #puts str
+      
       str.split("").each do |i|
         hasDoubleQuote = !hasDoubleQuote if !hasQuote and i == '"'
-	    hasQuote = !hasQuote if !hasDoubleQuote and i == '\''
-    	if i == ' '
-	      if not hasDoubleQuote and not hasQuote
-    	    ar << s if s.length > 0
-		    s = ""
-	    	next
-    	  end
-	    end
+        hasQuote = !hasQuote if !hasDoubleQuote and i == '\''
+        hadQuote = true if hasDoubleQuote
+        if i == ' '
+          if not hasDoubleQuote and not hasQuote
+            if hadQuote and removeQuotes
+              ar << s[1..-2] if s.length > 2
+              hadQuote = false
+            else
+              ar << s if s.length > 0
+            end
+            s = ""
+            next
+          end
+        end
         s << i
       end
       ar << s if s.length > 0

data/lib/cxxproject/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.67
+  version: 0.5.68
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-21 00:00:00 Z
+date: 2013-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -63,6 +63,8 @@ files:
 - lib/cxxproject/errorparser/gcc_linker_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
+- lib/cxxproject/errorparser/keil_linker_error_parser.rb
 - lib/cxxproject/errorparser/ti_compiler_error_parser.rb
 - lib/cxxproject/errorparser/ti_linker_error_parser.rb
 - lib/cxxproject/eval_context.rb
@@ -79,6 +81,7 @@ files:
 - lib/cxxproject/toolchain/diab.rb
 - lib/cxxproject/toolchain/gcc.rb
 - lib/cxxproject/toolchain/greenhills.rb
+- lib/cxxproject/toolchain/keil.rb
 - lib/cxxproject/toolchain/provider.rb
 - lib/cxxproject/toolchain/ti.rb
 - lib/cxxproject/toolchain/toolchain.rb