bake-toolkit 2.20.4 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8540ad106a6afb76df40b717b4e7a8e13b9803cf
-  data.tar.gz: 57b00c965a59e65acb7742a9d99ec9ceefd66e46
+  metadata.gz: 20082f7a67d3699e5cf6b53b85cb818d719e6b3d
+  data.tar.gz: c9d4211022401e0e2657ccdf08bc9b5d30d5b473
 SHA512:
-  metadata.gz: eff93846f8753525e768c2351be1c0d17df7dc052393524077f8f7c67dba6896a1c586c047a30bd8d2077999bac662c85127d81fbe225412c82b86adb1c680f7
-  data.tar.gz: 298f49171f1f298d0663a55395a252f14e9ae48ad66215562b4c59f36cee44a97b644c6ad79e74269619206e0dd4d20f551e7924f5419bbfc5479f5e1f4472da
+  metadata.gz: f57d365f77b16e0d6d93dafd82c1feb5c039eae20601c6eeddb4820389f30ebaeacbe8b4d4f2b9da4181cbe664a7f3af294f918f3578db5360172718d0d98f60
+  data.tar.gz: bd4181162c7fd25f6f5e657a3ca9506061804d2f8c07128494a50738da19a963e32fad986c2be31b30ecc3d1232089d661cac454d85d076d45022f118d99486a

data/Rakefile.rb

@@ -1,3 +1,3 @@
-require 'rake'
-
-require './rake_helper/spec.rb'
+require 'rake'
+
+require './rake_helper/spec.rb'

data/bin/bake

@@ -1,46 +1,46 @@
-#!/usr/bin/env ruby
-
-$timeStart = Time.now
-
-$:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'common/version'
-
-STDOUT.sync = true
-STDERR.sync = true
-
-puts "-- bake #{Bake::Version.number}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
-
-require 'tocxx'
-require 'socket'
-
-module Bake
-
-  earlyExit = nil
-  begin
-    if RUBY_VERSION[0..2] == "1.8"
-      Bake.formatter.printError("Error: Ruby 1.8 not supported anymore. Use Ruby 1.9 or greater.")
-      ExitHelper.exit(1)
-    end
-    
-    Bake.options = Options.new(ARGV)
-    Bake.options.parse_options
-
-    tocxx = Bake::ToCxx.new
-    tocxx.connect()
-    tocxx.doit()
-    tocxx.disconnect()
-    
-  rescue SystemExit => e
-    earlyExit = e
-    begin
-      tocxx.disconnect()
-    rescue Exception => e2
-    end
-  end
-
-  timeEnd = Time.now
-  timeDiff = timeEnd - $timeStart
-  Bake.formatter.printInfo("\nTime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60])
-  
-  raise earlyExit if earlyExit
-end
+#!/usr/bin/env ruby
+
+$timeStart = Time.now
+
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'common/version'
+
+STDOUT.sync = true
+STDERR.sync = true
+
+require 'tocxx'
+require 'socket'
+
+module Bake
+
+  earlyExit = nil
+  begin
+    if RUBY_VERSION[0..2] == "1.8"
+      Bake.formatter.printError("Error: Ruby 1.8 not supported anymore. Use Ruby 1.9 or greater.")
+      ExitHelper.exit(1)
+    end
+
+    Bake.options = Options.new(ARGV)
+    Bake.options.parse_options
+
+    tocxx = Bake::ToCxx.new
+    tocxx.connect()
+    tocxx.doit()
+    tocxx.disconnect()
+
+  rescue SystemExit => e
+    earlyExit = e
+    begin
+      tocxx.disconnect()
+    rescue Exception => e2
+    end
+  end
+
+  timeEnd = Time.now
+  timeDiff = timeEnd - $timeStart
+  if Bake.options.printTime
+    Bake.formatter.printInfo("\nTime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60])
+  end
+
+  raise earlyExit if earlyExit
+end

data/bin/bake-doc

@@ -1,11 +1,11 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'common/version'
-
-puts "-- bake #{Bake::Version.number}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
-
-puts "Command \"bake-doc\" not supported anymore. Please use"
-puts "\"bake --doc\" to open the documentation in the browser OR"
-puts "\"bake --generate-doc ...\" for building the documentation of a project."
-exit(1)
+#!/usr/bin/env ruby
+
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'common/version'
+
+Bake::Version.printBakeVersion
+
+puts "Command \"bake-doc\" not supported anymore. Please use"
+puts "\"bake --doc\" to open the documentation in the browser OR"
+puts "\"bake --generate-doc ...\" for building the documentation of a project."
+exit(1)

data/bin/bakery

@@ -1,179 +1,179 @@
-#!/usr/bin/env ruby
-
-$timeStart = Time.now
-
-$:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'common/version'
-
-require 'common/utils'
-
-puts "-- bakery #{Bake::Version.number}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
-
-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)
-    rescue SystemExit
-      runOk = (ExitHelper.exit_code == 0)
-    rescue Exception => e
-      puts e.message
-    end
-
-    Bake::cleanup
-    ExitHelper.reset_exit_code
-
-    if runOk == false
-      exitValue = 1
-      failedRuns << "bake " + cmd.join(" ")
-      if @options.error
-        msg1 << "aborted"
-        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
-  else
-  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]
-
-
-  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] + 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)
+    rescue SystemExit
+      runOk = (ExitHelper.exit_code == 0)
+    rescue Exception => e
+      puts e.message
+    end
+
+    Bake::cleanup
+    ExitHelper.reset_exit_code
+
+    if runOk == false
+      exitValue = 1
+      failedRuns << "bake " + cmd.join(" ")
+      if @options.error
+        msg1 << "aborted"
+        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
+  else
+  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]
+
+
+  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
+