cxxproject 0.5.64 → 0.5.65

data/lib/cxxproject/errorparser/greenhills_compiler_error_parser.rb

@@ -0,0 +1,32 @@
+require 'cxxproject/errorparser/error_parser'
+
+module Cxxproject
+  class GreenHillsCompilerErrorParser < ErrorParser
+
+    def initialize()
+      # example:
+      # "test.c", line 1: warning #123-D: blah blub
+      @error_expression = /"([^"]+)", line ([0-9]+)[:0-9]* (catastrophic |fatal )*([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
+          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])
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

data/lib/cxxproject/errorparser/greenhills_linker_error_parser.rb

@@ -0,0 +1,31 @@
+require 'cxxproject/errorparser/error_parser'
+
+module Cxxproject
+  class GreenHillsLinkerErrorParser < ErrorParser
+
+    def initialize()
+      # todo: is every line an error?
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutput.each_line do |l|
+        l.rstrip!
+        d = ErrorDesc.new
+        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
+        res << d
+      end
+      [res, consoleOutput]
+    end
+
+  end
+end

data/lib/cxxproject/toolchain/greenhills.rb

@@ -0,0 +1,52 @@
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/utils/utils'
+require 'cxxproject/errorparser/GreenHills_compiler_error_parser'
+require 'cxxproject/errorparser/GreenHills_linker_error_parser'
+
+module Cxxproject
+  module Toolchain
+
+    GreenHillsChain = Provider.add("GreenHills")
+
+    GreenHillsChain[:COMPILER][:C].update({
+      :COMMAND => "ccppc",
+      :FLAGS => "",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o ",
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c",
+      :DEP_FLAGS => "-Xmake-dependency=6 -Xmake-dependency-savefile=", # -MMD ok, -MF missing?
+      :DEP_FLAGS_SPACE => false,
+      :PREPRO_FLAGS => "-P" # -E (stdout, oder -o ...)? wahrscheinlich aber -P
+    })
+
+    GreenHillsChain[:COMPILER][:CPP] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
+    GreenHillsChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
+
+    GreenHillsChain[:COMPILER][:ASM] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
+    GreenHillsChain[:COMPILER][:ASM][:COMMAND] = "asppc" # ??
+    GreenHillsChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
+    GreenHillsChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    GreenHillsChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
+
+    GreenHillsChain[:ARCHIVER][:COMMAND] = "ccppc" # ??
+    GreenHillsChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc" # -archive ??
+
+    GreenHillsChain[:LINKER][:COMMAND] = "ccppc" # ??
+    GreenHillsChain[:LINKER][:SCRIPT] = "-Wm" # -T file.ld , evtl. -Wl,-T file.ld ???
+    GreenHillsChain[:LINKER][:USER_LIB_FLAG] = "-l:" # ?? does that exist ? 
+    GreenHillsChain[:LINKER][:EXE_FLAG] = "-o"
+    GreenHillsChain[:LINKER][:LIB_FLAG] = "-l"
+    GreenHillsChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    GreenHillsChain[:LINKER][:MAP_FILE_FLAG] = "-Wl,-m6" # -map=filename  /  -nomap (default) 
+    GreenHillsChain[:LINKER][:OUTPUT_ENDING] = ".elf"
+
+    GreenHillsCompilerErrorParser =                   GreenHillsCompilerErrorParser.new
+    GreenHillsChain[:COMPILER][:C][:ERROR_PARSER] =   GreenHillsCompilerErrorParser
+    GreenHillsChain[:COMPILER][:CPP][:ERROR_PARSER] = GreenHillsCompilerErrorParser
+    GreenHillsChain[:COMPILER][:ASM][:ERROR_PARSER] = GreenHillsCompilerErrorParser
+    GreenHillsChain[:ARCHIVER][:ERROR_PARSER] =       GreenHillsCompilerErrorParser
+    GreenHillsChain[:LINKER][:ERROR_PARSER] =         GreenHillsLinkerErrorParser.new
+
+  end
+end

data/lib/cxxproject/toolchain/provider.rb

@@ -129,3 +129,4 @@ require 'cxxproject/toolchain/diab'
 require 'cxxproject/toolchain/gcc'
 require 'cxxproject/toolchain/clang'
 require 'cxxproject/toolchain/ti'
+require 'cxxproject/toolchain/greenhills'

data/lib/cxxproject/utils/process.rb

@@ -50,7 +50,7 @@ module Cxxproject
     def self.safeExecute
       begin
         consoleOutput = yield
-        [$?.success?, consoleOutput, false]
+        [($?.to_i >> 8) == 0, consoleOutput, false]
       rescue Exception => e
         [false, e.message, true]
       end

data/lib/cxxproject/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.64
+  version: 0.5.65
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-17 00:00:00 Z
+date: 2013-05-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -61,6 +61,8 @@ 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/greenhills_compiler_error_parser.rb
+- lib/cxxproject/errorparser/greenhills_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
@@ -76,6 +78,7 @@ files:
 - lib/cxxproject/toolchain/colorizing_formatter.rb
 - lib/cxxproject/toolchain/diab.rb
 - lib/cxxproject/toolchain/gcc.rb
+- lib/cxxproject/toolchain/greenhills.rb
 - lib/cxxproject/toolchain/provider.rb
 - lib/cxxproject/toolchain/ti.rb
 - lib/cxxproject/toolchain/toolchain.rb