cxxproject 0.5.66 → 0.5.67

data/lib/cxxproject/buildingblocks/executable.rb

@@ -141,11 +141,14 @@ module Cxxproject
           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[cmd.length-1] << @mapfile 
+          end
           cmd += Cxxproject::Utils::flagSplit(linker[:LIB_PREFIX_FLAGS]) # "-Wl,--whole-archive "
           cmd += linker_lib_string
           cmd += Cxxproject::Utils::flagSplit(linker[:LIB_POSTFIX_FLAGS]) # "-Wl,--no-whole-archive "
 
-          mapfileStr = @mapfile ? " >#{@mapfile}" : ""
+          mapfileStr = (@mapfile and linker[:MAP_FILE_PIPE]) ? " >#{@mapfile}" : ""
           if Cxxproject::Utils.old_ruby?
             cmd.map! {|c| ((c.include?(" ")) ? ("\""+c+"\"") : c )}
 
@@ -170,7 +173,7 @@ module Cxxproject
             cmdLinePrint = cmd
             printCmd(cmdLinePrint, "Linking #{get_executable_name}", false)
             cmd << {
-             :out=> @mapfile ? "#{@mapfile}" : wr, # > xy.map
+             :out=> (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : wr, # > xy.map
              :err=>wr
             }
             
@@ -178,7 +181,7 @@ module Cxxproject
             cmd.pop
 
             # for console print
-            cmd << " >#{@mapfile}" if @mapfile
+            cmd << " >#{@mapfile}" if (@mapfile and linker[:MAP_FILE_PIPE])
           end
 
           process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, success)

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -110,7 +110,7 @@ module Cxxproject
     end
 
     def get_dep_file(object)
-      object[0..-3] + ".o.d"
+      object[0..-3] + ".d"
     end
 
     def get_source_type(source)
@@ -260,17 +260,19 @@ module Cxxproject
           cmd += compiler[:COMPILE_FLAGS].split(" ")
           if dep_file
             cmd += depStr.split(" ")
-            if the_tcs[:COMPILER][type][:DEP_FLAGS_SPACE]
-              cmd << dep_file
-            else
-              cmd[cmd.length-1] << dep_file
+            if the_tcs[:COMPILER][type][:DEP_FLAGS_FILENAME]
+              if the_tcs[:COMPILER][type][:DEP_FLAGS_SPACE]
+                cmd << dep_file
+              else
+                cmd[cmd.length-1] << dep_file
+              end
             end
           end
+          cmd += compiler[:PREPRO_FLAGS].split(" ") if Rake::application.preproFlags
           cmd += Cxxproject::Utils::flagSplit(compiler[:FLAGS])
           cmd += i_array
           cmd += d_array
           cmd += (compiler[:OBJECT_FILE_FLAG] + objectRel).split(" ")
-          cmd += compiler[:PREPRO_FLAGS].split(" ") if Rake::application.preproFlags
           cmd << sourceRel
 
           if Cxxproject::Utils.old_ruby?

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -79,9 +79,9 @@ module Cxxproject
             end
             
             cmd = [archiver[:COMMAND]] # ar
-            cmd += archiver[:ARCHIVE_FLAGS].split(" ")
             cmd += Cxxproject::Utils::flagSplit(archiver[:FLAGS]) # --all_load
-            cmd << aname # -o debug/x.exe
+            cmd += archiver[:ARCHIVE_FLAGS].split(" ")
+            cmd << aname
             cmd += objs
   
             if Cxxproject::Utils.old_ruby?

data/lib/cxxproject/errorparser/greenhills_linker_error_parser.rb

@@ -3,24 +3,37 @@ require 'cxxproject/errorparser/error_parser'
 module Cxxproject
   class GreenHillsLinkerErrorParser < ErrorParser
 
+#    detect this:
+
+#    C++ prelinker: recompiling "x/y.z"
+#    "blah.h", line 1: warning #123-D: expression has no effect
+#                    uiuiui
+#                    ^
+#              detected during:
+#                instantiation of ...
+    
+#   dblink: WARNING: 10 problems were encountered while processing debug information, see "Debug/xy.dle" for details.
+    
     def initialize()
-      # todo: is every line an error?
+      @error_expression = /ld: (.+)/
     end
 
     def scan_lines(consoleOutput, proj_dir)
       res = []
+      error_severity = 255
       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
+        scan_res = l.scan(@error_expression)
+        if scan_res.length == 0 # msg will end with the beginning of the next message
+          d.severity = error_severity
+          d.message = l
+        elsif scan_res.length > 0
+          d.file_name = proj_dir
+          d.line_number = 0
+          d.message = scan_res[0][0]
           d.severity = SEVERITY_ERROR
+          error_severity = d.severity
         end
         res << d
       end

data/lib/cxxproject/toolchain/greenhills.rb

@@ -9,36 +9,35 @@ module Cxxproject
     GreenHillsChain = Provider.add("GreenHills")
 
     GreenHillsChain[:COMPILER][:C].update({
-      :COMMAND => "ccppc",
+      :COMMAND => "cxppc",
       :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
+      :DEP_FLAGS => "-MMD",
+      :DEP_FLAGS_FILENAME => false,
+      :PREPRO_FLAGS => "-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[:ARCHIVER][:COMMAND] = "cxppc"
+    GreenHillsChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-archive -o"
 
-    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][:COMMAND] = "cxppc" # ??
+    GreenHillsChain[:LINKER][:SCRIPT] = "-T" # -T file.ld
+    GreenHillsChain[:LINKER][:USER_LIB_FLAG] = "-l" # user lib not supported? same as lib... 
     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][:MAP_FILE_FLAG] = "-map=" # -map=filename
+    GreenHillsChain[:LINKER][:MAP_FILE_PIPE] = false   
     GreenHillsChain[:LINKER][:OUTPUT_ENDING] = ".elf"
 
     GreenHillsCompilerErrorParser =                   GreenHillsCompilerErrorParser.new

data/lib/cxxproject/toolchain/provider.rb

@@ -18,7 +18,8 @@ module Cxxproject
             :FLAGS => "",
             :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
             :DEP_FLAGS => "",
-            :DEP_FLAGS => true,
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => ""
           },
@@ -32,6 +33,8 @@ module Cxxproject
             :FLAGS => "",
             :SOURCE_FILE_ENDINGS => [".c"],
             :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => ""
           },
@@ -45,6 +48,8 @@ module Cxxproject
             :FLAGS => "",
             :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
             :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => ""
           }
@@ -71,6 +76,7 @@ module Cxxproject
           :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
           :FLAGS => "",
           :MAP_FILE_FLAG => "",
+          :MAP_FILE_PIPE => true,
           :OUTPUT_ENDING => ".exe", # or .elf
           :ERROR_PARSER => nil
         },

data/lib/cxxproject/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.66
+  version: 0.5.67
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-29 00:00:00 Z
+date: 2013-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline