bake-toolkit 2.27.0 → 2.28.0

data/lib/blocks/compile.rb

@@ -196,8 +196,6 @@ module Bake
           check_config_file
         end
 
-        Bake::Bundle.instance.addSource(source, @include_list, dep_filename_conv) if isMainProject?
-
       end
 
       def self.read_depfile(dep_filename, projDir, singleLine)

data/lib/blocks/executable.rb

@@ -35,7 +35,7 @@ module Bake
 
       def calcMapFile
         @mapfile = nil
-        if (not Bake.options.docu) and (not Bake.options.lint) and (not @config.mapFile.nil?)
+        if (not Bake.options.docu) and (not @config.mapFile.nil?)
           if @config.mapFile.name == ""
             @mapfile = @exe_name.chomp(File.extname(@exe_name)) + ".map"
           else
@@ -153,8 +153,6 @@ module Bake
             check_config_file()
           end
 
-          Bake::Bundle.instance.addBinary(@exe_name, @linker_script, isMainProject? ? @config : nil)
-
           return success
         end
       end

data/lib/blocks/fileList.rb

@@ -0,0 +1,53 @@
+require 'blocks/compile'
+
+module Bake
+
+  module Blocks
+
+    class FileList < Compile
+
+      def initialize(block, config, referencedConfigs, tcs)
+        super(block, config, referencedConfigs, tcs)
+      end
+
+      def execute
+        Dir.chdir(@projectDir) do
+          calcSources
+          calcObjects
+
+          projDir = File.expand_path(@projectDir)
+          headers = Set.new
+          @source_files.sort.each do |s|
+            puts "FILE: " + projDir+"/"+s
+            type = get_source_type(s)
+            if type.nil?
+              Bake.formatter.printError("Error: could not get type of source file #{s}")
+              ExitHelper.exit(1)
+            end
+            object = @object_files[s]
+            dep_filename = calcDepFile(object, type)
+            if type != :ASM
+              dep_filename_conv = calcDepFileConv(dep_filename)
+              if not File.exist?(dep_filename_conv)
+                Bake.formatter.printError("Error: dependency file doesn't exist for #{s}")
+                ExitHelper.exit(1)
+              end
+              File.readlines(dep_filename_conv).map {|line| headers << line.strip}
+            end
+          end
+          headers.map do |h|
+            habs = File.is_absolute?(h) ? h : projDir+"/"+h
+            File.expand_path(h)
+          end.sort.each { |h| puts "HEADER: " + h }
+        end
+        return true
+      end
+
+      def clean
+        # nothing to do here
+      end
+
+    end
+
+  end
+end

data/lib/blocks/has_execute_command.rb

@@ -4,8 +4,8 @@ module Bake
 
     module HasExecuteCommand
 
-      def executeCommand(commandLine, ignoreStr=nil, exitCodeArray = [0])
-        puts commandLine if Bake.options.verbose >= 1
+      def executeCommand(commandLine, ignoreStr=nil, exitCodeArray = [0], echo = "on")
+        puts commandLine if (Bake.options.verbose >= 1 && echo != "off") || Bake.options.verbose >= 3
         puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
         cmd_result = false
         output = ""

data/lib/blocks/library.rb

@@ -104,8 +104,6 @@ module Bake
             check_config_file()
           end
 
-          Bake::Bundle.instance.addLib(@archive_name, isMainProject? ? @config : nil)
-
           return success
         end
       end

data/lib/blocks/makefile.rb

@@ -76,22 +76,22 @@ module Bake
 
       def execute
         return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
        end
 
       def startupStep
         return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
       end
 
       def exitStep
         return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
       end
 
       def clean
         return true if Bake.options.linkOnly
-        return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes) unless Bake.options.filename
+        return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes, @config.echo) unless Bake.options.filename
       end
 
     end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.27.0"
+      "2.28.0"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -22,10 +22,9 @@ require 'blocks/commandLine'
 require 'blocks/makefile'
 require 'blocks/compile'
 require 'blocks/convert'
+require 'blocks/fileList'
 require 'blocks/library'
 require 'blocks/executable'
-require 'blocks/lint'
-require 'blocks/convert'
 require 'blocks/docu'
 
 require 'set'
@@ -97,6 +96,12 @@ module Bake
       config.dependency.each do |dep|
         @referencedConfigs[dep.name].each do |configRef|
           if configRef.name == dep.config
+
+            if configRef.private && configRef.parent.name != config.parent.name
+              Bake.formatter.printError("#{config.parent.name} (#{config.name}) depends on #{configRef.parent.name} (#{configRef.name}) which is private.", configRef)
+              ExitHelper.exit(1)
+            end
+
             block.dependencies << configRef.qname if not Bake.options.project# and not Bake.options.filename
             blockRef = Blocks::ALL_BLOCKS[configRef.qname]
             block.childs << blockRef
@@ -294,7 +299,7 @@ module Bake
           addSteps(block, block.startupSteps,  config.startupSteps)
           addSteps(block, block.exitSteps,  config.exitSteps)
 
-          if not Bake.options.prepro and not Bake.options.lint and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
+          if not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.file_list and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
             addSteps(block, block.preSteps,  config.preSteps)
             addSteps(block, block.postSteps, config.postSteps)
           end
@@ -302,13 +307,13 @@ module Bake
           if Bake.options.docu
             block.mainSteps << Blocks::Docu.new(config, @configTcMap[config])
           elsif Metamodel::CustomConfig === config
-            if not Bake.options.prepro and not Bake.options.lint and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
+            if not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.file_list and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
               addSteps(block, block.mainSteps, config) if config.step
             end
+          elsif Bake.options.file_list
+            block.mainSteps << Blocks::FileList.new(block, config, @referencedConfigs, @configTcMap[config])
           elsif Bake.options.conversion_info
             block.mainSteps << Blocks::Convert.new(block, config, @referencedConfigs, @configTcMap[config])
-          elsif Bake.options.lint
-            block.mainSteps << Blocks::Lint.new(block, config, @referencedConfigs, @configTcMap[config])
           else
             compile = Blocks::Compile.new(block, config, @referencedConfigs, @configTcMap[config])
             (Blocks::ALL_COMPILE_BLOCKS[projName] ||= []) << compile
@@ -401,8 +406,8 @@ module Bake
       end
 
       taskType = "Building"
-      if Bake.options.lint
-        taskType = "Linting"
+      if Bake.options.file_list
+        taskType = "Showing file list"
       elsif Bake.options.conversion_info
         taskType = "Showing conversion infos"
       elsif Bake.options.docu
@@ -442,40 +447,37 @@ module Bake
 
         @mainConfig = @referencedConfigs[Bake.options.main_project_name].select { |c| c.name == Bake.options.build_config }.first
 
-        if Bake.options.lint
-          @defaultToolchain = Utils.deep_copy(Bake::Toolchain::Provider["Lint"])
-        else
-          basedOn =  @mainConfig.defaultToolchain.basedOn
-          basedOnToolchain = Bake::Toolchain::Provider[basedOn]
-          if basedOnToolchain.nil?
-            Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", @mainConfig.defaultToolchain)
-            ExitHelper.exit(1)
-          end
+        basedOn =  @mainConfig.defaultToolchain.basedOn
+        basedOnToolchain = Bake::Toolchain::Provider[basedOn]
+        if basedOnToolchain.nil?
+          Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", @mainConfig.defaultToolchain)
+          ExitHelper.exit(1)
+        end
 
-          # The flag "-FS" must only be set for VS2013 and above
-          ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = ""
-          if basedOn == "MSVC"
-            begin
-              res = `cl.exe 2>&1`
-              raise Exception.new unless $?.success?
-              scan_res = res.scan(/ersion (\d+).(\d+).(\d+)/)
-              if scan_res.length > 0
-                ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = "-FS" if scan_res[0][0].to_i >= 18 # 18 is the compiler major version in VS2013
-              else
-                Bake.formatter.printError("Could not read MSVC version")
-                ExitHelper.exit(1)
-              end
-            rescue SystemExit
-              raise
-            rescue Exception => e
-              Bake.formatter.printError("Could not detect MSVC compiler")
+        # The flag "-FS" must only be set for VS2013 and above
+        ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = ""
+        if basedOn == "MSVC"
+          begin
+            res = `cl.exe 2>&1`
+            raise Exception.new unless $?.success?
+            scan_res = res.scan(/ersion (\d+).(\d+).(\d+)/)
+            if scan_res.length > 0
+              ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = "-FS" if scan_res[0][0].to_i >= 18 # 18 is the compiler major version in VS2013
+            else
+              Bake.formatter.printError("Could not read MSVC version")
               ExitHelper.exit(1)
             end
+          rescue SystemExit
+            raise
+          rescue Exception => e
+            Bake.formatter.printError("Could not detect MSVC compiler")
+            ExitHelper.exit(1)
           end
-
-          @defaultToolchain = Utils.deep_copy(basedOnToolchain)
-          Bake.options.envToolchain = true if (basedOn.include?"_ENV")
         end
+
+        @defaultToolchain = Utils.deep_copy(basedOnToolchain)
+        Bake.options.envToolchain = true if (basedOn.include?"_ENV")
+
         integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
 
         # todo: cleanup this hack

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 2.28.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -419,7 +419,6 @@ files:
 - documentation/_build/html/tips_and_tricks/tips_and_tricks.html
 - documentation/_build/html/why_bake/why_bake.html
 - lib/adapt/config/loader.rb
-- lib/bake/bundle.rb
 - lib/bake/cache.rb
 - lib/bake/config/checks.rb
 - lib/bake/config/loader.rb
@@ -449,7 +448,6 @@ files:
 - lib/bake/toolchain/errorparser/greenhills_linker_error_parser.rb
 - lib/bake/toolchain/errorparser/keil_compiler_error_parser.rb
 - lib/bake/toolchain/errorparser/keil_linker_error_parser.rb
-- lib/bake/toolchain/errorparser/lint_error_parser.rb
 - lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb
 - lib/bake/toolchain/errorparser/msvc_linker_error_parser.rb
 - lib/bake/toolchain/errorparser/process_output.rb
@@ -459,7 +457,6 @@ files:
 - lib/bake/toolchain/gcc_env.rb
 - lib/bake/toolchain/greenhills.rb
 - lib/bake/toolchain/keil.rb
-- lib/bake/toolchain/lint.rb
 - lib/bake/toolchain/msvc.rb
 - lib/bake/toolchain/provider.rb
 - lib/bake/toolchain/ti.rb
@@ -479,9 +476,9 @@ files:
 - lib/blocks/convert.rb
 - lib/blocks/docu.rb
 - lib/blocks/executable.rb
+- lib/blocks/fileList.rb
 - lib/blocks/has_execute_command.rb
 - lib/blocks/library.rb
-- lib/blocks/lint.rb
 - lib/blocks/makefile.rb
 - lib/blocks/showIncludes.rb
 - lib/common/abortException.rb

data/lib/bake/bundle.rb

@@ -1,159 +0,0 @@
-require 'fileutils'
-require 'common/ext/rtext'
-
-
-module Bake
-
-  class Bundle
-
-    def initialize()
-      cleanup()
-    end
-
-    def cleanup
-      @outputDir = nil
-      @result = true
-      @sources = []
-      @libs = []
-      @ls = nil
-    end
-
-    def self.instance
-      @@bundle ||= Bundle.new
-    end
-
-    def setOutputDir(dir)
-      @outputDir = dir
-      FileUtils.mkdir_p(@outputDir)
-    end
-
-    def addLib(lib, mainConfig)
-      return unless @outputDir
-      dir = @outputDir+"/lib"
-      FileUtils.mkdir_p(dir)
-      FileUtils.cp(lib, dir)
-      @libs << "lib/" + File.basename(lib) unless mainConfig
-      createProjectMeta(mainConfig)
-    end
-
-    def addBinary(exe, ls, mainConfig)
-      return unless @outputDir
-
-      dir = @outputDir+"/bin"
-      FileUtils.mkdir_p(dir)
-      FileUtils.cp(exe, dir)
-
-      if (ls and mainConfig)
-        lsDir = @outputDir+"/ls"
-        FileUtils.mkdir_p(lsDir)
-        FileUtils.cp(ls, lsDir)
-        @ls = "ls/" + File.basename(ls)
-      end
-
-      createProjectMeta(mainConfig)
-    end
-
-    def addSource(source, includeList, depFilename)
-      return unless @outputDir
-      if File.is_absolute?(source)
-        Bake.formatter.printWarning("Warning: '#{source}' is an absolute filename, this is not supported by bundle feature. File will be ignored.")
-        return
-      end
-      sdir = File.dirname(source)
-      dir = @outputDir
-      dir = dir + "/" + sdir unless sdir.empty?
-      FileUtils.mkdir_p(dir)
-      FileUtils.cp(source, dir)
-      @sources << source
-
-      addHeaders(makeAbsolute(includeList), parseDepFile(depFilename))
-    end
-
-    def addHeaders(absIncs, deps)
-      deps.each do |d|
-        absIncs.each do |a|
-          if d.start_with?a
-            filename = d[a.length+1..-1]
-            hdir = File.dirname(filename)
-            dir = @outputDir + "/inc"
-            dir = dir + "/" + hdir unless hdir.empty?
-            FileUtils.mkdir_p(dir)
-            FileUtils.cp(d, dir)
-            next
-          end
-        end
-      end
-    end
-
-    def makeAbsolute(includeList)
-      includeList.map { |x| File.expand_path(x) }
-    end
-
-    def parseDepFile(depFilename)
-      res = []
-      begin
-        File.readlines(depFilename).map{|line| line.strip}.each do |dep|
-          if File.exist?(dep)
-            res << File.expand_path(dep)
-          end
-        end
-      rescue Exception => ex
-      end
-      res
-    end
-
-    def createProjectMeta(mainConfig)
-      return unless mainConfig
-
-      project = Bake::Metamodel::Project.new
-      project.setDefault("bundle")
-      project.file_name = ""
-
-      config = mainConfig.class.new
-      config.setName("bundle")
-
-      project.setConfig([config])
-
-      sourceElements = @sources.map do |s|
-        source = Bake::Metamodel::Files.new
-        source.setName(s)
-        source
-      end
-      config.setFiles(sourceElements)
-
-      idir = Bake::Metamodel::IncludeDir.new
-      idir.setName("inc")
-      config.setIncludeDir([idir])
-
-      exLibs = @libs.map do |s|
-        lib = Bake::Metamodel::ExternalLibrary.new
-        lib.setName(s)
-        lib.setSearch(false)
-        lib
-      end
-      config.setLibStuff(exLibs)
-
-      if (mainConfig.toolchain)
-        config.setToolchain(Bake::MergeConfig.clone(mainConfig.toolchain))
-      end
-
-      if (mainConfig.defaultToolchain)
-        config.setDefaultToolchain(Bake::MergeConfig.clone(mainConfig.defaultToolchain))
-      end
-
-      if (@ls)
-        ls = Bake::Metamodel::LinkerScript.new
-        ls.setName(@ls)
-        config.setLinkerScript(ls)
-      end
-
-      s = StringIO.new
-      ser = RText::Serializer.new(Language)
-      ser.serialize(project, s)
-      File.write(@outputDir + "/Project.meta", s.string)
-
-    end
-
-  end
-
-end