bake-toolkit 2.42.3 → 2.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db7a56decb2a548940290f127a619920e3904e32
-  data.tar.gz: aee111f1f448b858250af2102509e89360d93412
+  metadata.gz: 979457d55561c9d98081d4a922d1af5cbcc4e1d9
+  data.tar.gz: 63ce64c5b31fe8ba2ebba2ee8ae4d28858ed8e93
 SHA512:
-  metadata.gz: 5b548504948bba8662e3c239f72cb1f4e81edf0df45e3bbd5304fe3ca745694581809f66f79f4a888954f9ed44e4d681c5d542f80bd61888992d7b39f686f1f9
-  data.tar.gz: d25bad6ab99a8268a55e300583ad4adc3a189174ad84ce123ef24620d5921081dae00adaca7d7501eaeb3e240cc0b147a27c29787a839bf334a9730638bc7131
+  metadata.gz: 76371243a25ea2d8d703c775996d76fbb635f0a4b7326ac23087db2e3db4fc1f2b3e4d672b6b905d37485a8efbbdf54faf13663bb1386cd81abc25712fa0275e
+  data.tar.gz: 04e358efa264dc5f433f919b9a9231040d61ad85ce7e3794a4c2bc82ef93e35f375a1231d9689ce44060c3004b69815a892735e5d7bf32a1b0fa3839acd42a2a

data/lib/bake/config/checks.rb

@@ -34,6 +34,10 @@ module Bake
                 Bake.formatter.printError("InternalDefines only allowed in DefaultToolchain", c.internalDefines)
                 ExitHelper.exit(1)
               end
+              if c.fileEndings && c.fileEndings.endings.empty?
+                Bake.formatter.printError("FileEnding must not be empty.", c.fileEndings)
+                ExitHelper.exit(1)
+              end
             end
             config.toolchain.lintPolicy.each do |l|
               Bake.formatter.printWarning("Lint support was removed. Please delete LintPolicy from Project.meta.", l)
@@ -43,6 +47,12 @@ module Bake
             config.defaultToolchain.lintPolicy.each do |l|
               Bake.formatter.printWarning("Lint support was removed. Please delete LintPolicy from Project.meta.", l)
             end
+            config.defaultToolchain.compiler.each do |c|
+              if c.fileEndings && c.fileEndings.endings.empty?
+                Bake.formatter.printError("FileEnding must not be empty.", c.fileEndings)
+                ExitHelper.exit(1)
+              end
+            end
           end
 
           config.includeDir.each do |inc|

data/lib/bake/model/language.rb

@@ -1,45 +1,47 @@
-require 'bake/model/metamodel'
-
-require 'rtext/language'
-
-
-
-module Bake
-
-  class Idp
-    def call(e,notUsed1,notUsed2,notUsed3)
-      e.respond_to?(:ident) ? e.ident() : nil
-    end
-  end
-
-
-  Language =
-  RText::Language.new(Metamodel.ecore,
-    :feature_provider => proc {|c|
-      RGen::Serializer::OppositeReferenceFilter.call(c.eAllStructuralFeatures).reject {|f|
-        f.eAnnotations.any? {|a|
-          a.details.any? {|d| d.key == 'internal' && d.value == 'true'}
-        }
-      }
-    },
-    :unlabled_arguments => proc {|c|
-      if c.name == "Compiler" or c.name == "CompilerAdaptions"
-        ["ctype"]
-      elsif c.name == "Define"
-        ["str"]
-      elsif c.name == "Flags" or c.name == "LibPostfixFlags" or c.name == "LibPrefixFlags"
-        ["overwrite"]
-      elsif c.name == "DefaultToolchain"
-        ["basedOn"]
-      elsif c.name == "Description"
-        ["text"]
-      else
-        ["name"]
-      end
-    },
-    :identifier_provider => Idp.new,
-    :line_number_attribute => "line_number",
-    :fragment_ref_attribute => "fragment_ref"
-  )
-
-end
+require 'bake/model/metamodel'
+
+require 'rtext/language'
+
+
+
+module Bake
+
+  class Idp
+    def call(e,notUsed1,notUsed2,notUsed3)
+      e.respond_to?(:ident) ? e.ident() : nil
+    end
+  end
+
+
+  Language =
+  RText::Language.new(Metamodel.ecore,
+    :feature_provider => proc {|c|
+      RGen::Serializer::OppositeReferenceFilter.call(c.eAllStructuralFeatures).reject {|f|
+        f.eAnnotations.any? {|a|
+          a.details.any? {|d| d.key == 'internal' && d.value == 'true'}
+        }
+      }
+    },
+    :unlabled_arguments => proc {|c|
+      if c.name == "Compiler" or c.name == "CompilerAdaptions"
+        ["ctype"]
+      elsif c.name == "Define"
+        ["str"]
+      elsif c.name == "Flags" or c.name == "LibPostfixFlags" or c.name == "LibPrefixFlags"
+        ["overwrite"]
+      elsif c.name == "DefaultToolchain"
+        ["basedOn"]
+      elsif c.name == "Description"
+        ["text"]
+      elsif c.name == "SrcFileEndings"
+        ["endings"]
+      else
+        ["name"]
+      end
+    },
+    :identifier_provider => Idp.new,
+    :line_number_attribute => "line_number",
+    :fragment_ref_attribute => "fragment_ref"
+  )
+
+end

data/lib/bake/model/metamodel.rb

@@ -49,6 +49,10 @@ module Bake
       has_attr 'str', String, :defaultValueLiteral => ""
     end
 
+    class SrcFileEndings < ModelElement
+      has_attr 'endings', String, :defaultValueLiteral => ""
+    end
+
       class InternalIncludes < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
       end
@@ -79,6 +83,7 @@ module Bake
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'
         contains_one 'internalDefines', InternalDefines, 'parent'
+        contains_one 'fileEndings', SrcFileEndings, 'parent'
       end
 
       class LintPolicy < ModelElement
@@ -93,6 +98,7 @@ module Bake
         has_attr 'basedOn', String, :defaultValueLiteral => ""
         has_attr 'outputDir', String, :defaultValueLiteral => ""
         has_attr 'eclipseOrder', Boolean, :defaultValueLiteral => "false"
+        has_attr 'keepObjFileEndings', Boolean, :defaultValueLiteral => "false"
         contains_many 'compiler', Compiler, 'parent'
         contains_one 'archiver', Archiver, 'parent'
         contains_one 'linker', Linker, 'parent'

data/lib/bake/toolchain/provider.rb

@@ -117,7 +117,8 @@ module Bake
         },
 
         :DEP_FILE_SINGLE_LINE => false,
-        :DOCU => ""
+        :DOCU => "",
+        :KEEP_FILE_ENDINGS => false
       }
 
       def self.add(name, basedOn = nil)

data/lib/bake/util.rb

@@ -1,119 +1,123 @@
-require 'bake/model/metamodel_ext'
-require 'bake/model/metamodel'
-require 'set'
-require 'bake/toolchain/colorizing_formatter'
-require 'common/exit_helper'
-require 'common/utils'
-
-
-def remove_empty_strings_and_join(a, j=' ')
-  return a.reject{|e|e.to_s.empty?}.join(j)
-end
-
-def adjustFlags(orgStr, flags)
-  orgSplitted = Bake::Utils::flagSplit(orgStr, false)
-
-  flags.each do |f|
-    if f.overwrite != ""
-      orgSplitted = Bake::Utils::flagSplit(f.overwrite, false)
-    end
-
-    if f.remove != ""
-      rmSplitted = Bake::Utils::flagSplit(f.remove, false)
-      orgSplitted.delete_if {|o| rmSplitted.any? { |r|
-        begin
-          o.match("\\A"+r+"\\Z")
-        rescue Exception => e
-          Bake.formatter.printError(e.message, f)
-          Bake::ExitHelper.exit(1)
-        end
-      }}
-    end
-
-    if f.add != ""
-      Bake::Utils::flagSplit(f.add, false).each do |a|
-        orgSplitted << a unless orgSplitted.any? { |o| o==a }
-      end
-    end
-
-  end
-
-  orgSplitted.join(" ")
-end
-
-def integrateToolchain(tcs, toolchain)
-  return tcs unless toolchain
-
-  tcs[:OUTPUT_DIR] = toolchain.outputDir if toolchain.outputDir != ""
-  integrateLinker(tcs, toolchain.linker) if toolchain.respond_to?"linker"
-  integrateArchiver(tcs, toolchain.archiver)
-  toolchain.compiler.each do |c|
-    integrateCompiler(tcs, c, c.ctype)
-  end
-  integrateDocu(tcs, toolchain.docu) if toolchain.docu
-end
-
-def integrateDocu(tcs, docu)
-  tcs[:DOCU] = docu.name if docu.name != ""
-end
-
-def integrateLinker(tcs, linker)
-  return tcs unless linker
-  tcs[:LINKER][:COMMAND] = linker.command if linker.command != ""
-  tcs[:LINKER][:LINK_ONLY_DIRECT_DEPS] = linker.onlyDirectDeps
-  tcs[:LINKER][:PREFIX] = linker.prefix if linker.prefix != ""
-  tcs[:LINKER][:FLAGS] = adjustFlags(tcs[:LINKER][:FLAGS], linker.flags)
-  tcs[:LINKER][:LIB_PREFIX_FLAGS] = adjustFlags(tcs[:LINKER][:LIB_PREFIX_FLAGS], linker.libprefixflags)
-  tcs[:LINKER][:LIB_POSTFIX_FLAGS] = adjustFlags(tcs[:LINKER][:LIB_POSTFIX_FLAGS], linker.libpostfixflags)
-end
-
-def integrateArchiver(tcs, archiver)
-  return tcs unless archiver
-  tcs[:ARCHIVER][:COMMAND] = archiver.command if archiver.command != ""
-  tcs[:ARCHIVER][:PREFIX] = archiver.prefix if archiver.prefix != ""
-  tcs[:ARCHIVER][:FLAGS] = adjustFlags(tcs[:ARCHIVER][:FLAGS], archiver.flags)
-end
-
-def integrateCompiler(tcs, compiler, type)
-  return tcs unless compiler
-  if compiler.respond_to?"command"
-    tcs[:COMPILER][type][:COMMAND] = compiler.command if compiler.command != ""
-  end
-  if compiler.respond_to?"prefix"
-    tcs[:COMPILER][type][:PREFIX] = compiler.prefix if compiler.prefix != ""
-  end
-
-  tcs[:COMPILER][type][:FLAGS] = adjustFlags(tcs[:COMPILER][type][:FLAGS], compiler.flags)
-  compiler.define.each do |d|
-    tcs[:COMPILER][type][:DEFINES] << d.str unless tcs[:COMPILER][type][:DEFINES].include? d.str
-  end
-end
-
-def integrateCompilerFile(tcs, compiler)
-  [:CPP, :C, :ASM].each do |t|
-    integrateCompiler(tcs, compiler, t)
-  end
-  return tcs
-end
-
-
-def sanitize_filename(filename)
-  filename.strip do |name|
-   # NOTE: File.basename doesn't work right with Windows paths on Unix
-   # get only the filename, not the whole path
-   name.gsub! /^.*(\\|\/)/, ''
-
-   # Finally, replace all non alphanumeric, underscore
-   # or periods with underscore
-   # name.gsub! /[^\w\.\-]/, '_'
-   # Basically strip out the non-ascii alphabets too
-   # and replace with x.
-   # You don't want all _ :)
-   name.gsub!(/[^0-9A-Za-z.\-]/, 'x')
-  end
-end
-
-def add_line_if_no_comment(array, str)
-  s = str.split("#")[0].strip
-  array << s unless s.empty?
-end
+require 'bake/model/metamodel_ext'
+require 'bake/model/metamodel'
+require 'set'
+require 'bake/toolchain/colorizing_formatter'
+require 'common/exit_helper'
+require 'common/utils'
+
+
+def remove_empty_strings_and_join(a, j=' ')
+  return a.reject{|e|e.to_s.empty?}.join(j)
+end
+
+def adjustFlags(orgStr, flags)
+  orgSplitted = Bake::Utils::flagSplit(orgStr, false)
+
+  flags.each do |f|
+    if f.overwrite != ""
+      orgSplitted = Bake::Utils::flagSplit(f.overwrite, false)
+    end
+
+    if f.remove != ""
+      rmSplitted = Bake::Utils::flagSplit(f.remove, false)
+      orgSplitted.delete_if {|o| rmSplitted.any? { |r|
+        begin
+          o.match("\\A"+r+"\\Z")
+        rescue Exception => e
+          Bake.formatter.printError(e.message, f)
+          Bake::ExitHelper.exit(1)
+        end
+      }}
+    end
+
+    if f.add != ""
+      Bake::Utils::flagSplit(f.add, false).each do |a|
+        orgSplitted << a unless orgSplitted.any? { |o| o==a }
+      end
+    end
+
+  end
+
+  orgSplitted.join(" ")
+end
+
+def integrateToolchain(tcs, toolchain)
+  return tcs unless toolchain
+
+  tcs[:KEEP_FILE_ENDINGS] = @mainConfig.defaultToolchain.keepObjFileEndings
+  tcs[:OUTPUT_DIR] = toolchain.outputDir if toolchain.outputDir != ""
+  integrateLinker(tcs, toolchain.linker) if toolchain.respond_to?"linker"
+  integrateArchiver(tcs, toolchain.archiver)
+  toolchain.compiler.each do |c|
+    integrateCompiler(tcs, c, c.ctype)
+  end
+  integrateDocu(tcs, toolchain.docu) if toolchain.docu
+end
+
+def integrateDocu(tcs, docu)
+  tcs[:DOCU] = docu.name if docu.name != ""
+end
+
+def integrateLinker(tcs, linker)
+  return tcs unless linker
+  tcs[:LINKER][:COMMAND] = linker.command if linker.command != ""
+  tcs[:LINKER][:LINK_ONLY_DIRECT_DEPS] = linker.onlyDirectDeps
+  tcs[:LINKER][:PREFIX] = linker.prefix if linker.prefix != ""
+  tcs[:LINKER][:FLAGS] = adjustFlags(tcs[:LINKER][:FLAGS], linker.flags)
+  tcs[:LINKER][:LIB_PREFIX_FLAGS] = adjustFlags(tcs[:LINKER][:LIB_PREFIX_FLAGS], linker.libprefixflags)
+  tcs[:LINKER][:LIB_POSTFIX_FLAGS] = adjustFlags(tcs[:LINKER][:LIB_POSTFIX_FLAGS], linker.libpostfixflags)
+end
+
+def integrateArchiver(tcs, archiver)
+  return tcs unless archiver
+  tcs[:ARCHIVER][:COMMAND] = archiver.command if archiver.command != ""
+  tcs[:ARCHIVER][:PREFIX] = archiver.prefix if archiver.prefix != ""
+  tcs[:ARCHIVER][:FLAGS] = adjustFlags(tcs[:ARCHIVER][:FLAGS], archiver.flags)
+end
+
+def integrateCompiler(tcs, compiler, type)
+  return tcs unless compiler
+  if compiler.respond_to?"command"
+    tcs[:COMPILER][type][:COMMAND] = compiler.command if compiler.command != ""
+  end
+  if compiler.respond_to?"prefix"
+    tcs[:COMPILER][type][:PREFIX] = compiler.prefix if compiler.prefix != ""
+  end
+  if compiler.fileEndings
+    tcs[:COMPILER][type][:SOURCE_FILE_ENDINGS] = compiler.fileEndings.endings.split(",").map{|e| e.strip}
+  end
+
+  tcs[:COMPILER][type][:FLAGS] = adjustFlags(tcs[:COMPILER][type][:FLAGS], compiler.flags)
+  compiler.define.each do |d|
+    tcs[:COMPILER][type][:DEFINES] << d.str unless tcs[:COMPILER][type][:DEFINES].include? d.str
+  end
+end
+
+def integrateCompilerFile(tcs, compiler)
+  [:CPP, :C, :ASM].each do |t|
+    integrateCompiler(tcs, compiler, t)
+  end
+  return tcs
+end
+
+
+def sanitize_filename(filename)
+  filename.strip do |name|
+   # NOTE: File.basename doesn't work right with Windows paths on Unix
+   # get only the filename, not the whole path
+   name.gsub! /^.*(\\|\/)/, ''
+
+   # Finally, replace all non alphanumeric, underscore
+   # or periods with underscore
+   # name.gsub! /[^\w\.\-]/, '_'
+   # Basically strip out the non-ascii alphabets too
+   # and replace with x.
+   # You don't want all _ :)
+   name.gsub!(/[^0-9A-Za-z.\-]/, 'x')
+  end
+end
+
+def add_line_if_no_comment(array, str)
+  s = str.split("#")[0].strip
+  array << s unless s.empty?
+end

data/lib/blocks/block.rb

@@ -359,7 +359,6 @@ module Bake
         # todo: sync output if commandline and makefile!!!!!!!!!!!!!!!!!!!
         @outputStep = nil
         allSteps.each { |step| @outputStep = independent?(method, step) ? step : nil }
-
         while !allSteps.empty?
           parallel = []
           while allSteps.first && independent?(method, allSteps.first)
@@ -410,7 +409,7 @@ module Bake
         @inDeps = true
         depResult = callDeps(:execute)
         @inDeps = false
-        return @result if blockAbort?(depResult)
+        return @result && depResult if blockAbort?(depResult)
 
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
 
@@ -448,7 +447,6 @@ module Bake
           end
         end
 
-
         return (depResult && @result)# && @@delayed_result)
       end
 

data/lib/blocks/compile.rb

@@ -34,7 +34,8 @@ module Bake
       def get_object_file(source)
         # until now all OBJECT_FILE_ENDING are equal in all three types
 
-        srcWithoutDotDot = source.chomp(File.extname(source)).gsub(/\.\./, "__")
+        sourceEndingAdapted = @block.tcs[:KEEP_FILE_ENDINGS] ? source : source.chomp(File.extname(source))
+        srcWithoutDotDot = sourceEndingAdapted.gsub(/\.\./, "__")
         if srcWithoutDotDot[0] == '/'
           srcWithoutDotDot = "_" + srcWithoutDotDot
         elsif srcWithoutDotDot[1] == ':'

data/lib/blocks/library.rb

@@ -65,7 +65,13 @@ module Bake
               return true
             end
           else
-            @objects = Dir.glob_dir("#{@block.output_dir}/**/*.o", @projectDir)
+
+            @objects = []
+            [:CPP, :C, :ASM].map do |t|
+              @block.tcs[:COMPILER][t][:OBJECT_FILE_ENDING]
+            end.uniq.each do |e|
+              @objects << Dir.glob_dir("#{@block.output_dir}/**/*#{e}", @projectDir)
+            end
             if @objects.empty?
               if !File.exists?(File.expand_path(@archive_name, @projectDir))
                 SyncOut.mutex.synchronize do
@@ -130,7 +136,14 @@ module Bake
       def clean
         if @block.prebuild
           Dir.chdir(@projectDir) do
-            @objects = Dir.glob_dir("#{@block.output_dir}/**/*.o", @projectDir)
+
+            @objects = []
+            [:CPP, :C, :ASM].map do |t|
+              @block.tcs[:COMPILER][t][:OBJECT_FILE_ENDING]
+            end.uniq.each do |e|
+              @objects << Dir.glob_dir("#{@block.output_dir}/**/*#{e}", @projectDir)
+            end
+
             if !@objects.empty? && File.exist?(@archive_name)
               puts "Deleting file #{@archive_name}" if Bake.options.verbose >= 2
               if !Bake.options.dry

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.42.3"
+      "2.43.0"
     end
 
     def self.printBakeVersion(ry = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.42.3
+  version: 2.43.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext