bake-toolkit 2.37.12 → 2.37.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e368849338608317ef87e6ccda02e2e4e54581
-  data.tar.gz: bb7c2c9c6474f9483206de7fd5fcc5a404ada580
+  metadata.gz: 0b7fa8143ad49a8cb845af085d37e5fb14ccf3f7
+  data.tar.gz: dbf429238de867220b36b92cc41793e3c0996f6b
 SHA512:
-  metadata.gz: 412c9c50f8566011710827f4da28ae8b6121d3869e823929f26432c914e3c558ad3cf0dacd1918e96844d9ab7d0ff2df1ddb49bb99aa9d1aa1c36c2d2e8ed991
-  data.tar.gz: e0874a70114f208848626ef59ef978398c483fd448ad542c4ed06c40d31c887d4ef592b2ce67accff1bb4832532f0960787187c50bea813c87bdf525b2aaedb9
+  metadata.gz: 151206f287292a5c8504c084be6caece3a1461e3bf60b1d72e976077e973540a71499b8917241f874796ac0b64d8b14fd9572995900abbda5f98683ee030e048
+  data.tar.gz: 3537c16697819434b639ee6f91d2be6b822cde2ce2a422e88c58a0034571f6ed990f116a08bfc640443f97692f4d34552c8f713c292d4b485dfa60368cb49392

data/lib/bake/subst.rb

@@ -5,7 +5,7 @@ module Bake
   class Subst
 
     # this is done lazy because usually there is no need to calculate that
-    def self.lazyPathes
+    def self.lazyPaths
       return unless @@lazy
 
       cppCmd = @@toolchain[:COMPILER][:CPP][:COMMAND]
@@ -256,19 +256,19 @@ module Bake
         elsif var == "ArtifactNameBase"
           substStr << @@artifactName.chomp(File.extname(@@artifactName))
         elsif var == "CPPPath"
-          self.lazyPathes
+          self.lazyPaths
           substStr << @@cppExe
         elsif var == "CPath"
-          self.lazyPathes
+          self.lazyPaths
           substStr << @@cExe
         elsif var == "ASMPath"
-          self.lazyPathes
+          self.lazyPaths
           substStr << @@asmExe
         elsif var == "ArchiverPath"
-          self.lazyPathes
+          self.lazyPaths
           substStr << @@archiverExe
         elsif var == "LinkerPath"
-          self.lazyPathes
+          self.lazyPaths
           substStr << @@linkerExe
         elsif var == "Roots"
           substStr << "___ROOTS___"

data/lib/blocks/compile.rb

@@ -32,10 +32,17 @@ module Bake
       end
 
       def get_object_file(source)
-
         # until now all OBJECT_FILE_ENDING are equal in all three types
-        adaptedSource = source.chomp(File.extname(source)).gsub(/\.\./, "##") + (Bake.options.prepro ? ".i" : @block.tcs[:COMPILER][:CPP][:OBJECT_FILE_ENDING])
-        return adaptedSource if File.is_absolute?source
+
+        srcWithoutDotDot = source.chomp(File.extname(source)).gsub(/\.\./, "##")
+        if srcWithoutDotDot[0] == '/'
+          srcWithoutDotDot = "#" + srcWithoutDotDot
+        elsif srcWithoutDotDot[1] == ':'
+          srcWithoutDotDot = "#" + srcWithoutDotDot[0] + "#" + srcWithoutDotDot[2..-1]
+        end
+
+        adaptedSource = srcWithoutDotDot + (Bake.options.prepro ? ".i" : @block.tcs[:COMPILER][:CPP][:OBJECT_FILE_ENDING])
+
         File.join([@block.output_dir, adaptedSource])
       end
 

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.37.12
+  version: 2.37.13
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext