cxxproject 0.5.48 → 0.5.59

data/lib/cxxproject/errorparser/ti_linker_error_parser.rb

@@ -1,29 +1,30 @@
-require 'cxxproject/errorparser/error_parser'
-
-module Cxxproject
-  class TILinkerErrorParser < ErrorParser
-
-    def initialize()
-      # todo: is every line an error?
-      # todo: some linker errors look like simple text, dunno how to parse properly...
-      # @error_expression1 = /(.*:\(\..*\)): (.*)/  # e.g. /c/Tool/Temp/ccAlar4R.o:x.cpp:(.text+0x17): undefined reference to `_a'
-      # @error_expression2 = /(.*):([0-9]+): (.*)/  # e.g. /usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../i686-pc-cygwin/bin/ld:roodi.yml.a:1: syntax 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
-        d.severity = SEVERITY_ERROR
-        res << d
-      end
-      [res, consoleOutput]
-    end
-
-
-  end
-end
+require 'cxxproject/errorparser/error_parser'
+
+module Cxxproject
+  class TILinkerErrorParser < ErrorParser
+
+    def initialize()
+      # todo: is every line an error?
+      # todo: some linker errors look like simple text, dunno how to parse properly...
+      # @error_expression1 = /(.*:\(\..*\)): (.*)/  # e.g. /c/Tool/Temp/ccAlar4R.o:x.cpp:(.text+0x17): undefined reference to `_a'
+      # @error_expression2 = /(.*):([0-9]+): (.*)/  # e.g. /usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../i686-pc-cygwin/bin/ld:roodi.yml.a:1: syntax error
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutput.each_line do |l|
+        l.rstrip!
+        d = ErrorDesc.new
+        if l != "<Linking>" then
+          d.file_name = proj_dir
+          d.line_number = 0
+          d.message = l
+          d.severity = SEVERITY_ERROR
+        end
+        res << d
+      end
+      [res, consoleOutput]
+    end
+
+  end
+end

data/lib/cxxproject/eval_context.rb

@@ -1,136 +1,144 @@
-
-module Cxxproject
-  class BinaryLibs
-    class << self
-      def [](*libs)
-        libraries = Array.new
-        libs.each do |x|
-          libraries << BinaryLibrary.new(x)
-        end
-        libraries
-      end
-    end
-  end
-
-  class EvalContext
-
-    attr_accessor :myblock, :all_blocks
-
-    # must be called to add building blocks
-    def cxx_configuration(&block)
-      @myblock = block
-      @all_blocks = []
-    end
-
-    def eval_project(project_text, project_file, pwd)
-      @current_project_file = project_file
-      @current_working_dir = pwd
-      instance_eval(project_text)
-    end
-
-    def configuration(*args, &block)
-      name = args[0]
-      raise "no name given" unless name.is_a?(String) && !name.strip.empty?
-      instance_eval(&block)
-    end
-
-    def check_hash(hash,allowed)
-      hash.keys.map do |k|
-        error_string = ["error while evaluating \"#{@current_working_dir}/#{@current_project_file}\"",
-                        "\"#{k}\" is not a valid specifier!"].join($/)
-        raise error_string unless allowed.include?(k)
-      end
-    end
-
-    # specify an executable
-    # hash supports:
-    # * :sources
-    # * :includes
-    # * :dependencies
-    # * :libpath
-    # * :output_dir
-    def exe(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:sources,:includes,:dependencies,:libpath,:output_dir]
-      bblock = Executable.new(name)
-      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
-      bblock.set_includes(hash[:includes]) if hash.has_key?(:includes)
-      calc_lib_searchpath(hash).each { |sp| bblock.add_lib_element(HasLibraries::SEARCH_PATH, sp) }
-      if hash.has_key?(:dependencies)
-        bblock.set_dependencies(hash[:dependencies])
-        hash[:dependencies].each { |d| bblock.add_lib_element(HasLibraries::DEPENDENCY, d) }
-      end
-      bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
-      all_blocks << bblock
-    end
-
-    def calc_lib_searchpath(hash)
-      if hash.has_key?(:libpath)
-        hash[:libpath]
-      else
-        if Utils::OS.linux? || Utils::OS.mac?
-          ["/usr/local/lib","/usr/lib"]
-        elsif Utils::OS.windows?
-          ["C:/tool/cygwin/lib", "C:/Tool/cygwin/usr/local/lib"]
-        end
-      end
-    end
-
-    # specify a sourcelib
-    # hash supports:
-    # * :sources
-    # * :includes
-    # * :dependencies
-    # * :toolchain
-    # * :file_dependencies
-    # * :output_dir
-    def source_lib(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir]
-      raise ":sources need to be defined" unless hash.has_key?(:sources)
-      bblock = SourceLibrary.new(name)
-      bblock.set_sources(hash[:sources])
-      bblock.set_includes(hash[:includes]) if hash.has_key?(:includes)
-      bblock.set_tcs(hash[:toolchain]) if hash.has_key?(:toolchain)
-      if hash.has_key?(:dependencies)
-        bblock.set_dependencies(hash[:dependencies]) 
-        hash[:dependencies].each { |d| bblock.add_lib_element(HasLibraries::DEPENDENCY, d) }
-      end
-      bblock.file_dependencies = hash[:file_dependencies] if hash.has_key?(:file_dependencies)
-      bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
-      all_blocks << bblock
-    end
-
-    # specify some binary libs
-    # returns all binary libs as array
-    def bin_libs(*names)
-      res = []
-      mapped = names.map{|n|n.to_s}
-      mapped.each do |name|
-        res << BinaryLibrary.new(name)
-      end
-      mapped
-    end
-
-    def compile(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:sources,:includes]
-      bblock = SingleSource.new(name)
-      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
-      bblock.set_includes(hash[:includes]) if hash.has_key?(:includes)
-      all_blocks << bblock
-    end
-
-    def custom(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:execute, :dependencies]
-      bblock = CustomBuildingBlock.new(name)
-      bblock.set_actions(hash[:execute]) if hash.has_key?(:execute)
-      if hash.has_key?(:dependencies)
-        bblock.set_dependencies(hash[:dependencies])
-      end
-      all_blocks << bblock
-    end
-
-  end
-end
+
+module Cxxproject
+  class BinaryLibs
+    class << self
+      def [](*libs)
+        libraries = Array.new
+        libs.each do |x|
+          libraries << BinaryLibrary.new(x)
+        end
+        libraries
+      end
+    end
+  end
+
+  class EvalContext
+
+    attr_accessor :myblock, :all_blocks
+
+    # must be called to add building blocks
+    def cxx_configuration(&block)
+      @myblock = block
+      @all_blocks = []
+    end
+
+    def eval_project(project_text, project_file, pwd)
+      @current_project_file = project_file
+      @current_working_dir = pwd
+      instance_eval(project_text)
+    end
+
+    def configuration(*args, &block)
+      name = args[0]
+      raise "no name given" unless name.is_a?(String) && !name.strip.empty?
+      instance_eval(&block)
+    end
+
+    def check_hash(hash,allowed)
+      hash.keys.map do |k|
+        error_string = ["error while evaluating \"#{@current_working_dir}/#{@current_project_file}\"",
+                        "\"#{k}\" is not a valid specifier!"].join($/)
+        raise error_string unless allowed.include?(k)
+      end
+    end
+
+    def get_as_array(hash, s)
+      res = hash[s]
+      if res.is_a?(Array)
+        return res
+      end
+      return [res]
+    end
+
+    # specify an executable
+    # hash supports:
+    # * :sources
+    # * :includes
+    # * :dependencies
+    # * :libpath
+    # * :output_dir
+    def exe(name, hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash hash,[:sources,:includes,:dependencies,:libpath,:output_dir]
+      bblock = Executable.new(name)
+      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
+      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
+      calc_lib_searchpath(hash).each { |sp| bblock.add_lib_element(HasLibraries::SEARCH_PATH, sp) }
+      if hash.has_key?(:dependencies)
+        bblock.set_dependencies(hash[:dependencies])
+        hash[:dependencies].each { |d| bblock.add_lib_element(HasLibraries::DEPENDENCY, d) }
+      end
+      bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
+      all_blocks << bblock
+    end
+
+    def calc_lib_searchpath(hash)
+      if hash.has_key?(:libpath)
+        hash[:libpath]
+      else
+        if Utils::OS.linux? || Utils::OS.mac?
+          ["/usr/local/lib","/usr/lib"]
+        elsif Utils::OS.windows?
+          ["C:/tool/cygwin/lib", "C:/Tool/cygwin/usr/local/lib"]
+        end
+      end
+    end
+
+    # specify a sourcelib
+    # hash supports:
+    # * :sources
+    # * :includes
+    # * :dependencies
+    # * :toolchain
+    # * :file_dependencies
+    # * :output_dir
+    def source_lib(name, hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash hash,[:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir]
+      raise ":sources need to be defined" unless hash.has_key?(:sources)
+      bblock = SourceLibrary.new(name)
+      bblock.set_sources(hash[:sources])
+      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
+      bblock.set_tcs(hash[:toolchain]) if hash.has_key?(:toolchain)
+      if hash.has_key?(:dependencies)
+        bblock.set_dependencies(hash[:dependencies])
+        hash[:dependencies].each { |d| bblock.add_lib_element(HasLibraries::DEPENDENCY, d) }
+      end
+      bblock.file_dependencies = hash[:file_dependencies] if hash.has_key?(:file_dependencies)
+      bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
+      all_blocks << bblock
+    end
+
+    # specify some binary libs
+    # returns all binary libs as array
+    def bin_libs(*names)
+      res = []
+      mapped = names.map{|n|n.to_s}
+      mapped.each do |name|
+        res << BinaryLibrary.new(name)
+      end
+      mapped
+    end
+
+    def compile(name, hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash hash,[:sources,:includes]
+      bblock = SingleSource.new(name)
+      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
+      bblock.set_includes(hash[:includes]) if hash.has_key?(:includes)
+      all_blocks << bblock
+    end
+
+    def custom(name, hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash hash,[:execute, :dependencies]
+      bblock = CustomBuildingBlock.new(name)
+      bblock.set_actions(hash[:execute]) if hash.has_key?(:execute)
+      if hash.has_key?(:dependencies)
+        bblock.set_dependencies(hash[:dependencies])
+      end
+      all_blocks << bblock
+    end
+
+  end
+end

data/lib/cxxproject/ext/file.rb

@@ -1,71 +1,71 @@
-require 'cxxproject/utils/utils'
-
-class File
-
-  SLASH = '/'
-
-  def self.is_absolute?(filename)
-    if Cxxproject::Utils.old_ruby?
-      filename[0] == 47 or filename[1] == 58 # 47 = /, 58 = :
-    else
-      filename[0] == SLASH or filename[1] == ':'
-    end
-  end
-
-  def self.rel_from_to_project(from,to,endWithSlash = true)
-    return nil if from.nil? or to.nil?
-    
-	toSplitted = to.split('/')
-	fromSplitted = from.split('/')
-	
-	max = [toSplitted.length, fromSplitted.length].min
-	
-	return nil if max < 1
-	
-	i = 0
-
-	# path letter in windows may be case different
-	if toSplitted[0].length > 1 and fromSplitted[0].length > 1
-      if Cxxproject::Utils.old_ruby?
-        i = 1 if toSplitted[0][1] == 58 and fromSplitted[0][1] == 58 and toSplitted[0].swapcase[0] == fromSplitted[0][0] 
-      else
-        i = 1  if toSplitted[0][1] == ':' and fromSplitted[0][1] == ':' and toSplitted[0].swapcase[0] == fromSplitted[0][0]
-      end	
-	end
-	
-	while i < max
-      break if toSplitted[i] != fromSplitted[i] 
-	  i += 1
-	end
-	j = i
-	
-	res = []
-	while i < fromSplitted.length
-	  res << ".."
-	  i += 1
-	end
-	
-	while j < toSplitted.length
-	  res << toSplitted[j]
-	  j += 1
-	end
-	
-	if res.length == 0
-	  return ""
-	end
-	
-	res = res.join('/')
-	res += "/" if endWithSlash 
-	res
-  end
-
-  
-  def self.add_prefix(prefix, file)
-    if not prefix or is_absolute?(file)
-      file
-    else
-      prefix + file
-    end
-  end
-
-end
+require 'cxxproject/utils/utils'
+
+class File
+
+  SLASH = '/'
+
+  def self.is_absolute?(filename)
+    if Cxxproject::Utils.old_ruby?
+      filename[0] == 47 or filename[1] == 58 # 47 = /, 58 = :
+    else
+      filename[0] == SLASH or filename[1] == ':'
+    end
+  end
+
+  def self.rel_from_to_project(from,to,endWithSlash = true)
+    return nil if from.nil? or to.nil?
+    
+	toSplitted = to.split('/')
+	fromSplitted = from.split('/')
+	
+	max = [toSplitted.length, fromSplitted.length].min
+	
+	return nil if max < 1
+	
+	i = 0
+
+	# path letter in windows may be case different
+	if toSplitted[0].length > 1 and fromSplitted[0].length > 1
+      if Cxxproject::Utils.old_ruby?
+        i = 1 if toSplitted[0][1] == 58 and fromSplitted[0][1] == 58 and toSplitted[0].swapcase[0] == fromSplitted[0][0] 
+      else
+        i = 1  if toSplitted[0][1] == ':' and fromSplitted[0][1] == ':' and toSplitted[0].swapcase[0] == fromSplitted[0][0]
+      end	
+	end
+	
+	while i < max
+      break if toSplitted[i] != fromSplitted[i] 
+	  i += 1
+	end
+	j = i
+	
+	res = []
+	while i < fromSplitted.length
+	  res << ".."
+	  i += 1
+	end
+	
+	while j < toSplitted.length
+	  res << toSplitted[j]
+	  j += 1
+	end
+	
+	if res.length == 0
+	  return ""
+	end
+	
+	res = res.join('/')
+	res += "/" if endWithSlash 
+	res
+  end
+
+  
+  def self.add_prefix(prefix, file)
+    if not prefix or is_absolute?(file)
+      file
+    else
+      prefix + file
+    end
+  end
+
+end