bake-toolkit 2.53.0 → 2.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30b262873a0ace0c66d50fd465eadc5831efab3aec86c1581449326894f53b8
-  data.tar.gz: bde9aa588f9735d37088bc3954ac6bec2c605665d6a472fcf9c1859898db5cb0
+  metadata.gz: 13e4226c82faa0439951dd701951b5af74bceabbf73c185791fa46d70afc6835
+  data.tar.gz: 54c74b7f0daf417c1581340ffdfdea95d72a1e516b4df6d622639be4d06480ae
 SHA512:
-  metadata.gz: 6ff3239869804870c5d108cd5f43ca476749b0effc7fa4eccb909c0307f35f0fee6ba43b74c27590f0f764f1346ab9ce781601d46055c2c3bc48f71ec30512e8
-  data.tar.gz: 8df0c9092ce5073e0fe3d431edf8431c2e30ec958a9c5170650a62426db764749cd85119d1c1b6bd48c08a1e15f2e1d7d44380034981575befa9d56301885555
+  metadata.gz: 6b2241a42ca4b0430c6e408a3ed03fdcbd2aad0d378046e48486dd7256f49dc59007dca65c32dbd7aa9374a8da019293cf21de5632d519d18475849b6c700445
+  data.tar.gz: e6d9bbd765ac4767a78106a18465d648dc85300444f407971971ebe8b6c0f5692b9d554f13c1faa76bb3858636596fb2fea59ba554664869a8e1ae070bec9250

data/lib/bake/model/metamodel.rb

@@ -268,6 +268,10 @@ module Bake
         has_attr 'name', String, :defaultValueLiteral => ""
       end
 
+      class ArtifactExtension < ModelElement
+        has_attr 'name', String, :defaultValueLiteral => "default"
+      end
+
       class Set < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'value', String, :defaultValueLiteral => ""
@@ -309,6 +313,7 @@ module Bake
         contains_many 'files', Files, 'parent'
         contains_many 'excludeFiles', ExcludeFiles, 'parent'
         contains_one 'artifactName', ArtifactName, 'parent'
+        contains_one 'artifactExtension', ArtifactExtension, 'parent'
       end
 
       class ExecutableConfig < BuildConfig_INTERNAL

data/lib/bake/options/options.rb

@@ -20,7 +20,7 @@ module Bake
 
   class Options < Parser
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
-    attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :cc2j_filename # String
+    attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :dotFilename, :cc2j_filename # String
     attr_reader :include_filter, :exclude_filter, :adapt # String List
     attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads, :skipBuildingLine # Boolean
     attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :prebuild, :printTime, :json, :wparse, :caseSensitivityCheck, :fileCmd, :profiling # Boolean
@@ -33,6 +33,8 @@ module Bake
     attr_reader :roots # Root array
     attr_reader :diabCaseCheck
     attr_reader :defines
+    attr_reader :dev_features
+    attr_reader :dotShowProjOnly
 
 
     def initialize(argv)
@@ -46,7 +48,8 @@ module Bake
       @qac = false
       @projectPaths = false
       @wparse = false
-      @dot = nil
+      @dot = false
+      @dotFilename = nil
       @prebuild = false
       @printTime = false
       @buildDirDelimiter = "/"
@@ -92,6 +95,8 @@ module Bake
       @fileCmd = false
       @dotAndCompile = false
       @show_roots = false
+      @dev_features = []
+      @dotShowProjOnly = false
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| @main_dir = x                           })
@@ -114,6 +119,7 @@ module Bake
       add_option(["--file-list",          "--file_list"          ], lambda {     @filelist = Set.new                     })
       add_option(["--filter-paths"                               ], lambda {     @projectPaths = true                    })
       add_option(["--qac"                                        ], lambda {     @qac = true                             })
+      add_option(["-Z"                                           ], lambda { |x| @dev_features <<  x                     })
 
       add_option(["--generate-doc",       "--docu"               ], lambda {     @docu = true                            })
 
@@ -133,8 +139,9 @@ module Bake
       add_option(["--socket"                                     ], lambda { |x| @socket = String === x ? x.to_i : x     })
       add_option(["--toolchain-info",     "--toolchain_info"     ], lambda { |x| ToolchainInfo.showToolchain(x)          })
       add_option(["--toolchain-names",    "--toolchain_names"    ], lambda {     ToolchainInfo.showToolchainList         })
-      add_option(["--dot",                                       ], lambda { |x| @dot = x; @dotAndCompile = false        })
-      add_option(["--dotc",                                      ], lambda { |x| @dot = x; @dotAndCompile = true         })
+      add_option(["--dot",                                       ], lambda { |x,dummy| @dot = true; @dotFilename = x; @dotAndCompile = false        })
+      add_option(["--dotc",                                      ], lambda { |x,dummy| @dot = true; @dotFilename = x; @dotAndCompile = true         })
+      add_option(["--dot-project-level",                         ], lambda { @dot = true; @dotShowProjOnly = true        })
       add_option(["--do",                 "--include_filter"     ], lambda { |x| set_filter(x)                           })
       add_option(["--omit",               "--exclude_filter"     ], lambda { |x| @exclude_filter << x                    })
       add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @consoleOutput_fullnames = true         })

data/lib/bake/options/usage.rb

@@ -39,8 +39,10 @@ module Bake
       puts " --socket <num>           Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."
       puts " --toolchain-info <name>  Prints default values of a toolchain."
       puts " --toolchain-names        Prints available toolchains."
-      puts " --dot <filename>         Creates a .dot file of the config dependencies, compilation does not take place."
-      puts " --dotc <filename>        Same as --dot, but with compilation."
+      puts " --dot [<filename>]       Creates a .dot file of the config dependencies, compilation does not take place."
+      puts "                          If filename is omitted, a file <main config name>.dot in main project dir is created."
+      puts " --dotc [<filename>]      Same as --dot, but with compilation."
+      puts " --dot-project-level      Dependencies for dot on project level, not on config level."
       puts " --do <name>[=<arg>]      Includes elements with this filter name (can be used multiple times)."
       puts "                          Optional arguments which can be accessed in Project.meta via $(FilterArguments, <name>)."
       puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' includes all according steps."
@@ -72,6 +74,7 @@ module Bake
       puts " --dry                    No changes to the file system, no external processes like the compiler are called."
       puts "                          Exceptions: some special command line options like --create or --dot and 'cmd's of 'Set's."
       puts " --install-doc            If installed, --doc opens the offline docu, otherwise it's online. You may need super user rights to enhance the bake-toolkit installation."
+      puts " -Z <dev feature>         Used internally for development purposes. Can be changed without prior notice."
       puts " -h, --help               Print this help."
       puts " --license                Print the license."
       puts " --debug                  Print out backtraces in some cases - used only for debugging bake."

data/lib/bake/util.rb

@@ -31,7 +31,7 @@ def adjustFlags(orgStr, flags)
 
     if f.add != ""
       Bake::Utils::flagSplit(f.add, false).each do |a|
-        orgSplitted << a unless orgSplitted.any? { |o| o==a }
+        orgSplitted << a # allow duplicate flags # unless orgSplitted.any? { |o| o==a }
       end
     end
 

data/lib/blocks/compile.rb

@@ -549,6 +549,13 @@ module Bake
           pr = pr[2..-1] if pr.start_with?"./"
 
           res = Dir.glob_dir(pr, @projectDir).sort
+          regExSearch = pr.gsub("*",".*").gsub("?",".")
+          if !res.all?{|r| r.match(/#{regExSearch}/)}
+            if res.all?{|r| r.match(/#{regExSearch}/i)}
+              Bake.formatter.printError("Case sensitivity error for source file '#{pr}'", sources)
+              raise SystemCommandFailed.new
+            end
+          end
           if res.length == 0 and cleaning == false
             if not pr.include?"*" and not pr.include?"?"
               Bake.formatter.printError("Source file '#{pr}' not found", sources)

data/lib/blocks/executable.rb

@@ -24,7 +24,15 @@ module Bake
         if not @config.artifactName.nil? and @config.artifactName.name != ""
           baseFilename = @config.artifactName.name
         else
-          baseFilename = "#{@projectName}#{Bake::Toolchain.outputEnding(@block.tcs)}"
+          if !@config.artifactExtension.nil? && @config.artifactExtension.name != "default"
+            extension = ".#{@config.artifactExtension.name}"
+          else
+            extension = Bake::Toolchain.outputEnding(@block.tcs)
+          end
+          baseFilename = "#{@projectName}#{extension}"
+        end
+        if !baseFilename.include?(".")
+          baseFilename += Bake::Toolchain.outputEnding(@block.tcs)
         end
         @exe_name ||= File.join([@block.output_dir, baseFilename])
       end

data/lib/blocks/has_execute_command.rb

@@ -1,36 +1,36 @@
-module Bake
-
-  module Blocks
-
-    module HasExecuteCommand
-      attr_reader :config
-
-      def executeCommand(commandLine, ignoreStr=nil, exitCodeArray = [0], echo = "on")
-        if Bake.options.dry
-          puts commandLine
-          return true
-        end
-
-        puts commandLine if (Bake.options.verbose >= 1 && echo != "off") || Bake.options.verbose >= 3
-        puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
-        cmd_result = false
-        output = ""
-        begin
-          cmd_result, output = ProcessHelper.run([commandLine], true, true, nil, exitCodeArray, @projectDir)
-        rescue Exception=>e
-          puts e.message
-          puts e.backtrace if Bake.options.debug
-        end
-
-        if (cmd_result == false and (not ignoreStr or not output.include?ignoreStr))
-          Bake.formatter.printError("Command \"#{commandLine}\" failed", @config)
-          puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
-          raise SystemCommandFailed.new
-        end
-        return cmd_result
-      end
-
-    end
-
-  end
+module Bake
+
+  module Blocks
+
+    module HasExecuteCommand
+      attr_reader :config
+
+      def executeCommand(commandLine, ignoreStr=nil, exitCodeArray = [0], echo = "on")
+        if Bake.options.dry
+          puts commandLine
+          return true
+        end
+
+        puts commandLine if (Bake.options.verbose >= 1 && echo != "off") || Bake.options.verbose >= 3
+        puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
+        cmd_result = false
+        output = ""
+        begin
+          cmd_result, output = ProcessHelper.run([commandLine], true, true, nil, exitCodeArray, @projectDir)
+        rescue Exception=>e
+          puts e.message
+          puts e.backtrace if Bake.options.debug
+        end
+
+        if (cmd_result == false and (not ignoreStr or not output.include?ignoreStr))
+          Bake.formatter.printError("Command \"#{commandLine}\" failed", @config)
+          puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
+          raise SystemCommandFailed.new
+        end
+        return cmd_result
+      end
+
+    end
+
+  end
 end

data/lib/blocks/library.rb

@@ -21,7 +21,12 @@ module Bake
         if not @config.artifactName.nil? and @config.artifactName.name != ""
           baseFilename = @config.artifactName.name
         else
-          baseFilename = "lib#{@projectName}.a"
+          if !@config.artifactExtension.nil? && @config.artifactExtension.name != "default"
+            extension = ".#{@config.artifactExtension.name}"
+          else
+            extension =".a"
+          end
+          baseFilename = "lib#{@projectName}#{extension}"
         end
         @archive_name ||= File.join([@block.output_dir, baseFilename])
       end

data/lib/common/options/parser.rb

@@ -39,11 +39,11 @@ module Bake
       return [block, arg]
     end
 
-    def has_parameter?(argument)
+    def num_parameter?(argument)
       b, inPlaceArg = get_block(argument)
-      return false unless b
-      return false if inPlaceArg
-      b.parameters.length >= 1
+      return 0 unless b
+      return 0 if inPlaceArg
+      return b.parameters.length
     end
 
     def parse_internal(ignore_invalid, subOptions = nil)
@@ -55,11 +55,14 @@ module Bake
 
             # used in bake config, must be passed from bakery to bake
             if subOptions and subOptions.valid?arg
-              if subOptions.has_parameter?(arg)
+              num = subOptions.num_parameter?(arg)
+              if num > 0
                 if pos+1 < @argv.length and @argv[pos+1][0] != "-"
                   pos = pos + 1
                 else
-                  raise "Argument for option #{arg} missing"
+                  if num != 2 # default 
+                    raise "Argument for option #{arg} missing"
+                  end
                 end
               end
             end

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -358,16 +358,13 @@ module Bake
     end
 
     def makeDot
-        File.open(Bake.options.dot, 'w') do |file|
-          puts "Creating #{Bake.options.dot}"
-
-          file.write "# Generated by bake\n"
-          file.write "# Example to show the graph: dot #{Bake.options.dot} -Tpng -o out.png\n"
-          file.write "# Example to reduce the graph: tred #{Bake.options.dot} | dot -Tpng -o out.png\n\n"
-
-          file.write "digraph \"#{Bake.options.main_project_name}_#{Bake.options.build_config}\" {\n\n"
-
-          file.write "  concentrate = true\n\n"
+        if Bake.options.dotFilename
+          filename = Bake.options.dotFilename
+        else
+          filename = Bake.options.main_dir + "/" + Bake.options.build_config + ".dot"
+        end
+        File.open(filename, 'w') do |file|
+          puts "Creating #{filename}"
 
           onlyProjectName = nil
           onlyConfigName = nil
@@ -377,6 +374,25 @@ module Bake
             onlyConfigName = splitted[1] if splitted.length == 2
           end
 
+          file.write "# Generated by bake\n"
+          file.write "# Example to show the graph: dot #{File.basename(filename)} -Tpng -o out.png\n"
+          file.write "# Example to reduce the graph: tred #{File.basename(filename)} | dot -Tpng -o out.png\n\n"
+
+          if onlyProjectName
+            starting = onlyProjectName
+            if onlyConfigName
+              ending = Bake.options.dotShowProjOnly ? "" : "_"+onlyConfigName
+            else
+              ending = ""
+            end
+          else
+            starting = Bake.options.main_project_name
+            ending = Bake.options.dotShowProjOnly ? "" : "_"+Bake.options.build_config
+          end
+          file.write "digraph \"#{starting}#{ending}\" {\n\n"
+
+          file.write "  concentrate = true\n\n"
+
           if onlyProjectName
             if not @referencedConfigs.include? onlyProjectName
               Bake.formatter.printError("Error: project #{onlyProjectName} not found")
@@ -392,6 +408,7 @@ module Bake
 
           foundProjs = {}
           @referencedConfigs.each do |projName, configs|
+            depsToProj = []
             configs.each do |config|
               config.dependency.each do |d|
                 if onlyProjectName
@@ -402,26 +419,45 @@ module Bake
                     next if not leftSide and not rightSide
                   end
                 end
-                file.write "  \"#{config.qname}\" -> \"#{d.name},#{d.config}\"\n"
+                if Bake.options.dotShowProjOnly
+                  next if depsToProj.include?d.name
+                  next if d.name == projName
+                  c1 = ""
+                  c2 = ""
+                else
+                  c1 = ",#{config.name}"
+                  c2 = ",#{d.config}"
+                end
+                file.write "  \"#{Blocks::ALL_BLOCKS[config.qname].projectDir}#{c1}\" -> "+
+                  "\"#{Blocks::ALL_BLOCKS[d.name+','+d.config].projectDir}#{c2}\"\n"
+                depsToProj << d.name
 
                 foundProjs[config.parent.name] = []           if not foundProjs.include? config.parent.name
                 foundProjs[config.parent.name] << config.name if not foundProjs[config.parent.name].include? config.name
                 foundProjs[d.name] = []        if not foundProjs.include? d.name
-                foundProjs[d.name] << d.config if not foundProjs[config.parent.name].include? d.config
+                foundProjs[d.name] << d.config if not foundProjs[d.name].include? d.config
               end
             end
           end
           file.write "\n"
 
-          @referencedConfigs.each do |projName, configs|
-            next if Bake.options.project and not foundProjs.include?projName
-            file.write "  subgraph \"cluster_#{projName}\" {\n"
-            file.write "    label =\"#{projName}\"\n"
-            configs.each do |config|
-              next if Bake.options.project and not foundProjs[projName].include? config.name
-              file.write "    \"#{projName},#{config.name}\" [label = \"#{config.name}\", style =  filled, fillcolor = #{config.color}]\n"
+          if Bake.options.dotShowProjOnly
+            @referencedConfigs.each do |projName, configs|
+              next if Bake.options.project and not foundProjs.include?projName
+              file.write "  \"#{Blocks::ALL_BLOCKS[configs[0].qname].projectDir}\" [label = \"#{projName}\"]\n"
+            end
+          else
+            @referencedConfigs.each do |projName, configs|
+              next if Bake.options.project and not foundProjs.include?projName
+              dirName = Blocks::ALL_BLOCKS[configs[0].qname].projectDir
+              file.write "  subgraph \"cluster_#{dirName}\" {\n"
+              file.write "    label =\"#{projName}\"\n"
+              configs.each do |config|
+                next if Bake.options.project and not foundProjs[projName].include? config.name
+                file.write "    \"#{dirName},#{config.name}\" [label = \"#{config.name}\", style =  filled, fillcolor = #{config.color}]\n"
+              end
+              file.write "  }\n\n"
             end
-            file.write "  }\n\n"
           end
 
           file.write "}\n"
@@ -661,12 +697,39 @@ module Bake
           makeIncs
           puts "Profiling #{Time.now - $timeStart}: make uniq..." if Bake.options.profiling
           makeUniq
+          puts "Profiling #{Time.now - $timeStart}: convert to building blocks..." if Bake.options.profiling
+          convert2bb
           if Bake.options.dot
             puts "Profiling #{Time.now - $timeStart}: make dot..." if Bake.options.profiling
             makeDot
           end
-          puts "Profiling #{Time.now - $timeStart}: convert to building blocks..." if Bake.options.profiling
-          convert2bb
+
+          
+          metadata_json = Bake.options.dev_features.first { |x| x.start_with?("metadata=") }
+          if metadata_json
+            metadata_file = metadata_json[9..-1]
+            mainBlock = Blocks::ALL_BLOCKS[@mainConfig.parent.name + "," + @mainConfig.name]
+            if Metamodel::ExecutableConfig === mainBlock.config || Metamodel::LibraryConfig === mainBlock.config
+              File.open(metadata_file, "w") do |f|
+                f.puts "{"
+                f.puts "  \"module_path\":  \"#{mainBlock.projectDir}\","
+                f.puts "  \"config_name\":  \"#{@mainConfig.name}\","
+                Dir.chdir(mainBlock.projectDir) do
+                  f.puts "  \"artifact\":     \"#{File.expand_path(mainBlock.mainSteps.last.calcArtifactName)}\","
+                end
+                f.puts "  \"compiler_c\":   \"#{@defaultToolchain[:COMPILER][:C][:COMMAND]}\","
+                f.puts "  \"compiler_cxx\": \"#{@defaultToolchain[:COMPILER][:CPP][:COMMAND]}\","
+                f.puts "  \"flags_c\":      \"#{@defaultToolchain[:COMPILER][:C][:FLAGS]}\","
+                f.puts "  \"flags_cxx\":    \"#{@defaultToolchain[:COMPILER][:CPP][:FLAGS]}\""
+                f.puts "}"
+              end
+              puts "File #{metadata_file} written."
+              ExitHelper.exit(0)
+            else
+              Bake.formatter.printError("Error: dev-feature metadata is only for LibraryConfig for ExecutableConfig.")
+              ExitHelper.exit(1)
+            end
+          end
 
         ensure
           if Bake.options.show_includes || Bake.options.show_includes_and_defines

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.53.0
+  version: 2.54.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext