cxxproject 0.5.76 → 0.6.0

data/lib/cxxproject/toolchain/clang.rb

@@ -1,43 +1,39 @@
-require 'cxxproject/utils/utils'
-require 'cxxproject/toolchain/provider'
-require 'cxxproject/errorparser/error_parser'
-require 'cxxproject/errorparser/gcc_compiler_error_parser'
-require 'cxxproject/errorparser/gcc_linker_error_parser'
-
-module Cxxproject
-  module Toolchain
-    gccCompilerErrorParser = GCCCompilerErrorParser.new
-
-    CLANG_CHAIN = Provider.add("CLANG")
-
-    CLANG_CHAIN[:COMPILER][:CPP].update({
-      :COMMAND => "llvm-g++",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MD -MF ", # empty space at the end is important!
-      :ERROR_PARSER => gccCompilerErrorParser
-    })
-
-    CLANG_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:CPP])
-    CLANG_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "llvm-gcc"
-
-    CLANG_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:C])
-    CLANG_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
-    CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
-    CLANG_CHAIN[:ARCHIVER][:ERROR_PARSER] = gccCompilerErrorParser
-
-    CLANG_CHAIN[:LINKER][:COMMAND] = "llvm-g++"
-    CLANG_CHAIN[:LINKER][:SCRIPT] = "-T"
-    CLANG_CHAIN[:LINKER][:USER_LIB_FLAG] = "-l:"
-    CLANG_CHAIN[:LINKER][:EXE_FLAG] = "-o"
-    CLANG_CHAIN[:LINKER][:LIB_FLAG] = "-l"
-    CLANG_CHAIN[:LINKER][:LIB_PATH_FLAG] = "-L"
-      
-    CLANG_CHAIN[:LINKER][:ERROR_PARSER] = GCCLinkerErrorParser.new      
-  end
-end
+require 'cxxproject/utils/utils'
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/errorparser/error_parser'
+require 'cxxproject/errorparser/gcc_compiler_error_parser'
+
+module Cxxproject
+  module Toolchain
+    gccCompilerErrorParser = GCCCompilerErrorParser.new
+
+    CLANG_CHAIN = Provider.add("CLANG")
+
+    CLANG_CHAIN[:COMPILER][:CPP].update({
+      :COMMAND => "llvm-g++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "-MMD -MF ", # empty space at the end is important!
+      :ERROR_PARSER => gccCompilerErrorParser
+    })
+
+    CLANG_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:CPP])
+    CLANG_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "llvm-gcc"
+
+    CLANG_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:C])
+    CLANG_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
+    CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
+
+    CLANG_CHAIN[:LINKER][:COMMAND] = "llvm-g++"
+    CLANG_CHAIN[:LINKER][:SCRIPT] = "-T"
+    CLANG_CHAIN[:LINKER][:USER_LIB_FLAG] = "-l:"
+    CLANG_CHAIN[:LINKER][:EXE_FLAG] = "-o"
+    CLANG_CHAIN[:LINKER][:LIB_FLAG] = "-l"
+    CLANG_CHAIN[:LINKER][:LIB_PATH_FLAG] = "-L"
+  end
+end

data/lib/cxxproject/toolchain/colorizing_formatter.rb

@@ -1,99 +1,99 @@
-require 'cxxproject/utils/optional'
-
-module Cxxproject
-  include Utils
-
-  class ColorizingFormatter
-    class << self
-      attr_accessor :enabled
-    end
-    def enabled?
-      false
-    end
-  end
-
-  define_colorizin_formatter = lambda do
-    require 'colored'
-
-    # simple class to colorize compiler output
-    # the class depends on the rainbow gem
-    class ColorizingFormatter
-    
-      # colors are not instance vars due to caching the building blocks
-      def self.setColorScheme(scheme)
-        if scheme == :black
-          @@warning_color = :yellow
-          @@error_color = :red
-          @@info_color = :white
-          @@additional_info_color = :cyan
-          @@success_color = :green
-        elsif scheme == :white
-          @@warning_color = :magenta
-          @@error_color = :red
-          @@info_color = :black
-          @@additional_info_color = :blue
-          @@success_color = :green
-        end
-      end
-      ColorizingFormatter.setColorScheme(:black) # default
-
-      def printError(str)
-        [@@error_color,:bold].inject(str) {|m,x| m.send(x)}
-      end
-
-      def printWarning(str)
-        [@@warning_color,:bold].inject(str) {|m,x| m.send(x)}
-      end
-
-      def printInfo(str)
-        [@@info_color,:bold].inject(str) {|m,x| m.send(x)}
-      end
-
-      def printAdditionalInfo(str)
-        [@@additional_info_color,:bold].inject(str) {|m,x| m.send(x)}
-      end
-
-      def printSuccess(str)
-        [@@success_color,:bold].inject(str) {|m,x| m.send(x)}
-      end
-
-      # formats several lines of usually compiler output
-      def format(compiler_output, error_descs, error_parser)
-        return compiler_output if not enabled?
-        res = ""
-        begin
-          zipped = compiler_output.split($/).zip(error_descs)
-          zipped.each do |l,desc|
-            if desc.severity != 255
-              coloring = {}
-              if desc.severity == ErrorParser::SEVERITY_WARNING
-                res << printWarning(l)
-              elsif desc.severity == ErrorParser::SEVERITY_ERROR
-                res << printError(l)
-              else
-                res << printInfo(l)
-              end
-            else
-              res << l
-            end
-            res << "\n" 
-          end
-        rescue Exception => e
-          puts "Error while parsing compiler output: #{e}"
-          return compiler_output
-        end
-        res
-      end
-
-      # getter to access the static variable with an instance
-      def enabled?
-        return ColorizingFormatter.enabled
-      end
-
-    end
-
-  end
-
-  Utils.optional_package(define_colorizin_formatter, nil)
-
-end
+require 'cxxproject/utils/optional'
+
+module Cxxproject
+  include Utils
+
+  class ColorizingFormatter
+    class << self
+      attr_accessor :enabled
+    end
+    def enabled?
+      false
+    end
+  end
+
+  define_colorizin_formatter = lambda do
+    require 'colored'
+
+    # simple class to colorize compiler output
+    # the class depends on the rainbow gem
+    class ColorizingFormatter
+    
+      # colors are not instance vars due to caching the building blocks
+      def self.setColorScheme(scheme)
+        if scheme == :black
+          @@warning_color = :yellow
+          @@error_color = :red
+          @@info_color = :white
+          @@additional_info_color = :cyan
+          @@success_color = :green
+        elsif scheme == :white
+          @@warning_color = :magenta
+          @@error_color = :red
+          @@info_color = :black
+          @@additional_info_color = :blue
+          @@success_color = :green
+        end
+      end
+      ColorizingFormatter.setColorScheme(:black) # default
+
+      def printError(str)
+        [@@error_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printWarning(str)
+        [@@warning_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printInfo(str)
+        [@@info_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printAdditionalInfo(str)
+        [@@additional_info_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printSuccess(str)
+        [@@success_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      # formats several lines of usually compiler output
+      def format(compiler_output, error_descs, error_parser)
+        return compiler_output if not enabled?
+        res = ""
+        begin
+          zipped = compiler_output.split($/).zip(error_descs)
+          zipped.each do |l,desc|
+            if desc.severity != 255
+              coloring = {}
+              if desc.severity == ErrorParser::SEVERITY_WARNING
+                res << printWarning(l)
+              elsif desc.severity == ErrorParser::SEVERITY_ERROR
+                res << printError(l)
+              else
+                res << printInfo(l)
+              end
+            else
+              res << l
+            end
+            res << "\n" 
+          end
+        rescue Exception => e
+          puts "Error while parsing compiler output: #{e}"
+          return compiler_output
+        end
+        res
+      end
+
+      # getter to access the static variable with an instance
+      def enabled?
+        return ColorizingFormatter.enabled
+      end
+
+    end
+
+  end
+
+  Utils.optional_package(define_colorizin_formatter, nil)
+
+end

data/lib/cxxproject/toolchain/diab.rb

@@ -15,7 +15,7 @@ module Cxxproject
       :OBJECT_FILE_FLAG => "-o ",
       :INCLUDE_PATH_FLAG => "-I",
       :COMPILE_FLAGS => "-c",
-      :DEP_FLAGS => "-Xmake-dependency=5 -Xmake-dependency-savefile=",
+      :DEP_FLAGS => "-Xmake-dependency=6 -Xmake-dependency-savefile=",
       :DEP_FLAGS_SPACE => false,
       :PREPRO_FLAGS => "-P"
     })

data/lib/cxxproject/toolchain/gcc.rb

@@ -15,7 +15,7 @@ module Cxxproject
       :OBJECT_FILE_FLAG => "-o ",
       :INCLUDE_PATH_FLAG => "-I",
       :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MD -MF",
+      :DEP_FLAGS => "-MMD -MF",
       :DEP_FLAGS_SPACE => true,
       :PREPRO_FLAGS => "-E -P"
     })

data/lib/cxxproject/toolchain/provider.rb

@@ -1,143 +1,131 @@
-require 'cxxproject/toolchain/colorizing_formatter'
-
-module Cxxproject
-  module Toolchain
-
-    class Provider
-      @@settings = {}
-      @@default = {
-        :COMPILER =>
-        {
-          :CPP => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => ""
-          },
-          :C => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".c"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => ""
-          },
-          :ASM => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => ""
-          }
-        },
-
-        :ARCHIVER =>
-        {
-          :COMMAND => "",
-          :ARCHIVE_FLAGS => "",
-          :FLAGS => "",
-          :ERROR_PARSER => nil
-        },
-
-        :LINKER =>
-        {
-          :COMMAND => "",
-          :MUST_FLAGS => "",
-          :SCRIPT => "",
-          :USER_LIB_FLAG => "",
-          :EXE_FLAG => "",
-          :LIB_FLAG => "",
-          :LIB_PATH_FLAG => "",
-          :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
-          :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
-          :FLAGS => "",
-          :MAP_FILE_FLAG => "",
-          :MAP_FILE_PIPE => true,
-          :OUTPUT_ENDING => ".exe", # or .elf
-          :ERROR_PARSER => nil,
-          :LIST_MODE => false
-        },
-
-        :MAKE =>
-        {
-          :COMMAND => "make",
-          :FLAGS => "-j",
-          :FILE_FLAG => "-f",
-          :DIR_FLAG => "-C",
-          :CLEAN => "clean"
-        },
-        
-        :CONSOLE_HIGHLIGHTER => ColorizingFormatter.new,
-        
-        :LINT_POLICY => []
-      }
-
-      def self.add(name, basedOn = nil)
-        chain = Marshal.load(Marshal.dump(basedOn.nil? ? @@default : @@settings[basedOn]))
-        @@settings[name] = chain
-        chain
-      end
-
-      def self.default
-        @@default
-      end
-
-      def self.modify_cpp_compiler(based_on, h)
-        chain = Marshal.load(Marshal.dump(@@settings[based_on]))
-        chain[:COMPILER][:CPP].update(h)
-        chain
-      end
-
-      def self.[](name)
-      
-        if name == "TI"
-          if not ENV['TI_HOME']
-            Printer.printError "Error: Please set TI_HOME"
-            ExitHelper.exit(1)
-          end
-        end
-      
-        return @@settings[name] if @@settings.include? name
-        nil
-      end
-
-      def self.list
-        return @@settings.delete_if {|x| x.include?"_Lint" }
-      end
-
-    end
-
-  end
-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'
-require 'cxxproject/toolchain/keil'
+require 'cxxproject/toolchain/colorizing_formatter'
+
+module Cxxproject
+  module Toolchain
+
+    class Provider
+      @@settings = {}
+      @@default = {
+        :COMPILER =>
+        {
+          :CPP => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS => true,
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => ""
+          },
+          :C => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".c"],
+            :DEP_FLAGS => "",
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => ""
+          },
+          :ASM => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
+            :DEP_FLAGS => "",
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => ""
+          }
+        },
+
+        :ARCHIVER =>
+        {
+          :COMMAND => "",
+          :ARCHIVE_FLAGS => "",
+          :FLAGS => "",
+          :ERROR_PARSER => nil
+        },
+
+        :LINKER =>
+        {
+          :COMMAND => "",
+          :MUST_FLAGS => "",
+          :SCRIPT => "",
+          :USER_LIB_FLAG => "",
+          :EXE_FLAG => "",
+          :LIB_FLAG => "",
+          :LIB_PATH_FLAG => "",
+          :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
+          :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
+          :FLAGS => "",
+          :MAP_FILE_FLAG => "",
+          :OUTPUT_ENDING => ".exe", # or .elf
+          :ERROR_PARSER => nil
+        },
+
+        :MAKE =>
+        {
+          :COMMAND => "make",
+          :FLAGS => "-j",
+          :FILE_FLAG => "-f",
+          :DIR_FLAG => "-C",
+          :CLEAN => "clean"
+        },
+        
+        :CONSOLE_HIGHLIGHTER => ColorizingFormatter.new
+      }
+
+      def self.add(name, basedOn = nil)
+        chain = Marshal.load(Marshal.dump(basedOn.nil? ? @@default : @@settings[basedOn]))
+        @@settings[name] = chain
+        chain
+      end
+
+      def self.default
+        @@default
+      end
+
+      def self.modify_cpp_compiler(based_on, h)
+        chain = Marshal.load(Marshal.dump(@@settings[based_on]))
+        chain[:COMPILER][:CPP].update(h)
+        chain
+      end
+
+      def self.[](name)
+      
+        if name == "TI"
+          if not ENV['TI_HOME']
+            Printer.printError "Error: Please set TI_HOME"
+            ExitHelper.exit(1)
+          end
+        end
+      
+        return @@settings[name] if @@settings.include? name
+        nil
+      end
+
+      def self.list
+        return @@settings
+      end
+
+    end
+
+  end
+end
+
+require 'cxxproject/toolchain/diab'
+require 'cxxproject/toolchain/gcc'
+require 'cxxproject/toolchain/clang'
+require 'cxxproject/toolchain/ti'

data/lib/cxxproject/toolchain/toolchain.rb

@@ -1,38 +1,38 @@
-require 'yaml'
-
-class Hash
-  def method_missing(m, *args, &block)
-    if m.to_s =~ /(.*)=$/ # was assignment
-      self[$1] = args[0]
-    else
-      fetch(m.to_s, nil)
-    end
-  end
-  def recursive_merge(h)
-    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge(_new) else _new end  } 
-  end
-
-end
-
-class Toolchain
-  attr_reader :toolchain
-  def initialize(toolchain_file)
-    @toolchain = YAML::load(File.open(toolchain_file))
-    if @toolchain.base
-      @based_on = @toolchain.base
-    else
-      @based_on = "base"
-    end
-    basechain = YAML::load(File.open(File.join(File.dirname(__FILE__),"#{@based_on}.json")))
-    @toolchain = basechain.recursive_merge(@toolchain)
-  end
-  def method_missing(m, *args, &block)  
-    if @toolchain[m.to_s]
-      self.class.send(:define_method, m) { @toolchain[m.to_s] }
-      @toolchain[m.to_s]
-    else
-      return super
-    end
-  end  
-
-end
+require 'yaml'
+
+class Hash
+  def method_missing(m, *args, &block)
+    if m.to_s =~ /(.*)=$/ # was assignment
+      self[$1] = args[0]
+    else
+      fetch(m.to_s, nil)
+    end
+  end
+  def recursive_merge(h)
+    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge(_new) else _new end  } 
+  end
+
+end
+
+class Toolchain
+  attr_reader :toolchain
+  def initialize(toolchain_file)
+    @toolchain = YAML::load(File.open(toolchain_file))
+    if @toolchain.base
+      @based_on = @toolchain.base
+    else
+      @based_on = "base"
+    end
+    basechain = YAML::load(File.open(File.join(File.dirname(__FILE__),"#{@based_on}.json")))
+    @toolchain = basechain.recursive_merge(@toolchain)
+  end
+  def method_missing(m, *args, &block)  
+    if @toolchain[m.to_s]
+      self.class.send(:define_method, m) { @toolchain[m.to_s] }
+      @toolchain[m.to_s]
+    else
+      return super
+    end
+  end  
+
+end