bake-toolkit 2.20.4 → 2.21.0

data/lib/blocks/showIncludes.rb

@@ -1,125 +1,140 @@
-module Bake
-  module Blocks
-    class Show
-      
-      def self.secureShow
-        begin
-          yield
-        rescue Exception => e
-          if (not SystemExit === e)
-            puts e
-            puts e.backtrace
-            ExitHelper.exit(1)
-          else
-            raise e
-          end
-        end
-      end  
-      
-      def self.includes
-        secureShow {
-        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
-          print projName
-          incs = []
-          blocks.each do |block|
-            if Bake.options.consoleOutput_fullnames
-              incs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
-            else
-              incs += block.include_list
-            end
-          end
-          
-          incs.uniq.each { |inc| print "##{inc}" }
-          print "\n"
-        end
-        ExitHelper.exit(0) }
-      end
-      
-      def self.readInternalIncludes(mainConfig, mainBlock, mainTcs)
-        intIncs = []
-        iinc = mainConfig.defaultToolchain.internalIncludes
-        Dir.chdir(Bake.options.main_dir) do
-          if (iinc)
-            
-            cppExe      = File.which(mainTcs[:COMPILER][:CPP][:COMMAND]) 
-            cExe        = File.which(mainTcs[:COMPILER][:C][:COMMAND])
-            asmExe      = File.which(mainTcs[:COMPILER][:ASM][:COMMAND])
-            archiverExe = File.which(mainTcs[:ARCHIVER][:COMMAND])
-            linkerExe   = File.which(mainTcs[:LINKER][:COMMAND])
-            
-            iname = mainBlock.convPath(iinc)
-            if iname != ""
-              if not File.exists?(iname)
-                Bake.formatter.printError("InternalIncludes file #{iname} does not exist", iinc)
-                ExitHelper.exit(1)
-              end
-              IO.foreach(iname) do |x|
-                x.sub!("$(CPPPath)",      cppExe)
-                x.sub!("$(CPath)",        cExe)
-                x.sub!("$(ASMPath)",      asmExe)
-                x.sub!("$(ArchiverPath)", archiverExe)
-                x.sub!("$(LinkerPath)",   linkerExe)
-                add_line_if_no_comment(intIncs,x)
-              end
-            end
-          end
-        end
-        return intIncs
-      end
-      
-      def self.readInternalDefines(mainConfig, mainBlock)
-        intDefs = {:CPP => [], :C => [], :ASM => []}
-        Dir.chdir(Bake.options.main_dir) do
-          mainConfig.defaultToolchain.compiler.each do |c|
-            if (c.internalDefines)
-              dname = mainBlock.convPath(c.internalDefines)
-              if dname != ""
-                if not File.exists?(dname)
-                  Bake.formatter.printError("InternalDefines file #{dname} does not exist", c.internalDefines)
-                  ExitHelper.exit(1)
-                end
-                IO.foreach(dname) {|x| add_line_if_no_comment(intDefs[c.ctype],x)  }
-              end
-            end
-          end
-        end
-        return intDefs
-      end
-      
-      def self.includesAndDefines(mainConfig, mainTcs)
-        secureShow {
-        mainBlock = Blocks::ALL_BLOCKS[Bake.options.main_project_name+","+Bake.options.build_config]
-
-        intIncs = readInternalIncludes(mainConfig, mainBlock, mainTcs)
-        intDefs = readInternalDefines(mainConfig, mainBlock)
-
-      
-        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
-
-          blockIncs = []
-          blockDefs = {:CPP => [], :C => [], :ASM => []}
-          blocks.each do |block|
-            if Bake.options.consoleOutput_fullnames
-              blockIncs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
-            else
-              blockIncs += block.include_list
-            end            
-            [:CPP, :C, :ASM].each { |type| blockDefs[type] += block.tcs[:COMPILER][type][:DEFINES] }
-          end
-          
-          puts projName
-          puts " includes"
-          (blockIncs + intIncs).uniq.each { |i| puts "  #{i}" }
-          [:CPP, :C, :ASM].each do |type|
-            puts " #{type} defines"
-            (blockDefs[type] + intDefs[type]).uniq.each { |d| puts "  #{d}" }
-          end
-          puts " done"
-          
-        end
-        ExitHelper.exit(0) }
-      end
-
-    end
-  end
-end
+module Bake
+  module Blocks
+    class Show
+
+      def self.secureShow
+        begin
+          yield
+        rescue Exception => e
+          if (not SystemExit === e)
+            puts e
+            puts e.backtrace
+            ExitHelper.exit(1)
+          else
+            raise e
+          end
+        end
+      end
+
+      def self.includes
+        secureShow {
+        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
+          print projName
+          incs = []
+          blocks.each do |block|
+            if Bake.options.consoleOutput_fullnames
+              incs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
+            else
+              incs += block.include_list
+            end
+          end
+
+          incs.uniq.each { |inc| print "##{inc}" }
+          print "\n"
+        end
+        ExitHelper.exit(0) }
+      end
+
+      def self.readInternalIncludes(mainConfig, mainBlock, mainTcs)
+        intIncs = []
+        iinc = mainConfig.defaultToolchain.internalIncludes
+        Dir.chdir(Bake.options.main_dir) do
+          if (iinc)
+
+            cppExe      = File.which(mainTcs[:COMPILER][:CPP][:COMMAND])
+            cExe        = File.which(mainTcs[:COMPILER][:C][:COMMAND])
+            asmExe      = File.which(mainTcs[:COMPILER][:ASM][:COMMAND])
+            archiverExe = File.which(mainTcs[:ARCHIVER][:COMMAND])
+            linkerExe   = File.which(mainTcs[:LINKER][:COMMAND])
+
+            iname = mainBlock.convPath(iinc)
+            if iname != ""
+              if not File.exists?(iname)
+                Bake.formatter.printError("InternalIncludes file #{iname} does not exist", iinc)
+                ExitHelper.exit(1)
+              end
+              IO.foreach(iname) do |x|
+                x.sub!("$(CPPPath)",      cppExe)
+                x.sub!("$(CPath)",        cExe)
+                x.sub!("$(ASMPath)",      asmExe)
+                x.sub!("$(ArchiverPath)", archiverExe)
+                x.sub!("$(LinkerPath)",   linkerExe)
+                add_line_if_no_comment(intIncs,x)
+              end
+            end
+          end
+        end
+        return intIncs
+      end
+
+      def self.readInternalDefines(mainConfig, mainBlock)
+        intDefs = {:CPP => [], :C => [], :ASM => []}
+        Dir.chdir(Bake.options.main_dir) do
+          mainConfig.defaultToolchain.compiler.each do |c|
+            if (c.internalDefines)
+              dname = mainBlock.convPath(c.internalDefines)
+              if dname != ""
+                if not File.exists?(dname)
+                  Bake.formatter.printError("InternalDefines file #{dname} does not exist", c.internalDefines)
+                  ExitHelper.exit(1)
+                end
+                IO.foreach(dname) {|x| add_line_if_no_comment(intDefs[c.ctype],x)  }
+              end
+            end
+          end
+        end
+        return intDefs
+      end
+
+      def self.includesAndDefines(mainConfig, mainTcs)
+        json = true
+        secureShow {
+        mainBlock = Blocks::ALL_BLOCKS[Bake.options.main_project_name+","+Bake.options.build_config]
+
+        intIncs = readInternalIncludes(mainConfig, mainBlock, mainTcs)
+        intDefs = readInternalDefines(mainConfig, mainBlock)
+
+
+        projs = {}
+        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
+
+          blockIncs = []
+          blockDefs = {:CPP => [], :C => [], :ASM => []}
+          blocks.each do |block|
+            if Bake.options.consoleOutput_fullnames
+              blockIncs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
+            else
+              blockIncs += block.include_list
+            end
+            [:CPP, :C, :ASM].each { |type| blockDefs[type] += block.tcs[:COMPILER][type][:DEFINES] }
+          end
+          if Bake.options.json
+            projs[projName] =
+              {  :includes => (blockIncs + intIncs).uniq,
+                 :cpp_defines => (blockDefs[:CPP] + intDefs[:CPP]).uniq,
+                 :c_defines => (blockDefs[:C] + intDefs[:C]).uniq,
+                 :asm_defines => (blockDefs[:ASM] + intDefs[:ASM]).uniq
+              }
+          else
+            puts projName
+            puts " includes"
+            (blockIncs + intIncs).uniq.each { |i| puts "  #{i}" }
+            [:CPP, :C, :ASM].each do |type|
+              puts " #{type} defines"
+              (blockDefs[type] + intDefs[type]).uniq.each { |d| puts "  #{d}" }
+            end
+            puts " done"
+          end
+        end
+
+        if Bake.options.json
+          require "json"
+          puts JSON.pretty_generate(projs)
+        end
+
+        ExitHelper.exit(0) }
+      end
+
+    end
+  end
+end

data/lib/common/abortException.rb

@@ -1,4 +1,4 @@
-module Bake
-  class AbortException < StandardError
-  end
-end
+module Bake
+  class AbortException < StandardError
+  end
+end

data/lib/common/cleanup.rb

@@ -1,10 +1,10 @@
-module Bake
-
-    def self.cleanup()
-      Blocks::ALL_BLOCKS.clear
-      Blocks::ALL_COMPILE_BLOCKS.clear
-      Blocks::CC2J.clear
-      Bake::IDEInterface.instance.set_abort(false)
-    end
-
-end
+module Bake
+
+    def self.cleanup()
+      Blocks::ALL_BLOCKS.clear
+      Blocks::ALL_COMPILE_BLOCKS.clear
+      Blocks::CC2J.clear
+      Bake::IDEInterface.instance.set_abort(false)
+    end
+
+end

data/lib/common/exit_helper.rb

@@ -1,38 +1,38 @@
-module Bake
-
-  class ExitHelper
-    @@exit_code = 0
-
-    def self.set_exit_code(val)
-      @@exit_code = val
-    end
-
-    def self.exit_code()
-      @@exit_code
-    end
-
-    def self.reset_exit_code()
-      @@exit_code = 0
-    end
-
-    def self.exit(val)
-      @@exit_code = val
-      Kernel::exit
-    end
-
-  end
-end
-
-at_exit do
-  if Bake::ExitHelper.exit_code != 0
-    exit(Bake::ExitHelper.exit_code)
-  elsif not $!.nil?
-    if $!.respond_to?("success?")
-      exit($!.success? ? 0 : 1)
-    else
-      exit(1)
-    end
-  else
-    exit(0)
-  end
-end
+module Bake
+
+  class ExitHelper
+    @@exit_code = 0
+
+    def self.set_exit_code(val)
+      @@exit_code = val
+    end
+
+    def self.exit_code()
+      @@exit_code
+    end
+
+    def self.reset_exit_code()
+      @@exit_code = 0
+    end
+
+    def self.exit(val)
+      @@exit_code = val
+      Kernel::exit
+    end
+
+  end
+end
+
+at_exit do
+  if Bake::ExitHelper.exit_code != 0
+    exit(Bake::ExitHelper.exit_code)
+  elsif not $!.nil?
+    if $!.respond_to?("success?")
+      exit($!.success? ? 0 : 1)
+    else
+      exit(1)
+    end
+  else
+    exit(0)
+  end
+end

data/lib/common/ext/file.rb

@@ -1,88 +1,88 @@
-require 'common/utils'
-
-class File
-
-  SLASH = '/'
-
-  def self.is_absolute?(filename)
-    filename[0] == SLASH or filename[1] == ':'
-  end
-
-  # seems both are rel or both are abs in all cases
-  def self.rel_from_to_project(from,to,endWithSlash = true)
-
-    return nil if from.nil? or to.nil?
-    
-    toSplitted = to.split('/')
-    fromSplitted = from.split('/')
-    
-    max = [toSplitted.length, fromSplitted.length].min
-    
-    
-    return nil if max < 1
-    
-    i = 0
-    
-    # path letter in windows may be case different
-    toIsWindowsAbs = false
-    if toSplitted[0].length > 1 and fromSplitted[0].length > 1
-      toIsWindowsAbs = toSplitted[0][1] == ':'
-      i = 1  if toIsWindowsAbs and fromSplitted[0][1] == ':' and toSplitted[0][0].downcase == fromSplitted[0][0].downcase
-    end
-    
-    if (toIsWindowsAbs and i==0)
-      res = to
-      res += "/" if endWithSlash 
-      return res	  
-    end
-    
-    while i < max
-        break if toSplitted[i] != fromSplitted[i] 
-      i += 1
-    end
-    j = i
-    
-    res = []
-    while i < fromSplitted.length
-      res << ".."
-      i += 1
-    end
-    
-    while j < toSplitted.length
-      res << toSplitted[j]
-      j += 1
-    end
-    
-    if res.length == 0
-      return ""
-    end
-    
-    res = res.join('/')
-    res += "/" if endWithSlash 
-    res
-  end
-
-  
-  def self.add_prefix(prefix, file)
-    if not prefix or is_absolute?(file)
-      file
-    else
-      prefix + file
-    end
-  end
-
-  def self.which(cmd)
-    return "" if not cmd
-    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      exts.each { |ext|
-        exe = File.join(path, "#{cmd}#{ext}")
-        if File.executable?(exe) && !File.directory?(exe)
-          return File.dirname(exe.gsub(/[\\]/,'/'))
-        end 
-      }
-    end
-    return ""
-  end
-  
-end
+require 'common/utils'
+
+class File
+
+  SLASH = '/'
+
+  def self.is_absolute?(filename)
+    filename[0] == SLASH or filename[1] == ':'
+  end
+
+  # seems both are rel or both are abs in all cases
+  def self.rel_from_to_project(from,to,endWithSlash = true)
+
+    return nil if from.nil? or to.nil?
+
+    toSplitted = to.split('/')
+    fromSplitted = from.split('/')
+
+    max = [toSplitted.length, fromSplitted.length].min
+
+
+    return nil if max < 1
+
+    i = 0
+
+    # path letter in windows may be case different
+    toIsWindowsAbs = false
+    if toSplitted[0].length > 1 and fromSplitted[0].length > 1
+      toIsWindowsAbs = toSplitted[0][1] == ':'
+      i = 1  if toIsWindowsAbs and fromSplitted[0][1] == ':' and toSplitted[0][0].downcase == fromSplitted[0][0].downcase
+    end
+
+    if (toIsWindowsAbs and i==0)
+      res = to
+      res += "/" if endWithSlash
+      return res
+    end
+
+    while i < max
+        break if toSplitted[i] != fromSplitted[i]
+      i += 1
+    end
+    j = i
+
+    res = []
+    while i < fromSplitted.length
+      res << ".."
+      i += 1
+    end
+
+    while j < toSplitted.length
+      res << toSplitted[j]
+      j += 1
+    end
+
+    if res.length == 0
+      return ""
+    end
+
+    res = res.join('/')
+    res += "/" if endWithSlash
+    res
+  end
+
+
+  def self.add_prefix(prefix, file)
+    if not prefix or is_absolute?(file)
+      file
+    else
+      prefix + file
+    end
+  end
+
+  def self.which(cmd)
+    return "" if not cmd
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        if File.executable?(exe) && !File.directory?(exe)
+          return File.dirname(exe.gsub(/[\\]/,'/'))
+        end
+      }
+    end
+    return ""
+  end
+
+end