bake-toolkit 2.31.7 → 2.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d3b39f49f8131ccf46ff3d5e6a9415ef68446d
-  data.tar.gz: 0d7be58ecb2d6852d4bb0818ad35065a656af6db
+  metadata.gz: 6cea1feff9772952716a20f61fe4bad3a94c4bb2
+  data.tar.gz: 58225bbd87e4288b92a801bff0888caab841c9dc
 SHA512:
-  metadata.gz: 2f2879786b3ea60fd4941dc146c239beb085664018ba58cbcb12f5a4c4d27415890008175b4a38c0534e6cb8808742c8ee3eab8b506bf98d8ea59a25b3d44482
-  data.tar.gz: dbfdc935821bc679b102388632c41f69fa2e2d07ec8cd32b11c8d0ba9b923ce42ca268a1a79f265dd1e2d47e661fef941319889a74c48f43321473f429bfe668
+  metadata.gz: f80bf3ca98efcd734e9786a8a0cf4f15361837572900afddd0c1bdb2d76e971cde688e92ceb39089f81c3e53f965467519007a42b425acbc5f9dda8fa567a27d
+  data.tar.gz: bfefc83c40ce2fef0571f5a5bb1508e8fe9aca1757f3eaa1317ae42c8eaff3e7c4dfe9aedd207d3e1db5369ad523bca599db061499594371d03cf1063f9ae2f9

data/lib/bake/options/create.rb

@@ -1,96 +1,108 @@
-require 'fileutils'
-
-module Bake
-
-  class Create
-
-    def self.exeTemplate
-      "Project default: main {\n"+
-      "\n"+
-      "  Responsible {\n"+
-      "    Person \"#{ENV["USER"]}\"\n"+
-      "  }\n"+
-      "\n"+
-      "  ExecutableConfig main {\n"+
-      "    # Dependency ...\n"+
-      "    Files \"src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "    DefaultToolchain GCC\n"+
-      "  }\n"+
-      "}\n"
-    end
-
-    def self.libTemplate
-      "Project default: lib {\n"+
-      "\n"+
-      "  Responsible {\n"+
-      "    Person \"#{ENV["USER"]}\"\n"+
-      "  }\n"+
-      "\n"+
-      "  LibraryConfig lib {\n"+
-      "    Files \"src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "  }\n"+
-      "\n"+
-      "  ExecutableConfig UnitTest {\n"+
-      "    Dependency config: lib\n"+
-      "    Files \"test/src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "    DefaultToolchain GCC\n"+
-      "  }\n"+
-      "}\n"
-    end
-
-    def self.customTemplate
-      "Project default: lib {\n"+
-      "\n"+
-      "  Responsible {\n"+
-      "    Person \"#{ENV["USER"]}\"\n"+
-      "  }\n"+
-      "\n"+
-      "  CustomConfig lib {\n"+
-      "    Files \"src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "  }\n"+
-      "}\n"
-    end
-
-    def self.mainTemplate
-      "int main()\n"+
-      "{\n"+
-      "  return 0;\n"+
-      "}\n"
-    end
-
-    def self.checkFile(name)
-      if File.exists?(name)
-        puts "#{name} already exists"
-        ExitHelper.exit(1)
-      end
-    end
-
-    def self.proj(type)
-      checkFile("Project.meta")
-      checkFile("src/main.cpp") if (type == "exe")
-      FileUtils::mkdir_p "src"
-      FileUtils::mkdir_p "include"
-
-      if (type == "lib")
-        File.write("Project.meta", libTemplate);
-      elsif (type == "exe")
-        File.write("Project.meta", exeTemplate);
-        File.write("src/main.cpp", mainTemplate);
-      elsif (type == "custom")
-        File.write("Project.meta", customTemplate);
-      else
-        puts "'--create' must be followed by 'lib', 'exe' or 'custom'"
-        ExitHelper.exit(1)
-      end
-
-      puts "Project created."
-      ExitHelper.exit(1)
-    end
-
-  end
-
-end
+require 'fileutils'
+require 'common/version'
+
+module Bake
+
+  class Create
+
+    def self.header
+      "\n"+
+      "  RequiredBakeVersion minimum: \"#{Bake::Version.number}\"\n"+
+      "\n"+
+      "  Responsible {\n"+
+      "    Person \"#{ENV["USER"]}\"\n"+
+      "  }\n"
+    end
+
+    def self.includeOnly
+      "\n"+
+      "  CustomConfig IncludeOnly {\n"+
+      "    IncludeDir include, inherit: true\n"+
+      "  }\n"
+    end
+
+    def self.unitTestBase
+      "\n"+
+      "  ExecutableConfig UnitTestBase {\n"+
+      "    Files \"test/src/**/*.cpp\"\n"+
+      "    Dependency config: Lib\n"+
+      "    DefaultToolchain GCC\n"+
+      "  }\n"
+    end
+
+    def self.exeTemplate
+      "Project default: Main {\n"+
+      self.header +
+      self.includeOnly+
+      "\n"+
+      "  ExecutableConfig Main {\n"+
+      "    Files \"src/**/*.cpp\"\n"+
+      "    Dependency config: IncludeOnly\n"+
+      "    DefaultToolchain GCC\n"+
+      "  }\n"+
+      "\n}\n"
+    end
+
+    def self.libTemplate
+      "Project default: Lib {\n"+
+      self.header +
+      self.includeOnly+
+      "\n"+
+      "  LibraryConfig Lib {\n"+
+      "    Files \"src/**/*.cpp\"\n"+
+      "    Dependency config: IncludeOnly\n"+
+      "  }\n"+
+      self.unitTestBase +
+      "\n}\n"
+    end
+
+    def self.customTemplate
+      "Project default: Lib {\n"+
+      self.header+
+      "\n"+
+      "  CustomConfig Lib {\n"+
+      "    Dependency config: IncludeOnly\n"+
+      "  }\n"+
+      self.unitTestBase +
+      "\n}\n"
+    end
+
+    def self.mainTemplate
+      "int main()\n"+
+      "{\n"+
+      "  return 0;\n"+
+      "}\n"
+    end
+
+    def self.checkFile(name)
+      if File.exists?(name)
+        puts "#{name} already exists"
+        ExitHelper.exit(1)
+      end
+    end
+
+    def self.proj(type)
+      checkFile("Project.meta")
+      checkFile("src/main.cpp") if (type == "exe")
+      FileUtils::mkdir_p "src"
+      FileUtils::mkdir_p "include"
+
+      if (type == "lib")
+        File.write("Project.meta", libTemplate);
+      elsif (type == "exe")
+        File.write("Project.meta", exeTemplate);
+        File.write("src/main.cpp", mainTemplate);
+      elsif (type == "custom")
+        File.write("Project.meta", customTemplate);
+      else
+        puts "'--create' must be followed by 'lib', 'exe' or 'custom'"
+        ExitHelper.exit(1)
+      end
+
+      puts "Project created."
+      ExitHelper.exit(0)
+    end
+
+  end
+
+end

data/lib/blocks/block.rb

@@ -1,4 +1,5 @@
 require 'bake/libElement'
+require 'bake/model/metamodel'
 require 'common/abortException'
 
 module Bake
@@ -86,77 +87,112 @@ module Bake
       end
 
       def convPath(dir, elem=nil, warnIfLocal=false)
-         if dir.respond_to?("name")
-           d = dir.name
-           elem = dir
-         else
-           d = dir
-         end
-
-         return d if Bake.options.no_autodir
-
-         inc = d.split("/")
-         if (inc[0] == "..") # very simple check, but should be okay for 99.9 % of the cases
-           if elem and Bake.options.verbose >= 2
-             Bake.formatter.printInfo("path starts with \"..\"", elem)
-           end
-         end
-
-         res = []
-
-         return d if (inc[0] == "." || inc[0] == "..") # prio 0: force local
-
-         if (inc[0] == @projectName) # prio 1: the real path magic
-           resPathMagic = inc[1..-1].join("/") # within self
-           resPathMagic = "." if resPathMagic == ""
-           res << resPathMagic
-         elsif @referencedConfigs.include?(inc[0])
-           dirOther = @referencedConfigs[inc[0]].first.parent.get_project_dir
-           resPathMagic = File.rel_from_to_project(@projectDir, dirOther, false)
-           postfix = inc[1..-1].join("/")
-           resPathMagic = resPathMagic + "/" + postfix if postfix != ""
-           resPathMagic = "." if resPathMagic == ""
-           res << resPathMagic
-         end
-
-         if File.exists?(@projectDir + "/" + d) # prio 2: local, e.g. "include"
-           res << d
-         end
-
-         # prioo 3: check if dir exists without Project.meta entry
-         Bake.options.roots.each do |r|
-           absIncDir = r+"/"+d
-           if File.exists?(absIncDir)
-             res << File.rel_from_to_project(@projectDir,absIncDir,false)
-           end
-         end
-
-         return d if res.empty? # prio 4: fallback, no path found
-
-         res = res.map{ |r| Pathname.new(r).cleanpath.to_s }.uniq
-
-         if warnIfLocal && res.length > 1
-           if elem and Bake.options.verbose >= 2
-             Bake.formatter.printInfo("#{d} matches several paths:", elem)
-             puts "  #{res[0]} (chosen)"
-             res[1..-1].each { |r| puts "  #{r}" }
-           end
-         end
-
-         res[0]
-       end
+        if dir.respond_to?("name")
+          d = dir.name
+          elem = dir
+        else
+          d = dir
+        end
 
+        return d if Bake.options.no_autodir
 
-      def self.block_counter
+        inc = d.split("/")
+        if (inc[0] == "..") # very simple check, but should be okay for 99.9 % of the cases
+          if elem and Bake.options.verbose >= 2
+            Bake.formatter.printInfo("path starts with \"..\"", elem)
+          end
+        end
+
+        res = []
+
+        return d if (inc[0] == "." || inc[0] == "..") # prio 0: force local
+
+        if (inc[0] == @projectName) # prio 1: the real path magic
+          resPathMagic = inc[1..-1].join("/") # within self
+          resPathMagic = "." if resPathMagic == ""
+          res << resPathMagic
+        elsif @referencedConfigs.include?(inc[0])
+          dirOther = @referencedConfigs[inc[0]].first.parent.get_project_dir
+          resPathMagic = File.rel_from_to_project(@projectDir, dirOther, false)
+          postfix = inc[1..-1].join("/")
+          resPathMagic = resPathMagic + "/" + postfix if postfix != ""
+          resPathMagic = "." if resPathMagic == ""
+          res << resPathMagic
+        end
+
+        if File.exists?(@projectDir + "/" + d) # prio 2: local, e.g. "include"
+          res << d
+        end
+
+        # prioo 3: check if dir exists without Project.meta entry
+        Bake.options.roots.each do |r|
+          absIncDir = r+"/"+d
+          if File.exists?(absIncDir)
+            res << File.rel_from_to_project(@projectDir,absIncDir,false)
+          end
+        end
+
+        return d if res.empty? # prio 4: fallback, no path found
+
+        res = res.map{ |r| Pathname.new(r).cleanpath.to_s }.uniq
+
+        if warnIfLocal && res.length > 1
+          if elem and Bake.options.verbose >= 2
+            Bake.formatter.printInfo("#{d} matches several paths:", elem)
+            puts "  #{res[0]} (chosen)"
+            res[1..-1].each { |r| puts "  #{r}" }
+          end
+        end
+
+        res[0]
+      end
+
+      def self.inc_block_counter()
         @@block_counter += 1
       end
 
+      def self.block_counter
+        @@block_counter
+      end
+
       def self.reset_block_counter
         @@block_counter = 0
       end
 
-      def self.set_num_projects(num)
-        @@num_projects = num
+      def calcIsBuildBlock
+        @startupSteps ||= []
+
+        return true if Metamodel::ExecutableConfig === @config
+        if Metamodel::CustomConfig === @config
+          return true if @config.step
+        else
+          return true if @config.files.length > 0
+          if ((@config.startupSteps && @config.startupSteps.step.length > 0) ||
+          (@config.preSteps && @config.preSteps.step.length > 0) ||
+          (@config.postSteps && @config.postSteps.step.length > 0) ||
+          (@config.exitSteps && @config.exitSteps.step.length > 0) ||
+          (@config.cleanSteps && @config.cleanSteps.step.length > 0) ||
+          (@config.preSteps && @config.preSteps.step.length > 0))
+            return true
+          end
+        end
+        return false
+      end
+
+      def isBuildBlock?
+        @isBuildBlock ||= calcIsBuildBlock
+      end
+
+      def self.set_num_projects(blocks)
+        if Bake.options.verbose >= 2
+          @@num_projects = blocks.length
+        else
+          counter = 0
+          blocks.each do |b|
+            counter += 1 if b.isBuildBlock? || b.prebuild
+          end
+          @@num_projects = counter
+        end
       end
 
       def executeStep(step, method)
@@ -255,8 +291,14 @@ module Bake
 
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
 
-        if Bake.options.verbose >= 1
-          typeStr = @prebuild ? "Using" : "Building"
+        if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
+          typeStr = "Building"
+          if @prebuild
+            typeStr = "Using"
+          elsif not isBuildBlock?
+            typeStr = "Applying"
+          end
+          Block.inc_block_counter()
           Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
         puts "Project path: #{@projectDir}" if Bake.options.projectPaths
@@ -272,8 +314,14 @@ module Bake
         depResult = callDeps(:clean)
         return false if not depResult and Bake.options.stopOnFirstError
 
-        if Bake.options.verbose >= 2 or cleanSteps.length > 0
-          typeStr = @prebuild ? "Checking" : "Cleaning"
+        if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
+          typeStr = "Cleaning"
+          if @prebuild
+            typeStr = "Checking"
+          elsif not isBuildBlock?
+            typeStr = "Skipping"
+          end
+          Block.inc_block_counter()
           Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
 

data/lib/blocks/compile.rb

@@ -453,7 +453,7 @@ module Bake
             @source_files.keep_if do |source|
               source.include?Bake.options.filename
             end
-            if @source_files.length == 0 and cleaning == false
+            if @source_files.length == 0 and cleaning == false and @config.files.length > 0
               Bake.formatter.printInfo("#{Bake.options.filename} does not match to any source", @config)
             end
           end

data/lib/blocks/executable.rb

@@ -91,8 +91,9 @@ module Bake
           end
           duplicateSources = allSources.group_by{ |e| e }.select { |k, v| v.size > 1 }.map(&:first)
           duplicateSources.each do |d|
-            Bake.formatter.printWarning("Source compiled more than once: #{d}")
+            Bake.formatter.printError("Source compiled more than once: #{d}")
           end
+          ExitHelper.exit(1) if duplicateSources.length > 0
 
           libs, linker_libs_array = LibElements.calc_linker_lib_string(@block, @block.tcs)
 

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -374,7 +374,7 @@ module Bake
           ExitHelper.exit(1)
         end
         startBlocks = [Blocks::ALL_BLOCKS[startProjectName+","+startConfigName]]
-        Blocks::Block.set_num_projects(1)
+        Blocks::Block.set_num_projects(startBlocks)
       elsif startProjectName
         startBlocks = []
         Blocks::ALL_BLOCKS.each do |blockName, block|
@@ -387,10 +387,10 @@ module Bake
           ExitHelper.exit(1)
         end
         startBlocks.reverse! # most probably the order of dependencies if any
-        Blocks::Block.set_num_projects(startBlocks.length)
+        Blocks::Block.set_num_projects(startBlocks)
       else
         startBlocks = [Blocks::ALL_BLOCKS[Bake.options.main_project_name+","+Bake.options.build_config]]
-        Blocks::Block.set_num_projects(Blocks::ALL_BLOCKS.length)
+        Blocks::Block.set_num_projects(Blocks::ALL_BLOCKS.values)
       end
      return startBlocks
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.31.7
+  version: 2.32.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext