bake-toolkit 2.70.1 → 2.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 416c14f84643a59f67c1c7d3ba19032a847d56bbef738c8e3563a9919ba255db
-  data.tar.gz: 59250025415e8353a51a7e753d5af219491a05f2bd959cf520b682c963758ef2
+  metadata.gz: 97f124f36bbd221636166d8e01a9854b4c680f235643dab7154d3d6e50df0c4c
+  data.tar.gz: 664f60e7f0fec1089b08f55a7662c1d3f5c3e6ad81c7f5332b206e10ca28fc47
 SHA512:
-  metadata.gz: 815be1963aef84b578e080d47dd0454170f93b0ba8b0b455c7478fb8a6d04be5fc08bba9b8c649666f237774ac280803a76d7b53d537eaa904126c162247b6f4
-  data.tar.gz: 8efb1f2f9594f3affcf970c06829e9791b16cbe54dc554dbc566f21066a2d0bb3cd7934fc88ae03c821c8d0a4d7f0b1d7c04b1f3f4a74fb1825f442a90720543
+  metadata.gz: 655d3a58f54e604245af4a38feb61e099ae8ea9af58ec135a181a312cca39ed1cb18461ca4733c8d2754090cf782e0e2ca918b490ddce55f071add4ce09d9824
+  data.tar.gz: 14034133ac3b08bcfc0c3b54483bf0f1cc98138a2a04e452d0860ca91fb9914f37115b822a068cdbc42caf8d584ca8c0e96268f82cf601992e6403a4209625fe

data/lib/bake/libElement.rb

@@ -56,7 +56,7 @@ module Bake
         cb = block.library.compileBlock
         if (block.prebuild and File.exist?adaptedPath) or
            (!cb.nil? and !(cb.calcSources(true, true) - cb.source_files_ignored_in_lib).empty?)
-          if Bake.options.consoleOutput_fullnames
+          if Bake.options.abs_path_in
             adaptedPath = File.expand_path(adaptedPath, @projectDir)
           end
           @@linker_libs_array << adaptedPath
@@ -70,7 +70,7 @@ module Bake
           cb.object_files_ignored_in_lib.each do |ldirect|
             adaptedPath, prefix = adaptPath(ldirect, block, prefix)
             if (!block.prebuild or File.exist?adaptedPath)
-              if Bake.options.consoleOutput_fullnames
+              if Bake.options.abs_path_in
                 adaptedPath = File.expand_path(adaptedPath, @projectDir)
               end
               @@linker_libs_array << adaptedPath

data/lib/bake/options/options.rb

@@ -22,7 +22,7 @@ module Bake
     attr_reader :vars, :include_filter_args # map
     attr_reader :verbose
     attr_reader :filelist # set
-    attr_reader :consoleOutput_fullnames
+    attr_reader :abs_path_in, :abs_path_out
     attr_reader :roots # Root array
     attr_reader :diabCaseCheck
     attr_reader :defines
@@ -50,7 +50,8 @@ module Bake
       @analyze = false
       @eclipseOrder = false
       @showConfigs = false
-      @consoleOutput_fullnames = false
+      @abs_path_in = false
+      @abs_path_out = false
       @prepro = false
       @stopOnFirstError = false
       @verbose = 1
@@ -141,7 +142,9 @@ module Bake
       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         })
+      add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @abs_path_in = @abs_path_out = true     })
+      add_option(["--abs-paths-in",       "--show_abs_paths"     ], lambda {     @abs_path_in = true                     })
+      add_option(["--abs-paths-out",      "--show_abs_paths"     ], lambda {     @abs_path_out = true                    })
       add_option(["--prebuild"                                   ], lambda {     @prebuild = true                        })
       add_option(["--Wparse"                                     ], lambda {     @wparse = true                          })
 

data/lib/bake/options/usage.rb

@@ -48,7 +48,10 @@ module Bake
       puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' includes all according steps."
       puts " --omit <name>            Excludes elements with this filter name (can be used multiple times)."
       puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' excludes all according steps."
-      puts " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
+      puts " --abs-paths              Relative filename paths are converted to absolute paths for compiler commands and output."
+      puts " --abs-paths-in           Relative filename paths are converted to absolute paths for compiler commands."
+      puts "                          Depending on the compiler this might have also effects on the raw output of the compiler."
+      puts " --abs-paths-out          Relative filename paths are converted to absolute paths for compiler output."
       puts " --Wparse                 The error parser result is also taken into account, not only the return value of compiler, archiver and linker."
       puts " --no-autodir             Disable auto completion of paths like in IncludeDir"
       puts " --set <key>=<value>      Sets a variable. Overwrites variables defined in Project.metas (can be used multiple times)."

data/lib/blocks/block.rb

@@ -601,7 +601,7 @@ module Bake
         if @tcs[:OUTPUT_DIR_POSTFIX] != nil
           @output_dir = @output_dir + @tcs[:OUTPUT_DIR_POSTFIX] 
         end
-        if Bake.options.consoleOutput_fullnames
+        if Bake.options.abs_path_in
           @output_dir = File.expand_path(@output_dir, @projectDir)
         end
       end

data/lib/blocks/blockBase.rb

@@ -136,7 +136,7 @@ module Bake
               end
 
               console_output = x[0]
-              console_output = console_output_full if Bake.options.consoleOutput_fullnames
+              console_output = console_output_full if Bake.options.abs_path_out
 
               ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
 

data/lib/blocks/compile.rb

@@ -254,7 +254,7 @@ module Bake
         if Bake.options.cc2j_filename
           cmdJson = cmd.is_a?(Array) ? cmd.join(' ') : cmd
           srcFilePath = source
-          if Bake.options.consoleOutput_fullnames
+          if Bake.options.abs_path_in
             srcFilePath = File.join(@projectDir, srcFilePath) if !File.is_absolute?(srcFilePath)
             cmdJson[source] = srcFilePath
           end
@@ -529,7 +529,7 @@ module Bake
           if not type.nil?
             object = get_object_file(source)
 
-            if Bake.options.consoleOutput_fullnames
+            if Bake.options.abs_path_in
               object = File.expand_path(object, @projectDir)
               source = File.expand_path(source, @projectDir)
             end
@@ -586,7 +586,7 @@ module Bake
           end
           res.each do |f|
             singleFile = res.length == 1 && res[0] == pr
-            fTcs = (Bake.options.consoleOutput_fullnames ? File.expand_path(f, @projectDir) : f)
+            fTcs = (Bake.options.abs_path_in ? File.expand_path(f, @projectDir) : f)
             if ((!@fileTcs.has_key?(fTcs)) || singleFile)
               @fileTcs[fTcs] = icf
             end
@@ -642,7 +642,7 @@ module Bake
         block.bes.each do |be|
           if Metamodel::IncludeDir === be
             if be.inherit == true || block == @block
-              if Bake.options.consoleOutput_fullnames
+              if Bake.options.abs_path_in
                 mappedInc = be.name
               else
                 mappedInc = File.rel_from_to_project(@projectDir,be.name,false)

data/lib/blocks/executable.rb

@@ -43,7 +43,7 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @exe_name ||= File.join([@block.output_dir, baseFilename])
-        if Bake.options.consoleOutput_fullnames
+        if Bake.options.abs_path_in
           @exe_name = File.expand_path(@exe_name, @projectDir)
         end
         return @exe_name

data/lib/blocks/library.rb

@@ -34,7 +34,7 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @archive_name ||= File.join([@block.output_dir, baseFilename])
-        if Bake.options.consoleOutput_fullnames
+        if Bake.options.abs_path_in
           @archive_name = File.expand_path(@archive_name, @projectDir)
         end
         return @archive_name

data/lib/blocks/showIncludes.rb

@@ -22,7 +22,7 @@ module Bake
           print projName
           incs = []
           blocks.each do |block|
-            if Bake.options.consoleOutput_fullnames
+            if Bake.options.abs_path_in
               incs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
             else
               incs += block.include_list
@@ -103,7 +103,7 @@ module Bake
             block.calcIncludes
             block.calcDefines
             block.calcFlags 
-            if Bake.options.consoleOutput_fullnames
+            if Bake.options.abs_path_in
               blockIncs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
             else
               blockIncs += block.include_list

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.70.1"
+      "2.71.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.70.1
+  version: 2.71.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext