bake-toolkit 2.45.0 → 2.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 400957c27fbeb739bd5336401fa1b035bccd52bd
-  data.tar.gz: c201d3549f44eebacb2cb4e2025e45195e5e58d1
+  metadata.gz: d21d45b4900652c338212ddd0f76da254c4a45e2
+  data.tar.gz: d0c410d6a94440f08108a997ed5bcad489b779e9
 SHA512:
-  metadata.gz: 6501c573bfc1abf80ac5fc735a6471f845c46e8ad43b55a7aae46c7a0d28b37256311e2c310b7ef84248e90e7b54c3ebe0bb681e8674a79b1efa9f8cb90d3301
-  data.tar.gz: 6c1e2c956d311b80e79c14321acd3a57f1449cd5c971989fb9e5e8fb12f732e077fa3a1cb30c15060879906d359cf3360a5c35c0609bdedab1878239f1e7a323
+  metadata.gz: e51a9b81676a11436b76a9264eb998405947632f3d6fbf4e4d196b7bf339d410fafe35f121ae25459c85333eab59ffaaada760114f7df78cb3bc39ce0eaba7a3
+  data.tar.gz: c4d113d43a34a6b9ab467fbef15af7996caca4d8efd30b3e6fd26932d0f30e5eda447de8af070d6e8f6bdec87b701376d329babb86e78349821dcc56737cd176

data/lib/bake/model/metamodel.rb

@@ -198,6 +198,8 @@ module Bake
         has_attr 'lib', String, :defaultValueLiteral => ""
         has_attr 'target', String, :defaultValueLiteral => ""
         has_attr 'pathTo', String, :defaultValueLiteral => ""
+        has_attr 'changeWorkingDir', Boolean, :defaultValueLiteral => "true"
+        has_attr 'noClean', Boolean, :defaultValueLiteral => "false"
         contains_many 'flags', Flags, 'parent'
       end
 

data/lib/blocks/makefile.rb

@@ -13,6 +13,7 @@ module Bake
 
       def initialize(config, referencedConfigs, block)
         @config = config
+        @tcs = block.tcs
         @projectDir = config.get_project_dir
         @path_to = ""
         @flags = adjustFlags("",config.flags) if config.flags
@@ -21,16 +22,42 @@ module Bake
         calcPathTo(referencedConfigs)
         calcCommandLine
         calcCleanLine
+        calcEnv
 
         block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
       end
 
+      def calcEnv
+        @envs = {}
+        [:CPP, :C, :ASM].each do |type|
+          compiler = @tcs[:COMPILER][type]
+          defs = compiler[:DEFINES].map {|k| "#{compiler[:DEFINE_FLAG]}#{k}"}.join(" ")
+          args = [defs, compiler[:FLAGS]].reject(&:empty?).join(" ")
+          @envs["BAKE_#{type.to_s}_FLAGS"] = args
+          @envs["BAKE_#{type.to_s}_COMMAND"] = compiler[:COMMAND]
+        end
+        @envs["BAKE_AR_FLAGS"] = @tcs[:ARCHIVER][:FLAGS]
+        @envs["BAKE_LD_FLAGS"] = @tcs[:LINKER][:FLAGS]
+        @envs["BAKE_AR_COMMAND"] = @tcs[:ARCHIVER][:COMMAND]
+        @envs["BAKE_LD_COMMAND"] = @tcs[:LINKER][:COMMAND]
+      end
+
+      def fileAndDir
+        if @config.changeWorkingDir
+          return remove_empty_strings_and_join([
+            MAKE_DIR_FLAG,  File.dirname(@makefile),
+            MAKE_FILE_FLAG, File.basename(@makefile)])
+        else
+          return remove_empty_strings_and_join([
+            MAKE_FILE_FLAG, @makefile])
+        end
+      end
+
       def calcCommandLine
         @commandLine = remove_empty_strings_and_join([
           MAKE_COMMAND, @target,
           @flags,
-          MAKE_DIR_FLAG,  File.dirname(@makefile),
-          MAKE_FILE_FLAG, File.basename(@makefile),
+          fileAndDir,
           @path_to])
       end
 
@@ -38,8 +65,7 @@ module Bake
         @cleanLine = remove_empty_strings_and_join([
           MAKE_COMMAND, MAKE_CLEAN,
           @flags,
-          MAKE_DIR_FLAG,  File.dirname(@makefile),
-          MAKE_FILE_FLAG, File.basename(@makefile),
+          fileAndDir,
           @path_to])
       end
 
@@ -76,6 +102,7 @@ module Bake
 
       def run
         return true if Bake.options.linkOnly
+        @envs.each { |k,v| ENV[k] = v }
         return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
       end
 
@@ -92,7 +119,8 @@ module Bake
       end
 
       def do_clean
-        return true if Bake.options.linkOnly
+        return true if Bake.options.linkOnly || @config.noClean
+        @envs.each { |k,v| ENV[k] = v }
         return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes, @config.echo) unless Bake.options.filename
       end
 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.45.0"
+      "2.46.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.45.0
+  version: 2.46.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext