bake-toolkit 2.20.4 → 2.21.0

data/lib/common/options/parser.rb

@@ -1,86 +1,96 @@
-require 'bake/toolchain/colorizing_formatter'
-require 'common/exit_helper'
-
-module Bake
-
-  class Parser
-    
-    def initialize(argv)
-      @arguments = {}
-      @argv = argv
-    end
-    
-    #def add_option(opt)
-    #  @arguments[opt.param] = opt
-    #end
-    
-    def add_option(params, block)
-      params.each { |p| @arguments[p] = block }
-    end
-    
-    def get_block(param)
-      opt = @arguments[param]
-      raise "Internal error in option handling" unless opt
-      opt.block
-    end
-    
-    def valid?(argument)
-      @arguments.include?argument
-    end
-    
-    def has_parameter?(argument)
-      return false unless valid?(argument)
-      @arguments[argument].parameters.length == 1
-    end
-    
-    def parse_internal(ignore_invalid, subOptions = nil)
-      pos = 0
-      begin
-        while pos < @argv.length do
-          arg = @argv[pos]
-          if not valid?arg
-            
-            # used in bake config, must be passed from bakery to bake
-            if subOptions and subOptions.valid?arg           
-              if subOptions.has_parameter?(arg)
-                if pos+1 < @argv.length and @argv[pos+1][0] != "-"
-                  pos = pos + 1
-                else
-                  raise "Argument for option #{arg} missing" 
-                end
-              end
-            end
-            
-            index = arg.index('-')
-            if index != nil and index == 0
-              raise "Option #{arg} unknown" if not ignore_invalid
-            else
-              @arguments[""].call(arg) # default paramter without "-"
-            end
-          else
-            option = @arguments[arg]
-            if option.parameters.length == 1
-              if pos+1 < @argv.length and @argv[pos+1][0] != "-"
-                option.call(@argv[pos+1])
-                pos = pos + 1
-              else
-                raise "Argument for option #{arg} missing" 
-              end
-            else
-              option.call()
-            end
-          end
-          pos = pos + 1
-        end
-      rescue SystemExit => e
-        raise
-      rescue Exception => e
-        Bake.formatter.printError("Error: " + e.message)
-        ExitHelper.exit(1)
-      end
-      
-    end
-  
-  end
-
+require 'bake/toolchain/colorizing_formatter'
+require 'common/exit_helper'
+
+module Bake
+
+  class Parser
+
+    def initialize(argv)
+      @arguments = {}
+      @argv = argv
+    end
+
+    #def add_option(opt)
+    #  @arguments[opt.param] = opt
+    #end
+
+    def add_option(params, block)
+      params.each { |p| @arguments[p] = block }
+    end
+
+    def get_block(param)
+      opt = @arguments[param]
+      raise "Internal error in option handling" unless opt
+      opt.block
+    end
+
+    def valid?(argument)
+      @arguments.include?argument
+    end
+
+    def has_parameter?(argument)
+      return false unless valid?(argument)
+      @arguments[argument].parameters.length == 1
+    end
+
+    def parse_internal(ignore_invalid, subOptions = nil)
+      pos = 0
+      begin
+        while pos < @argv.length do
+          arg = @argv[pos]
+          if not valid?arg
+
+            # used in bake config, must be passed from bakery to bake
+            if subOptions and subOptions.valid?arg
+              if subOptions.has_parameter?(arg)
+                if pos+1 < @argv.length and @argv[pos+1][0] != "-"
+                  pos = pos + 1
+                else
+                  raise "Argument for option #{arg} missing"
+                end
+              end
+            end
+
+            index = arg.index('-')
+            if index != nil and index == 0
+              raise "Option #{arg} unknown" if not ignore_invalid
+            else
+              @arguments[""].call(arg) # default paramter without "-"
+            end
+          else
+            option = @arguments[arg]
+            if option.parameters.length >= 1
+              hasArgument = (pos+1 < @argv.length and @argv[pos+1][0] != "-")
+              if option.parameters.length == 2 or hasArgument
+                if option.parameters.length == 2
+                  if hasArgument
+                    option.call(@argv[pos+1], nil) # do not use default value
+                    pos = pos + 1
+                  else
+                    option.call(nil, nil) # use default value
+                  end
+                else
+                  option.call(@argv[pos+1])
+                  pos = pos + 1
+                end
+              else
+                raise "Argument for option #{arg} missing"
+              end
+            else
+              option.call()
+            end
+          end
+          pos = pos + 1
+        end
+      rescue SystemExit => e
+        raise
+      rescue Exception => e
+        Bake.formatter.printError("Error: " + e.message)
+        ExitHelper.exit(1)
+      end
+
+    end
+
+  end
+
 end

data/lib/common/process.rb

@@ -1,65 +1,65 @@
-module Bake
-
-  class ProcessHelper
-    @@pid = nil
-    @@rd = nil
-
-    def self.run(cmdLineArray, immediateOutput=false, force=true, outpipe=nil, exitCodeArray = [0])
-      rd, wr = IO.pipe
-      @@rd = rd if force
-      duppedCmdLineArray = cmdLineArray.dup
-      duppedCmdLineArray << { :err=>wr, :out=>(outpipe ? outpipe : wr) }
-      begin
-        pid = spawn(*duppedCmdLineArray)
-      rescue Exception => e
-        return [false, e.message]
-      end
-      @@pid = pid if force
-      wr.close
-      output = ""
-      begin
-        while not rd.eof?
-          tmp = rd.read(1)
-          if (tmp != nil)
-            tmp.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
-            tmp.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
-            output << tmp
-            
-            print tmp if immediateOutput
-          end
-        end
-      rescue
-        # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
-        # an exception on read(). However, this happens not before everything is read, so there is no practical difference
-        # how to "break" the loop.
-        # This problem occurs on Windows command shell and Cygwin.
-      end
-      
-      begin
-        rd.close
-      rescue
-      end 
-      pid, status = Process.wait2(pid)
-      @@pid = nil
-      @@rd = nil
-      return [false, output] if status.nil?
-      exitCodeArray = [0] if exitCodeArray.empty?
-      [(exitCodeArray.include?status.exitstatus), output]
-    end
-       
-    def self.killProcess(force) # do not kill compile processes or implement rd and pid array if really needed
-      begin
-        @@rd.close
-      rescue Exception => e
-      end
-      begin
-        Process.kill("KILL",@@pid)
-      rescue Exception => e
-      end
-      @@rd = nil
-      @@pid = nil
-    end
-    
-  end
-
+module Bake
+
+  class ProcessHelper
+    @@pid = nil
+    @@rd = nil
+
+    def self.run(cmdLineArray, immediateOutput=false, force=true, outpipe=nil, exitCodeArray = [0])
+      rd, wr = IO.pipe
+      @@rd = rd if force
+      duppedCmdLineArray = cmdLineArray.dup
+      duppedCmdLineArray << { :err=>wr, :out=>(outpipe ? outpipe : wr) }
+      begin
+        pid = spawn(*duppedCmdLineArray)
+      rescue Exception => e
+        return [false, e.message]
+      end
+      @@pid = pid if force
+      wr.close
+      output = ""
+      begin
+        while not rd.eof?
+          tmp = rd.read(1)
+          if (tmp != nil)
+            tmp.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
+            tmp.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
+            output << tmp
+
+            print tmp if immediateOutput
+          end
+        end
+      rescue
+        # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
+        # an exception on read(). However, this happens not before everything is read, so there is no practical difference
+        # how to "break" the loop.
+        # This problem occurs on Windows command shell and Cygwin.
+      end
+
+      begin
+        rd.close
+      rescue
+      end
+      pid, status = Process.wait2(pid)
+      @@pid = nil
+      @@rd = nil
+      return [false, output] if status.nil?
+      exitCodeArray = [0] if exitCodeArray.empty?
+      [(exitCodeArray.include?status.exitstatus), output]
+    end
+
+    def self.killProcess(force) # do not kill compile processes or implement rd and pid array if really needed
+      begin
+        @@rd.close
+      rescue Exception => e
+      end
+      begin
+        Process.kill("KILL",@@pid)
+      rescue Exception => e
+      end
+      @@rd = nil
+      @@pid = nil
+    end
+
+  end
+
 end

data/lib/common/utils.rb

@@ -1,52 +1,52 @@
-module Bake
-  
-  module Utils
-  
-    def self.flagSplit(str, removeQuotes)
-      return [] if str == ""
-      return [str] unless str.include?" "
-      
-      hasQuote = false
-      hasDoubleQuote = false
-      hadQuote = false
-      ar = []
-      s = ""
-  
-      str.split("").each do |i|
-        hasDoubleQuote = !hasDoubleQuote if !hasQuote and i == '"'
-        hasQuote = !hasQuote if !hasDoubleQuote and i == '\''
-        hadQuote = true if hasDoubleQuote
-        if i == ' '
-          if not hasDoubleQuote and not hasQuote
-            if hadQuote and removeQuotes
-              ar << s[1..-2] if s.length > 2
-              hadQuote = false
-            else
-              ar << s if s.length > 0
-            end
-            s = ""
-            next
-          end
-        end
-        s << i
-      end
-      ar << s if s.length > 0
-      ar
-    end  
-  
-    # Simple helper query the operating system we are running in
-    module OS
-
-      # Is it windows
-      def OS.windows?
-        (RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/) != nil
-      end
-
-    end
-
-    def self.deep_copy(x)
-      Marshal.load(Marshal.dump(x))
-    end
-
-  end
-end
+module Bake
+
+  module Utils
+
+    def self.flagSplit(str, removeQuotes)
+      return [] if str == ""
+      return [str] unless str.include?" "
+
+      hasQuote = false
+      hasDoubleQuote = false
+      hadQuote = false
+      ar = []
+      s = ""
+
+      str.split("").each do |i|
+        hasDoubleQuote = !hasDoubleQuote if !hasQuote and i == '"'
+        hasQuote = !hasQuote if !hasDoubleQuote and i == '\''
+        hadQuote = true if hasDoubleQuote
+        if i == ' '
+          if not hasDoubleQuote and not hasQuote
+            if hadQuote and removeQuotes
+              ar << s[1..-2] if s.length > 2
+              hadQuote = false
+            else
+              ar << s if s.length > 0
+            end
+            s = ""
+            next
+          end
+        end
+        s << i
+      end
+      ar << s if s.length > 0
+      ar
+    end
+
+    # Simple helper query the operating system we are running in
+    module OS
+
+      # Is it windows
+      def OS.windows?
+        (RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/) != nil
+      end
+
+    end
+
+    def self.deep_copy(x)
+      Marshal.load(Marshal.dump(x))
+    end
+
+  end
+end

data/lib/common/version.rb

@@ -1,23 +1,31 @@
-module Bake
-  class Version
-    def self.number
-      "2.20.4"
-    end
-  end
-
-  expectedRGen = "0.8.1"
-  expectedRText = "0.8.1"
-
-  begin
-    gem "rgen", "=#{expectedRGen}"
-  rescue Exception => e
-    puts "Warning: Failed to load rgen #{expectedRGen}, using latest version"
-  end
-
-  begin
-    gem "rtext", "=#{expectedRText}"
-  rescue Exception => e
-    puts "Warning: Failed to load rtext #{expectedRText}, using latest version"
-  end
-
-end
+module Bake
+  class Version
+    def self.number
+      "2.21.0"
+    end
+
+    def self.printBakeVersion(ry = "")
+      puts "-- bake#{ry} #{Bake::Version.number}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
+    end
+
+    def self.printBakeryVersion()
+      printBakeVersion("ry")
+    end
+  end
+
+  expectedRGen = "0.8.1"
+  expectedRText = "0.8.1"
+
+  begin
+    gem "rgen", "=#{expectedRGen}"
+  rescue Exception => e
+    puts "Warning: Failed to load rgen #{expectedRGen}, using latest version"
+  end
+
+  begin
+    gem "rtext", "=#{expectedRText}"
+  rescue Exception => e
+    puts "Warning: Failed to load rtext #{expectedRText}, using latest version"
+  end
+
+end