bake-toolkit 2.44.1 → 2.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63594dff72adc9e2399d3e5b3e61c10cfa428937
-  data.tar.gz: b5ac0b63c555016846e26bb62db52e609d70db63
+  metadata.gz: 400957c27fbeb739bd5336401fa1b035bccd52bd
+  data.tar.gz: c201d3549f44eebacb2cb4e2025e45195e5e58d1
 SHA512:
-  metadata.gz: 75df6bc8056a67e5250a0600149f9fcd356d86a51c20ecf0868f266062f918d0b8738d5703f8e4f506a6d4013174bc4fac0aaf7de53886200e863ccb01780646
-  data.tar.gz: d728f32ae07a50f727d93b8c9842c2d43c0bf2460d78908cc3abb370d69c8d25e687ab0ce1e0fb2f7a1b27aaa2c1cf76016dac171cfd98ccd41712e970e989d0
+  metadata.gz: 6501c573bfc1abf80ac5fc735a6471f845c46e8ad43b55a7aae46c7a0d28b37256311e2c310b7ef84248e90e7b54c3ebe0bb681e8674a79b1efa9f8cb90d3301
+  data.tar.gz: 6c1e2c956d311b80e79c14321acd3a57f1449cd5c971989fb9e5e8fb12f732e077fa3a1cb30c15060879906d359cf3360a5c35c0609bdedab1878239f1e7a323

data/bin/bakery

@@ -1,183 +1,183 @@
-#!/usr/bin/env ruby
-
-$timeStart = Time.now
-
-$:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'common/version'
-
-require 'common/utils'
-
-Bake::Version.printBakeryVersion
-
-STDOUT.sync = true
-STDERR.sync = true
-
-$stars = "************************************************"
-
-require 'bake/toolchain/colorizing_formatter'
-require 'bake/options/options'
-require 'tocxx'
-require "bakery/model/loader"
-require "bakery/options/options"
-require "bakery/toBake"
-require "bakery/buildPattern"
-require 'common/ext/stdout'
-require 'common/cleanup'
-
-module Bake
-
-  @options = BakeryOptions.new(ARGV)
-  bakeOptions = Options.new([])
-  @options.parse_options(bakeOptions)
-
-  env = nil
-  begin
-    loader = BakeryLoader.new
-    env = loader.load(@options.collection_dir+"/Collection.meta")
-  rescue SystemExit => e
-    raise e
-  rescue Exception => e
-    puts e
-    puts e.backtrace
-    ExitHelper.exit(1)
-  end
-
-
-  if @options.collection_name.empty?
-    puts "Please specify a collection name. Possible values are:"
-    env.find(:class => BakeryModel::Collection).each { |e|
-      puts "* " + e.name
-    }
-    ExitHelper.exit(0)
-  end
-
-
-  def self.getCollections(env, name)
-    cols = env.find(:class => BakeryModel::Collection, :name => name)
-    @toBuild |= getBuildPattern(cols, name)
-    @colsAll |= cols
-    cols[0].collections.each do |cRef|
-      alreadyProcessed = false
-      @colsAll.each do |ca|
-        alreadyProcessed = true if ca.name == cRef.name
-      end
-      getCollections(env, cRef.name) unless alreadyProcessed
-    end
-  end
-
-  @toBuild = []
-  @colsAll = []
-  getCollections(env, @options.collection_name)
-
-  maxRuns = @toBuild.length
-  currentRun = 0
-  failedRuns = []
-
-  passedParams = []
-  excludeParam = false
-  wasMinus = false
-  ARGV.each do |x|
-    if (x=="-b" or x=="-m" or x=="--socket")
-      excludeParam = true
-      next
-    end
-    if excludeParam
-      excludeParam = false
-      next
-    end
-    if x.length > 0
-      if x[0] == "-"
-        wasMinus = true
-      else
-        next if not wasMinus
-        wasMinus = false
-      end
-    end
-    passedParams << x
-  end
-
-  if @options.socket != 0
-    Bake::IDEInterface.instance.connect(@options.socket)
-  end
-
-  msg1 = "bakery "
-
-  exitValue = 0
-  abort = false
-  @toBuild.each do |bp|
-    currentRun += 1
-    p = File.dirname(bp.proj)
-    pRel = File.rel_from_to_project(Dir.pwd, p, false)
-    pRel = "." if pRel.empty?
-    cmd = (["-m", pRel, "-b", bp.conf] + passedParams)
-    cmdWithNum = "bakery #{currentRun} of #{maxRuns}: bake " + cmd.join(" ")
-    puts "\n#{$stars}"
-    Bake.formatter.printInfo(cmdWithNum)
-    puts $stars
-
-
-    runOk = false
-    begin
-      Bake.options = Options.new(cmd)
-      Bake.options.parse_options
-      tocxx = ToCxx.new
-      tocxx.doit()
-      runOk = (ExitHelper.exit_code == 0)
-      if Bake::IDEInterface.instance.get_abort
-        abort = true
-        msg1 << "aborted"
-        exitValue = 1
-        break
-      end
-    rescue SystemExit
-      runOk = (ExitHelper.exit_code == 0)
-    rescue Exception => e
-      puts e.message
-    end
-
-    Bake::cleanup
-    ExitHelper.reset_exit_code
-
-    if runOk == false && abort == false
-      exitValue = 1
-      failedRuns << "bake " + cmd.join(" ")
-      if @options.error
-        msg1 << "stopped on first error"
-        abort = true
-        break
-      end
-    end
-  end
-
-  print "\n"
-
-  if not abort
-    if failedRuns.length > 0
-      msg1 << "summary: #{failedRuns.length} of #{maxRuns} builds failed"
-    else
-      msg1 << "summary: #{maxRuns} of #{maxRuns} builds ok"
-    end
-
-    timeEnd = Time.now
-    timeDiff = timeEnd - $timeStart
-    failedRuns.each_with_index do |f,i|
-      msg1 << "\n#{i+1}: #{f}"
-    end
-    msg1 << "\ntime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60]
-  end
-
-  if failedRuns.length == 0
-    Bake.formatter.printSuccess($stars)
-    Bake.formatter.printSuccess(msg1)
-    Bake.formatter.printSuccess($stars)
-  else
-    Bake.formatter.printError($stars)
-    Bake.formatter.printError(msg1)
-    Bake.formatter.printError($stars)
-  end
-
-  Bake::IDEInterface.instance.disconnect()
-
-  ExitHelper.exit(exitValue)
-end
-
+#!/usr/bin/env ruby
+
+$timeStart = Time.now
+
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'common/version'
+
+require 'common/utils'
+
+Bake::Version.printBakeryVersion
+
+STDOUT.sync = true
+STDERR.sync = true
+
+$stars = "************************************************"
+
+require 'bake/toolchain/colorizing_formatter'
+require 'bake/options/options'
+require 'tocxx'
+require "bakery/model/loader"
+require "bakery/options/options"
+require "bakery/toBake"
+require "bakery/buildPattern"
+require 'common/ext/stdout'
+require 'common/cleanup'
+
+module Bake
+
+  @options = BakeryOptions.new(ARGV)
+  bakeOptions = Options.new([])
+  @options.parse_options(bakeOptions)
+
+  env = nil
+  begin
+    loader = BakeryLoader.new
+    env = loader.load(@options.collection_dir+"/Collection.meta")
+  rescue SystemExit => e
+    raise e
+  rescue Exception => e
+    puts e
+    puts e.backtrace
+    ExitHelper.exit(1)
+  end
+
+
+  if @options.collection_name.empty?
+    puts "Please specify a collection name. Possible values are:"
+    env.find(:class => BakeryModel::Collection).each { |e|
+      puts "* " + e.name
+    }
+    ExitHelper.exit(0)
+  end
+
+
+  def self.getCollections(env, name)
+    cols = env.find(:class => BakeryModel::Collection, :name => name)
+    @toBuild |= getBuildPattern(cols, name)
+    @colsAll |= cols
+    cols[0].collections.each do |cRef|
+      alreadyProcessed = false
+      @colsAll.each do |ca|
+        alreadyProcessed = true if ca.name == cRef.name
+      end
+      getCollections(env, cRef.name) unless alreadyProcessed
+    end
+  end
+
+  @toBuild = []
+  @colsAll = []
+  getCollections(env, @options.collection_name)
+
+  maxRuns = @toBuild.length
+  currentRun = 0
+  failedRuns = []
+
+  passedParams = []
+  excludeParam = false
+  wasMinus = false
+  ARGV.each do |x|
+    if (x=="-b" or x=="-m" or x=="--socket")
+      excludeParam = true
+      next
+    end
+    if excludeParam
+      excludeParam = false
+      next
+    end
+    if x.length > 0
+      if x[0] == "-"
+        wasMinus = true
+      else
+        next if not wasMinus
+        wasMinus = false
+      end
+    end
+    passedParams << x
+  end
+
+  if @options.socket != 0
+    Bake::IDEInterface.instance.connect(@options.socket)
+  end
+
+  msg1 = "bakery "
+
+  exitValue = 0
+  abort = false
+  @toBuild.each do |bp|
+    currentRun += 1
+    p = File.dirname(bp.proj)
+    pRel = File.rel_from_to_project(Dir.pwd, p, false)
+    pRel = "." if pRel.empty?
+    cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams)
+    cmdWithNum = "bakery #{currentRun} of #{maxRuns}: bake " + cmd.join(" ")
+    puts "\n#{$stars}"
+    Bake.formatter.printInfo(cmdWithNum)
+    puts $stars
+
+
+    runOk = false
+    begin
+      Bake.options = Options.new(cmd)
+      Bake.options.parse_options
+      tocxx = ToCxx.new
+      tocxx.doit()
+      runOk = (ExitHelper.exit_code == 0)
+      if Bake::IDEInterface.instance.get_abort
+        abort = true
+        msg1 << "aborted"
+        exitValue = 1
+        break
+      end
+    rescue SystemExit
+      runOk = (ExitHelper.exit_code == 0)
+    rescue Exception => e
+      puts e.message
+    end
+
+    Bake::cleanup
+    ExitHelper.reset_exit_code
+
+    if runOk == false && abort == false
+      exitValue = 1
+      failedRuns << "bake " + cmd.join(" ")
+      if @options.error
+        msg1 << "stopped on first error"
+        abort = true
+        break
+      end
+    end
+  end
+
+  print "\n"
+
+  if not abort
+    if failedRuns.length > 0
+      msg1 << "summary: #{failedRuns.length} of #{maxRuns} builds failed"
+    else
+      msg1 << "summary: #{maxRuns} of #{maxRuns} builds ok"
+    end
+
+    timeEnd = Time.now
+    timeDiff = timeEnd - $timeStart
+    failedRuns.each_with_index do |f,i|
+      msg1 << "\n#{i+1}: #{f}"
+    end
+    msg1 << "\ntime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60]
+  end
+
+  if failedRuns.length == 0
+    Bake.formatter.printSuccess($stars)
+    Bake.formatter.printSuccess(msg1)
+    Bake.formatter.printSuccess($stars)
+  else
+    Bake.formatter.printError($stars)
+    Bake.formatter.printError(msg1)
+    Bake.formatter.printError($stars)
+  end
+
+  Bake::IDEInterface.instance.disconnect()
+
+  ExitHelper.exit(exitValue)
+end
+

data/lib/adapt/config/loader.rb

@@ -71,6 +71,39 @@ module Bake
     def chooseProjectFilenames(potentialAdapts)
       @@filenames = []
       Bake.options.adapt.each do |a|
+        a.gsub!(/\\/,"/")
+        found = false
+
+        # from working dir
+        if File.exist?(a) && File.file?(a)
+          @@filenames << File.expand_path(a)
+          found = true
+        end
+        next if found
+
+        # from main dir
+        Dir.chdir Bake.options.main_dir do
+          if File.exist?(a) && File.file?(a)
+            @@filenames << (Bake.options.main_dir + "/" + a)
+            found = true
+          end
+        end
+        next if found
+
+        # from roots
+        Bake.options.roots.each do |root|
+          r = root.dir
+          Dir.chdir r do
+            if File.exist?(a) && File.file?(a)
+              @@filenames << (r + "/" + a)
+              found = true
+            end
+          end
+          break if found
+        end
+        next if found
+
+        # old style
         adapts = potentialAdapts.find_all { |p| p.include?("/"+a+"/Adapt.meta") or p == a+"/Adapt.meta" }
         if adapts.empty?
           Bake.formatter.printError("Adaption project #{a} not found")

data/lib/bake/subst.rb

@@ -102,9 +102,9 @@ module Bake
         else
           cmd_result = false
           consoleOutput = ""
+          cmd = [substString(s.cmd, s)]
           begin
             Dir.chdir(@@projDir) do
-              cmd = [substString(s.cmd, s)]
               cmd_result, consoleOutput = ProcessHelper.run(cmd)
               @@userVarMap[s.name] = consoleOutput.chomp
               if s.env
@@ -116,12 +116,8 @@ module Bake
             consoleOutput = e.message
           end
           if (cmd_result == false)
-            Bake.formatter.printWarning("Command not successful, variable #{s.name} will be set to \"\" (#{consoleOutput.chomp}).", s)
-            @@userVarMap[s.name] = ""
-            if s.env
-              ENV[s.name] = ""
-              config.setEnvVar(s.name, "")
-            end
+            Bake.formatter.printError("Command not successful: #{cmd.join(" ")}", s)
+            ExitHelper.exit(1)
           end
         end
 

data/lib/bakery/buildPattern.rb

@@ -1,24 +1,25 @@
-module Bake
-
-  class BuildPattern
-    attr_reader :proj, :conf, :coll_p
-    def initialize(proj, conf, coll_p)
-      @proj = proj
-      @conf = conf
-      @coll_p = coll_p
-    end
-    def getId
-      proj + "*******" + conf
-    end
-    def hash
-      getId.hash
-    end
-    def eql?(comparee)
-      self == comparee
-    end
-    def ==(comparee)
-      self.getId == comparee.getId
-    end
-  end
-
-end
+module Bake
+
+  class BuildPattern
+    attr_reader :proj, :conf, :args, :coll_p
+    def initialize(proj, conf, args, coll_p)
+      @proj = proj
+      @conf = conf
+      @args = args
+      @coll_p = coll_p
+    end
+    def getId
+      proj + "*******" + conf
+    end
+    def hash
+      getId.hash
+    end
+    def eql?(comparee)
+      self == comparee
+    end
+    def ==(comparee)
+      self.getId == comparee.getId
+    end
+  end
+
+end

data/lib/bakery/model/metamodel.rb

@@ -1,48 +1,49 @@
-require 'rgen/metamodel_builder'
-require 'rgen/metamodel_builder/data_types'
-
-module Bake
-
-  module BakeryModel
-    extend RGen::MetamodelBuilder::ModuleExtension
-
-    class ModelElement < RGen::MetamodelBuilder::MMBase
-      abstract
-      has_attr 'line_number', Integer do
-        annotation :details => {'internal' => 'true'}
-      end
-      has_attr 'file_name', String do
-        annotation :details => {'internal' => 'true'}
-      end
-    end
-
-    class Project < ModelElement
-      has_attr 'name', String, :defaultValueLiteral => ""
-      has_attr 'config', String, :defaultValueLiteral => ""
-    end
-    class Exclude < ModelElement
-      has_attr 'name', String, :defaultValueLiteral => ""
-      has_attr 'config', String, :defaultValueLiteral => ""
-    end
-    class SubCollection < ModelElement
-      has_attr 'name', String, :defaultValueLiteral => ""
-    end
-    class Collection < ModelElement
-      has_attr 'name', String, :defaultValueLiteral => ""
-      contains_many 'project', Project, 'collection'
-      contains_many 'exclude', Exclude, 'collection'
-      contains_many 'collections', SubCollection, 'collection'
-    end
-
-    module Project::ClassModule
-      def isFound
-        @isFound ||= false
-      end
-      def found
-        @isFound = true
-      end
-    end
-
-  end
-
-end
+require 'rgen/metamodel_builder'
+require 'rgen/metamodel_builder/data_types'
+
+module Bake
+
+  module BakeryModel
+    extend RGen::MetamodelBuilder::ModuleExtension
+
+    class ModelElement < RGen::MetamodelBuilder::MMBase
+      abstract
+      has_attr 'line_number', Integer do
+        annotation :details => {'internal' => 'true'}
+      end
+      has_attr 'file_name', String do
+        annotation :details => {'internal' => 'true'}
+      end
+    end
+
+    class Project < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+      has_attr 'config', String, :defaultValueLiteral => ""
+      has_attr 'args', String, :defaultValueLiteral => ""
+    end
+    class Exclude < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+      has_attr 'config', String, :defaultValueLiteral => ""
+    end
+    class SubCollection < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+    end
+    class Collection < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+      contains_many 'project', Project, 'collection'
+      contains_many 'exclude', Exclude, 'collection'
+      contains_many 'collections', SubCollection, 'collection'
+    end
+
+    module Project::ClassModule
+      def isFound
+        @isFound ||= false
+      end
+      def found
+        @isFound = true
+      end
+    end
+
+  end
+
+end

data/lib/bakery/toBake.rb

@@ -1,76 +1,76 @@
-require "bakery/buildPattern"
-
-module Bake
-
-  def self.getBuildPattern(cols, name)
-
-    colMeta = @options.collection_dir+"/Collection.meta"
-
-    if (cols.length == 0)
-      Bake.formatter.printError("Collection #{name} not found", colMeta)
-      ExitHelper.exit(1)
-    elsif (cols.length > 1)
-      Bake.formatter.printError("Collection #{name} found more than once", colMeta)
-      ExitHelper.exit(1)
-    end
-
-    col = cols[0]
-
-    col.project.each do |p|
-      if p.name == ""
-        Bake.formatter.printError("Project name empty", p)
-        ExitHelper.exit(1)
-      end
-      if p.config == ""
-        Bake.formatter.printError("Config name empty", p)
-        ExitHelper.exit(1)
-      end
-    end
-
-    toBuildPattern = []
-    @options.roots.each do |root|
-      col.project.each do |p|
-        projs = Root.search_to_depth(root.dir,p.name + "/Project.meta", root.depth)
-        if projs.length == 0
-          toBuildPattern << BuildPattern.new(nil, nil, p) # remember it for sorted info printout
-        end
-        projs.each do |f|
-          toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p)
-        end
-      end
-    end
-
-    toBuild = []
-    toBuildPattern.each do |bp|
-      next unless bp.proj
-      contents = File.open(bp.proj, "r") {|io| io.read }
-      contents.split("\n").each do |c|
-        res = c.match("\\s*(Library|Executable|Custom){1}Config\\s*(\\w*)")
-        if res
-          if res[2].match(bp.conf) != nil
-            toBuild << BuildPattern.new(bp.proj, res[2], nil)
-            bp.coll_p.found
-          end
-        end
-      end
-    end
-
-    col.exclude.each do |p|
-      p.name = "/"+p.name.gsub("*","(\\w*)")+"/Project.meta"
-      p.config = "^"+p.config.gsub("*","(\\w*)")+"$"
-    end
-
-    toBuild.delete_if do |bp|
-      exclude = false
-      col.exclude.each do |p|
-        exclude = true if (bp.proj.match(p.name) != nil and bp.conf.match(p.config) != nil)
-      end
-      exclude
-    end
-
-    toBuild.uniq!
-
-    return toBuild
-  end
-
-end
+require "bakery/buildPattern"
+
+module Bake
+
+  def self.getBuildPattern(cols, name)
+
+    colMeta = @options.collection_dir+"/Collection.meta"
+
+    if (cols.length == 0)
+      Bake.formatter.printError("Collection #{name} not found", colMeta)
+      ExitHelper.exit(1)
+    elsif (cols.length > 1)
+      Bake.formatter.printError("Collection #{name} found more than once", colMeta)
+      ExitHelper.exit(1)
+    end
+
+    col = cols[0]
+
+    col.project.each do |p|
+      if p.name == ""
+        Bake.formatter.printError("Project name empty", p)
+        ExitHelper.exit(1)
+      end
+      if p.config == ""
+        Bake.formatter.printError("Config name empty", p)
+        ExitHelper.exit(1)
+      end
+    end
+
+    toBuildPattern = []
+    @options.roots.each do |root|
+      col.project.each do |p|
+        projs = Root.search_to_depth(root.dir,p.name + "/Project.meta", root.depth)
+        if projs.length == 0
+          toBuildPattern << BuildPattern.new(nil, nil, p.args, p) # remember it for sorted info printout
+        end
+        projs.each do |f|
+          toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p)
+        end
+      end
+    end
+
+    toBuild = []
+    toBuildPattern.each do |bp|
+      next unless bp.proj
+      contents = File.open(bp.proj, "r") {|io| io.read }
+      contents.split("\n").each do |c|
+        res = c.match("\\s*(Library|Executable|Custom){1}Config\\s*\"?([\\w:-]*)\"?")
+        if res
+          if res[2].match(bp.conf) != nil
+            toBuild << BuildPattern.new(bp.proj, res[2], bp.args, nil)
+            bp.coll_p.found
+          end
+        end
+      end
+    end
+
+    col.exclude.each do |p|
+      p.name = "/"+p.name.gsub("*","(\\w*)")+"/Project.meta"
+      p.config = "^"+p.config.gsub("*","(\\w*)")+"$"
+    end
+
+    toBuild.delete_if do |bp|
+      exclude = false
+      col.exclude.each do |p|
+        exclude = true if (bp.proj.match(p.name) != nil and bp.conf.match(p.config) != nil)
+      end
+      exclude
+    end
+
+    toBuild.uniq!
+
+    return toBuild
+  end
+
+end

data/lib/common/options/finder.rb

@@ -1,6 +1,10 @@
 module Bake
 
   def self.findDirOfFileToRoot(dir, filename)
+    if !File.exists?(dir)
+      Bake.formatter.printError("Error: #{dir} does not exist")
+      ExitHelper.exit(1)
+    end
     loop do
       completeName = dir + "/" + filename
       return dir if File.exist?(completeName)

data/lib/common/version.rb

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