bake-toolkit 2.60.0 → 2.60.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05f5baab5566671c4deff626aceaea52a9b0d4274c03f9737823b3809039bb2
-  data.tar.gz: d407fbc0d01b0fded6b7453ac41446494725cfc575bfd472a77c2d4096738a82
+  metadata.gz: 196c55cc08919bff9381fc2c148d1cd4ec295667eb6fa90f4af8ae3080c3b9cc
+  data.tar.gz: 271409c11aeb347eaf6a3d6110a9e3d4aca6ce9f45cc144324f7bbaf63e3162f
 SHA512:
-  metadata.gz: 7dc782d118b9fefd102ad6948dc4bfeb38ac7ac0cffcca4581719e994ad69927271523bd1a46472ed92573769754ca44af9c655c139e3ae4fa96a1887bd18862
-  data.tar.gz: e89c99ee42fd0602c6cdcc443ae3924b12af3a7e84ffe308486137ba1a77921bedd991d33a41fcf5e18681c932cda416a5388a9537a1bcae20785cbcc33351ff
+  metadata.gz: 3902c531628b8cdaf2ce297b9be23b5bd1daaa7009e451797f28df16ff074624ff9c78a2599ae66590ca5fcff7d992e06ffe3e52daa4e937650134c33c2fb3dc
+  data.tar.gz: efb3178b80e2c48a164f1b5d8f6d16661ccffb3a795bb451afe3c64956b5f08315a38798dc7267575cda11633779875ae8f353c741bcee73e0c3234341ba0dcf

data/lib/common/cleanup.rb

@@ -1,4 +1,5 @@
 require_relative "../blocks/block"
+require_relative "ext/file"
 
 module Bake
 
@@ -9,6 +10,7 @@ module Bake
       Bake::IDEInterface.instance.set_abort(false)
       Blocks::Block.reset_block_counter
       Blocks::Block.reset_delayed_result
+      File.cleanupWarnings
     end
 
 end

data/lib/common/ext/file.rb

@@ -1,96 +1,115 @@
-require_relative '../utils'
-
-class File
-
-  SLASH = '/'
-
-  def self.is_absolute?(filename)
-    filename[0] == SLASH or filename[1] == ':'
-  end
-
-  def self.normalize(filename)
-    if filename.length > 1
-      toIsWindowsAbs = filename[1] == ':'
-      return filename[0].downcase + filename[1..-1] if toIsWindowsAbs
-    end
-    return filename
-  end
-
-  # seems both are rel or both are abs in all cases
-  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
-    toIsWindowsAbs = false
-    if toSplitted[0].length > 1 and fromSplitted[0].length > 1
-      toIsWindowsAbs = toSplitted[0][1] == ':'
-      i = 1  if toIsWindowsAbs and fromSplitted[0][1] == ':' and toSplitted[0][0].downcase == fromSplitted[0][0].downcase
-    end
-
-    if (toIsWindowsAbs and i==0)
-      res = to
-      res += "/" if endWithSlash
-      return res
-    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
-
-  def self.which(cmd)
-    return "" if not cmd
-    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      exts.each { |ext|
-        exe = File.join(path, "#{cmd}#{ext}")
-        if File.executable?(exe) && !File.directory?(exe)
-          return File.dirname(exe.gsub(/[\\]/,'/'))
-        end
-      }
-    end
-    return ""
-  end
-
-end
+require_relative '../utils'
+
+class File
+
+  SLASH = '/'
+
+  @@warnedCase = []
+
+  def self.cleanupWarnings
+    @@warnedCase.clear
+  end
+
+  def self.is_absolute?(filename)
+    filename[0] == SLASH or filename[1] == ':'
+  end
+
+  def self.normalize(filename)
+    if filename.length > 1
+      toIsWindowsAbs = filename[1] == ':'
+      return filename[0].downcase + filename[1..-1] if toIsWindowsAbs
+    end
+    return filename
+  end
+
+  # seems both are rel or both are abs in all cases
+  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
+    toIsWindowsAbs = false
+    if toSplitted[0].length > 1 and fromSplitted[0].length > 1
+      toIsWindowsAbs = toSplitted[0][1] == ':'
+      i = 1  if toIsWindowsAbs and fromSplitted[0][1] == ':' and toSplitted[0][0].downcase == fromSplitted[0][0].downcase
+    end
+
+    if (toIsWindowsAbs and i==0)
+      res = to
+      res += "/" if endWithSlash
+      return res
+    end
+
+    while i < max
+      if toSplitted[i] != fromSplitted[i]
+        if Bake.options.verbose >= 1
+          if toSplitted[i].casecmp(fromSplitted[i]) == 0
+            if !@@warnedCase.include?(fromSplitted[0..i].join("/"))
+              fromsj = fromSplitted[0..i].join("/")
+              tosj = toSplitted[0..i].join("/")
+              @@warnedCase << fromsj
+              @@warnedCase << tosj
+              Bake.formatter.printWarning("Warning: different cases for folders \"#{fromsj}\" and \"#{tosj}\" detected.")
+            end
+          end
+        end
+        break
+      end
+      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
+
+  def self.which(cmd)
+    return "" if not cmd
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        if File.executable?(exe) && !File.directory?(exe)
+          return File.dirname(exe.gsub(/[\\]/,'/'))
+        end
+      }
+    end
+    return ""
+  end
+
+end

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -326,16 +326,11 @@ module Bake
 
           block.bes.each do |dep|
             next unless Metamodel::Dependency === dep
-            if dep.injected?
-              difr2 = difr.select{|d| Metamodel::IncludeDir === d }
-              diba2 = diba.select{|d| Metamodel::IncludeDir === d }
-            else
-              difr2 = difr
-              diba2 = diba
-            end
+            difr2 = difr.select{|d| Metamodel::IncludeDir === d || d != dep}
+            diba2 = diba.select{|d| Metamodel::IncludeDir === d || d != dep}
             fde = Blocks::ALL_BLOCKS[dep.name+","+dep.config]
             l1 = fde.bes.length 
-            fde.bes = (difr2 + fde.bes + diba2).uniq # .select{|d| !(Metamodel::Dependency===d) || d.name != dep.name || d.config != dep.config }
+            fde.bes = (difr2 + fde.bes + diba2).uniq
             fde.besDirect = (difr2 + fde.besDirect + diba2).uniq
             l2 = fde.bes.length
             counter += 1 if (l2 != l1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.60.0
+  version: 2.60.2
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext