bake-toolkit 2.46.0 → 2.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d21d45b4900652c338212ddd0f76da254c4a45e2
-  data.tar.gz: d0c410d6a94440f08108a997ed5bcad489b779e9
+  metadata.gz: f78e2244644f2f30995e911a8927f4fd135819a7
+  data.tar.gz: 7d97b8abee26bda490caf479e850f01080923903
 SHA512:
-  metadata.gz: e51a9b81676a11436b76a9264eb998405947632f3d6fbf4e4d196b7bf339d410fafe35f121ae25459c85333eab59ffaaada760114f7df78cb3bc39ce0eaba7a3
-  data.tar.gz: c4d113d43a34a6b9ab467fbef15af7996caca4d8efd30b3e6fd26932d0f30e5eda447de8af070d6e8f6bdec87b701376d329babb86e78349821dcc56737cd176
+  metadata.gz: 205b865a3d58f1a5815eeee319d5b2c9a549c51cdd8160f786808817a7618fd66dc3945b8b519d675e8e1ddbee24b0c657620d9742e004f5386cd4db0297d950
+  data.tar.gz: d8e65c232fa852f14b2a6366fb25acf51d87deda466c7cd5b5a90ccbb924274b86dd8d3bd6907fe598f257c09a4f90f334510cb33bce4f681661c561bfe9aa28

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
-
-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
+#!/usr/bin/env ruby
+
+$timeStart = Time.now
+
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require_relative '../lib/common/version'
+
+STDOUT.sync = true
+STDERR.sync = true
+
+require 'tocxx'
+require 'socket'
+
+module Bake
+
+  earlyExit = nil
+  begin
+    if RUBY_VERSION[0..1] == "1."
+      Bake.formatter.printError("Error: Ruby 1.x not supported anymore. Use Ruby 2.0 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,7 +1,7 @@
 #!/usr/bin/env ruby
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'common/version'
+require_relative '../lib/common/version'
 
 Bake::Version.printBakeVersion
 

data/bin/bake-format

@@ -2,7 +2,7 @@
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 
-require 'format/bake_format'
+require_relative '../lib/format/bake_format'
 begin
   if ARGV.size == 2
     indent = '  '

data/bin/bakeclean

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
-require "bakeclean/options/options"
+require_relative "../lib/bakeclean/options/options"
 require "fileutils"
 
 $options = Bake::BakecleanOptions.new(ARGV)

data/bin/bakeqac

@@ -5,13 +5,13 @@ require 'set'
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 
-require "bakeqac/options/options"
-require "bakeqac/filter"
-require 'bake/toolchain/colorizing_formatter'
-require 'bake/options/options'
-require 'common/process'
-require 'common/utils'
-require 'common/ext/file'
+require_relative "../lib/bakeqac/options/options"
+require_relative "../lib/bakeqac/filter"
+require_relative '../lib/bake/toolchain/colorizing_formatter'
+require_relative '../lib/bake/options/options'
+require_relative '../lib/common/process'
+require_relative '../lib/common/utils'
+require_relative '../lib/common/ext/file'
 
 STDOUT.sync = true
 STDERR.sync = true
@@ -222,13 +222,13 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
     cmd = qaExe + ["analyze", "-b"]
 
     begin
-      devMode = File.exist?"c:/Projekte/git/bake/bin/bake"
+      devMode = File.exist?"e:/bake/bake/bin/bake"
     rescue Exception
       devMode = false
     end
 
     if devMode
-      bcmd = "ruby c:/Projekte/git/bake/bin/bake "
+      bcmd = "ruby e:/bake/bake/bin/bake "
     else
       bcmd = (Utils::OS.windows? ? "cmd /c bake.bat " : "bake ")
     end

data/bin/bakery

@@ -3,9 +3,9 @@
 $timeStart = Time.now
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'common/version'
+require_relative '../lib/common/version'
 
-require 'common/utils'
+require_relative '../lib/common/utils'
 
 Bake::Version.printBakeryVersion
 
@@ -14,15 +14,15 @@ 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'
+require_relative '../lib/bake/toolchain/colorizing_formatter'
+require_relative '../lib/bake/options/options'
+require_relative '../lib/tocxx'
+require_relative "../lib/bakery/model/loader"
+require_relative "../lib/bakery/options/options"
+require_relative "../lib/bakery/toBake"
+require_relative "../lib/bakery/buildPattern"
+require_relative '../lib/common/ext/stdout'
+require_relative '../lib/common/cleanup'
 
 module Bake
 

data/lib/adapt/config/loader.rb

@@ -1,5 +1,5 @@
-require 'bake/model/loader'
-require 'bake/config/checks'
+require_relative '../../bake/model/loader'
+require_relative '../../bake/config/checks'
 
 module Bake
 

data/lib/bake/cache.rb

@@ -1,8 +1,8 @@
-require 'common/exit_helper'
-require 'bake/toolchain/colorizing_formatter'
-require 'common/options/parser'
-require 'common/version'
-require 'adapt/config/loader'
+require_relative '../common/exit_helper'
+require_relative 'toolchain/colorizing_formatter'
+require_relative '../common/options/parser'
+require_relative '../common/version'
+require_relative '../adapt/config/loader'
 
 module Bake
 

data/lib/bake/config/loader.rb

@@ -1,6 +1,6 @@
-require 'bake/model/loader'
-require 'bake/config/checks'
-require 'adapt/config/loader'
+require_relative '../model/loader'
+require_relative 'checks'
+require_relative '../../adapt/config/loader'
 
 module Bake
 

data/lib/bake/mergeConfig.rb

@@ -1,4 +1,4 @@
-require 'common/ext/rtext'
+require_relative '../common/ext/rtext'
 
 module Bake
 

data/lib/bake/model/language.rb

@@ -1,9 +1,6 @@
-require 'bake/model/metamodel'
-
+require_relative 'metamodel'
 require 'rtext/language'
 
-
-
 module Bake
 
   class Idp

data/lib/bake/model/loader.rb

@@ -1,6 +1,6 @@
-require 'bake/model/metamodel'
-require 'bake/model/language'
-require 'common/version'
+require_relative 'metamodel'
+require_relative 'language'
+require_relative '../../common/version'
 
 require 'rgen/environment'
 require 'rgen/fragment/dump_file_cache'
@@ -9,9 +9,9 @@ require 'rgen/util/file_cache_map'
 
 require 'rtext/default_loader'
 
-require 'common/exit_helper'
-require 'bake/toolchain/colorizing_formatter'
-require 'bake/options/options'
+require_relative '../../common/exit_helper'
+require_relative '../toolchain/colorizing_formatter'
+require_relative '../options/options'
 
 module Bake
 

data/lib/bake/model/metamodel.rb

@@ -203,6 +203,27 @@ module Bake
         contains_many 'flags', Flags, 'parent'
       end
 
+      class MakeDir < Step
+      end
+
+      class Remove < Step
+      end
+
+      class Copy < Step
+        has_attr 'to', String, :defaultValueLiteral => ""
+      end
+
+      class Move < Step
+        has_attr 'to', String, :defaultValueLiteral => ""
+      end
+
+      class Touch < Step
+      end
+
+      class Sleep < Step
+        has_attr 'name', String, :defaultValueLiteral => "0.0"
+      end
+
       class CommandLine < Step
       end
 

data/lib/bake/model/metamodel_ext.rb

@@ -1,5 +1,5 @@
-require 'bake/model/metamodel'
-require 'common/ext/file'
+require_relative 'metamodel'
+require_relative '../../common/ext/file'
 
 module Bake
   module Metamodel

data/lib/bake/options/create.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'common/version'
+require_relative '../../common/version'
 
 module Bake
 

data/lib/bake/options/options.rb

@@ -1,13 +1,13 @@
-require 'bake/toolchain/colorizing_formatter'
-require 'common/options/parser'
-require 'bake/options/showToolchains'
-require 'bake/options/showLicense'
-require 'bake/options/showDoc'
-require 'bake/options/usage'
-require 'bake/options/create'
-require 'common/options/finder'
-require 'common/root'
-require 'common/crc32'
+require_relative '../toolchain/colorizing_formatter'
+require_relative '../../common/options/parser'
+require_relative '../options/showToolchains'
+require_relative '../options/showLicense'
+require_relative '../options/showDoc'
+require_relative '../options/usage'
+require_relative '../options/create'
+require_relative '../../common/options/finder'
+require_relative '../../common/root'
+require_relative '../../common/crc32'
 
 module Bake
 
@@ -28,8 +28,10 @@ module Bake
     attr_reader :vars, :include_filter_args # map
     attr_reader :verbose
     attr_reader :filelist # set
-    attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
+    attr_reader :consoleOutput_fullnames
     attr_reader :roots # Root array
+    attr_reader :diabCaseCheck
+    attr_reader :defines
 
 
     def initialize(argv)
@@ -54,7 +56,6 @@ module Bake
       @eclipseOrder = false
       @showConfigs = false
       @consoleOutput_fullnames = false
-      @consoleOutput_visualStudio = false
       @prepro = false
       @stopOnFirstError = false
       @verbose = 1
@@ -85,6 +86,8 @@ module Bake
       @main_project_name = ""
       @adapt = []
       @syncedOutput = false
+      @diabCaseCheck = false
+      @defines = []
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| @main_dir = x                           })
@@ -142,20 +145,20 @@ module Bake
       add_option(["--doc",                "--show_doc"           ], lambda {     Doc.show                                })
       add_option(["--install-doc",        "--install_doc"        ], lambda {     Doc.install                             })
 
+      add_option(["-D"                                           ], lambda { |x| @defines << x                           })
+
       add_option(["--dry"                                        ], lambda {     @dry = true                             })
 
       add_option(["--crc32"                                      ], lambda { |x| CRC32.printAndExit(x)                   })
 
+      add_option(["--diab-case-check"                            ], lambda {  @diabCaseCheck = true; @compileOnly = true })
+
       add_option(["--version"                                    ], lambda {     Bake::Usage.version                     })
       add_option(["--list",               "--show_configs"       ], lambda {     @showConfigs = true                     })
       add_option(["--compilation-db"                             ], lambda { |x,dummy| @cc2j_filename = (x ? x : "compile_commands.json" )})
       add_option(["--link-2-17",          "--link_2_17"          ], lambda {     @oldLinkOrder = true                    })
       add_option(["--build_",                                    ], lambda {     @buildDirDelimiter = "_"                })
 
-
-      # hidden
-      add_option(["--visualStudio"                               ], lambda {     @consoleOutput_visualStudio = true      })
-
       # deprecated and not replaced by new command
       add_option(["--show_include_paths"                         ], lambda {     @show_includes = true                   })
 
@@ -263,6 +266,11 @@ module Bake
         end
       end
 
+      if @caseSensitivityCheck == false && @diabCaseCheck == true
+        Bake.formatter.printError("Error: --no-case-check and --diab-case-check not allowed at the same time")
+        ExitHelper.exit(1)
+      end
+
       @filename = "." if @compileOnly
 
     end

data/lib/bake/options/showDoc.rb

@@ -1,6 +1,6 @@
 require "open-uri"
 require "fileutils"
-require "common/version"
+require_relative "../../common/version"
 require "openssl"
 
 module Bake

data/lib/bake/options/usage.rb

@@ -1,4 +1,4 @@
-require 'common/version'
+require_relative '../../common/version'
 
 module Bake
 
@@ -35,6 +35,7 @@ module Bake
       puts " --ignore-cache           Rereads the original meta files - usefull if workspace structure has been changed."
       puts " -j <num>                 Set NUMBER of parallel compiled files (default is 8)."
       puts " -O                       The output will be synchronized per configuration. Note, this delays output."
+      puts " -D <define>              Adds this define to the compiler commands"
       puts " --socket <num>           Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."
       puts " --toolchain-info <name>  Prints default values of a toolchain."
       puts " --toolchain-names        Prints available toolchains."
@@ -59,6 +60,7 @@ module Bake
       puts " --create exe|lib|custom  Creates a project with exe, lib or custom template"
       puts " --nb                     Suppresses the lines \"**** Building x of y: name (config) ****"
       puts " --crc32 <string>         Calulates the CRC32 of string (0x4C11DB7, init 0, final xor 0, input and result not reflected), used for Uid variable calculation"
+      puts " --diab-case-check        When compiling with DCC, this switches to the case check on Windows machines. No actual compilation is done."
       puts " --link-2-17              DEPRECATED: Using link order of libraries which was used until bake 2.17"
       puts " --build_                 DEPRECATED: build directories will be build_<name> instead of build/<name>"
       puts " --version                Print version."