bake-toolkit 2.14.0 → 2.15.0

data/lib/bakery/options/options.rb

@@ -42,8 +42,8 @@ module Bake
       puts "Note: all parameters except -b, -m and -h will be passed to bake - see bake help for more options." 
     end
   
-    def parse_options()
-      parse_internal(true)
+    def parse_options(bakeOptions)
+      parse_internal(true, bakeOptions)
       set_collection_dir(Dir.pwd) if @collection_dir.nil?
       if @roots.length == 0
         @roots = @def_roots 

data/lib/blocks/block.rb

@@ -15,7 +15,7 @@ module Bake
 
     class Block
 
-      attr_reader :lib_elements, :projectDir, :library, :config, :projectName
+      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :warnConvValid
       attr_accessor :visited, :inDeps, :result, :circularCheck
 
       def startupSteps
@@ -70,17 +70,20 @@ module Bake
         @lib_elements = Bake::LibElements.calcLibElements(self)
       end
       
-      def convPath(dir, elem=nil)
+      def convPath(dir, elem=nil, warnIfLocal=false)
          if dir.respond_to?("name")
            d = dir.name
            elem = dir
          else
            d = dir
          end
+                  
+         @warnConvValid = false
          
          return d if Bake.options.no_autodir
          
          inc = d.split("/")
+         res = nil
          if (inc[0] == @projectName)
            res = inc[1..-1].join("/") # within self
            res = "." if res == "" 
@@ -92,15 +95,11 @@ module Bake
          else
            if (inc[0] != "..")
              return d if File.exists?(@projectDir + "/" + d) # e.g. "include"
-           
              # check if dir exists without Project.meta entry
              Bake.options.roots.each do |r|
                absIncDir = r+"/"+d
                if File.exists?(absIncDir)
                  res = File.rel_from_to_project(@projectDir,absIncDir,false)
-                 if not res.nil?
-                   return res
-                 end 
                end
              end
            else
@@ -109,8 +108,14 @@ module Bake
              end
            end
            
-           res = d # relative from self as last resort
+           if res.nil? # relative from self as last resort
+             warnIfLocal = false # no path magic -> no warning
+             res = d 
+           end
          end
+         
+         @warnConvValid = File.exists?(@projectDir + "/" + d) if warnIfLocal # only warn if path magic hides local path
+            
          res
        end      
       

data/lib/blocks/compile.rb

@@ -243,6 +243,10 @@ module Bake
         
           calcSources
           calcObjects
+
+          @incWarns.each do |x|
+            Bake.formatter.printInfo("IncludeDir '#{x[0].name}' will be converted to '#{x[1]}' although local path exists. If not intended, use './#{x[0].name}'.", x[0])
+          end if Bake.options.verbose >= 1
           
           @error_strings = {}
           
@@ -424,18 +428,23 @@ module Bake
           return Bake.options.roots.map { |r| File.rel_from_to_project(@projectDir,r,false) }
         end
         
-        i = orgBlock.convPath(inc)
+        i = orgBlock.convPath(inc,nil,true)
         if orgBlock != @block
           if not File.is_absolute?(i)
             i = File.rel_from_to_project(@projectDir,orgBlock.config.parent.get_project_dir) + i
           end
         end
         
-        Pathname.new(i).cleanpath
+        x = Pathname.new(i).cleanpath
+        if orgBlock.warnConvValid
+          @incWarns << [inc, x]
+        end
+        x
       end
 
       def calcIncludes
-                
+        @incWarns = []
+          
         @include_list = @config.includeDir.uniq.map do |dir|
           mapInclude(dir, @block)
         end

data/lib/blocks/library.rb

@@ -6,21 +6,28 @@ module Bake
     
     class Library < BlockBase
       
-      attr_reader :compileBlock
+      attr_reader :compileBlock, :archive_name
       
       def initialize(block, config, referencedConfigs, tcs, compileBlock)
         super(block,config, referencedConfigs, tcs)
         @compileBlock = compileBlock
         
         block.set_library(self)
+        
+        calcArtifactName
       end
       
-      def archive_name()
-        @archive_name ||= File.join([@output_dir, "lib#{@projectName}.a"])
+      def calcArtifactName
+        if not @config.artifactName.nil? and @config.artifactName.name != "" 
+          baseFilename = @config.artifactName.name
+        else
+          baseFilename = "lib#{@projectName}.a"
+        end
+        @archive_name ||= File.join([@output_dir, baseFilename])
       end
   
       def calcCmdlineFile()
-        archive_name + ".cmdline"
+        @archive_name + ".cmdline"
       end
       
       def ignore?
@@ -29,9 +36,9 @@ module Bake
       
       def needed?
         # lib
-        return "because library does not exist" if not File.exists?(archive_name)
+        return "because library does not exist" if not File.exists?(@archive_name)
 
-        aTime = File.mtime(archive_name)
+        aTime = File.mtime(@archive_name)
                 
         # sources
         @compileBlock.objects.each do |obj|
@@ -67,20 +74,20 @@ module Bake
           cmd += archiver[:ARCHIVE_FLAGS].split(" ")
             
           if archiver[:ARCHIVE_FLAGS_SPACE]
-            cmd << archive_name
+            cmd << @archive_name
           else
-            cmd[cmd.length-1] += archive_name
+            cmd[cmd.length-1] += @archive_name
           end
           
           cmd += @compileBlock.objects
         
           return true if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
         
-          BlockBase.prepareOutput(archive_name)
+          BlockBase.prepareOutput(@archive_name)
           
           BlockBase.writeCmdLineFile(cmd, cmdLineFile)
           success, consoleOutput = ProcessHelper.run(cmd, false, false)
-          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{archive_name}", reason, success)
+          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{@archive_name}", reason, success)
          
           check_config_file()
           return success

data/lib/common/options/parser.rb

@@ -24,25 +24,47 @@ module Bake
       opt.block
     end
     
-    def parse_internal(ignore_invalid = false)
+    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
-          if not @arguments.include?@argv[pos]
-            index = @argv[pos].index('-')
+          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 #{@argv[pos]} unknown" if not ignore_invalid
+              raise "Option #{arg} unknown" if not ignore_invalid
             else
-              @arguments[""].call(@argv[pos]) # default paramter without "-"
+              @arguments[""].call(arg) # default paramter without "-"
             end
           else
-            option = @arguments[@argv[pos]]
+            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 #{@argv[pos]} missing" 
+                raise "Argument for option #{arg} missing" 
               end
             else
               option.call()

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.14.0"
+      "2.15.0"
     end
   end
     

data/lib/vs/options.rb

@@ -31,7 +31,7 @@ module Bake
     end
   
     def parse_options()
-      parse_internal()
+      parse_internal(false)
       @roots << Dir.pwd if @roots.length == 0
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext