RubyGems - bake-toolkit - Versions diffs - 1.6.3 → 1.7.0 - Mend

bake-toolkit 1.6.3 → 1.7.0

Files changed (17) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ccfcd558947800743a439c620fc245fd0cf4e58
-  data.tar.gz: fea010d1a29e106d660b7bf00918585f5b165cec
+  metadata.gz: a490c7db651ab2f105560e8ecd219f374bdc1ea3
+  data.tar.gz: 5dcc57cb1ff99210057f5a39d5e735962a3ee428
 SHA512:
-  metadata.gz: 2b849c627ab09226f816b167380711b891b1af687d9c1038068ce5e5f30af49bce0f3b5ff98024b096e7c7731afd125d9cb9ac5e372cbd6b9a14eca112b9d509
-  data.tar.gz: 8cd7af10d8a8fbba3172f624cb2e8f9042bca5284333d2ed0cf1507c043a02d4f224cb62df6b9b4a2755dd30b53354c4ba45febd32ef85cf2e139627ffc5a191
+  metadata.gz: a3db8a4eed4a2d21c891bbe20aecf9622ef0b00bde737f6f009ccfbf9e6f456cc3b777b8fa7190120a846ca7835d107c78a20df6f3950eb28147104c629b6b11
+  data.tar.gz: fe27f9b7f8807586e244afc439920106152e6216789559d72534e3fa7c340e28ef3dadc67ca4986b549a9df89a92e4d863196f92ab757b7d72767e78478dccbb

data/bin/bake CHANGED Viewed

@@ -5,7 +5,7 @@ $timeStart = Time.now
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'bake/version'
-$:.unshift(File.dirname(__FILE__)+"/../../cxxproject.git/lib")
+$:.unshift(File.dirname(__FILE__)+"/../../cxxproject/lib")
 require "cxxproject/version"

data/bin/bakery CHANGED Viewed

@@ -5,7 +5,7 @@ $timeStart = Time.now
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'bake/version'
-$:.unshift(File.dirname(__FILE__)+"/../../cxxproject.git/lib")
+$:.unshift(File.dirname(__FILE__)+"/../../cxxproject/lib")
 require "cxxproject/version"
 require 'cxxproject/utils/utils'

data/doc/further/change.html CHANGED Viewed

@@ -7,6 +7,15 @@
 <body>
 <h1>Changelog</h1>
+November 4, 2014 - bake-toolkit 1.7.0<br>
+<ul>
+<li><b>Added: Option to define output directory relative/absolute for each project or for all projects.</b>
+<li><b>Added: --set command line option to set variables</b>
+<li><b>Added: Optional "Description" tag for projects in Project.meta</b>
+<li><b>Changed: Variables in DefaultToolchain will be substituted separately for each project.</b>
+</b>
+</ul>
 August 8, 2014 - bake-toolkit 1.6.3<br>
 <ul>
 <li><b>Fixed: possible uninitialized variable could lead to crash bake</b>

data/doc/further/issues.html CHANGED Viewed

@@ -11,8 +11,10 @@
 <b>Workaround 1</b>: Clean the project.<br>
 <b>Workaround 2</b>: Delete the archive/executable manually.<br>
 <b>Workaround 3</b>: Touch, edit, create another source file.<br>
+<li>Pathes given to lint may be unit pathes, must be converted (will be fixed soon).
 </ul>
 </body>
 </html>

data/doc/further/wish.html CHANGED Viewed

@@ -26,12 +26,13 @@ Features listed on this page are open for discussion.
 Reason: require statements take round about two seconds before the build can be started. Two seconds is very much when building a single file.
 <li>Exporter: add some more logic for exclude build directories to reduce useless definitions in Project.meta files
 <li>Additional redirect from errors and warnings in a log file.
-<li>Variables in main Project.meta which are usable in subprojects.
 <li>Conditional variables like ifeq ($(VIDEO_MODE_12BIT_JPEG), 1)
 <li>Better annotations undefined symbol errors (if e.g. filename is given in error message)
 <li>Doxygen parameter to generate Doxygen, maybe with AutoOpen from Eclipse?
-<li>Meta Config in Workspace root
 <li>Even shorter command line options
+<li>Export defines to Eclipse
+<li>Better error log in Eclipse if plugin does not work
+<li>Doxygen support or even better generic docu support
 </ul>
 </body>

data/doc/index.html CHANGED Viewed

@@ -72,7 +72,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
 <p>
 <hr>
-<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.6.3</td><td align="right">August 8, 2014</td></tr></table>
+<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.7.0</td><td align="right">November 4, 2014</td></tr></table>
 </body>

data/doc/syntax/subst.html CHANGED Viewed

@@ -16,7 +16,10 @@
 <h1>Variable substitution in Project.meta</h1>
 <h3>Substituted variables</h3>
-A variable can be defined with the Set keyword in Project.meta (see syntax documentation):
+A variable can be defined with the --set command line option:
+<pre id="rundrum"><code>bake ... --set MyVar=DEBUG</code></pre>
+<p>
+This can also be done by the Set keyword in Project.meta (see syntax documentation):
 <p>
 <table border="1">
   <tr><th bgcolor="#CCCCCC">Example</th><th bgcolor="#CCCCCC">Output</th></tr>
@@ -32,6 +35,7 @@ bake includes also some standard variables:
   <tr><td>$(ConfigName)</td> <td>lib</td></tr>
   <tr><td>$(ProjectName)</td> <td>canDriver</td></tr>
   <tr><td>$(ProjectDir)</td> <td>C:/Root/MyProject</td></tr>
+  <tr><td>$(MainProjectDir)</td> <td>C:/Root/Main</td></tr>
   <tr><td>$(OutputDir)</td> <td>Debug_bootloader</td></tr>
   <tr><td>$(ArtifactName)</td> <td>bootloader_1.0.elf</td></tr>
   <tr><td>$(ArtifactNameBase)</td> <td>bootloader_1.0</td></tr>

data/doc/syntax/syntax.html CHANGED Viewed

@@ -67,6 +67,8 @@ z-index: 100;
 <span class="help" onMouseover="showProject()" onMouseout="notip()">Project</span> {<br>
 &nbsp; <br>
+&nbsp; <span class="help" onMouseover="showDescription()" onMouseout="notip()">Description</span>  &#60;text&#62;<br><br>
 &nbsp; <span class="help" onMouseover="showResponsible()" onMouseout="notip()">Responsible</span>  {<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showPerson()" onMouseout="notip()">Person</span> &#60;name&#62;,
               <span class="help" onMouseover="showPersonEmail()" onMouseout="notip()">email</span>: &#60;adr&#62;<br>
@@ -102,7 +104,7 @@ z-index: 100;
 &nbsp; &nbsp; <span class="help" onMouseover="showPostSteps()" onMouseout="notip()">PostSteps</span> {<br>
 &nbsp; &nbsp; &nbsp; <span class="mycomment"># Same as for PreSteps</span><br>
 &nbsp; &nbsp; }<br>
-&nbsp; &nbsp; <span class="help" onMouseover="showDefaultToolchain()" onMouseout="notip()">DefaultToolchain</span> &#60;basedOn&#62; {<br>
+&nbsp; &nbsp; <span class="help" onMouseover="showDefaultToolchain()" onMouseout="notip()">DefaultToolchain</span> &#60;basedOn&#62; <span class="help" onMouseover="showOutputDir()" onMouseout="notip()">outputDir</span>: &#60;dir&#62; {<br>
 &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showDefaultCompiler()" onMouseout="notip()">Compiler</span> ASM | CPP | C,
                                           <span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: &#60;cmd&#62; {</i><br>
 &nbsp; &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showDefaultFlags()" onMouseout="notip()">Flags</span> &#60;flags&#62;<br>
@@ -129,7 +131,7 @@ z-index: 100;
 &nbsp; &nbsp; }<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showExcludeFiles()" onMouseout="notip()">ExcludeFiles</span> &#60;pattern&#62;<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showIncludeDir()" onMouseout="notip()">IncludeDir</span> &#60;dir&#62;<br>
-&nbsp; &nbsp; <span class="help" onMouseover="showToolchainProject()" onMouseout="notip()">Toolchain</span> {<br>
+&nbsp; &nbsp; <span class="help" onMouseover="showToolchainProject()" onMouseout="notip()">Toolchain</span> <span class="help" onMouseover="showOutputDir()" onMouseout="notip()">outputDir</span>: &#60;dir&#62; {<br>
 &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showCompiler()" onMouseout="notip()">Compiler</span> ASM | CPP | C,
                                          <span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: &#60;cmd&#62; {</i><br>
 &nbsp; &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showFlags()" onMouseout="notip()">Flags</span> &#60;flags&#62;, add: &#60;flags&#62;, remove: &#60;flags&#62;<br>
@@ -189,17 +191,23 @@ function showProject() {
 function showResponsible() {
   str = "Specify all responsible persons of the project."
-  ddrivetip("Responsible", "Not yet, but in future,", "0..1", "-",str)
+  ddrivetip("Responsible", "No,", "0..1", "-",str)
+}
+function showDescription() {
+  str = 'Description of the project.'
+  ddrivetip("Description", "No", "0..1", "-",str)
 }
 function showPerson() {
   str = 'Person who is responsible for the project.'
-  ddrivetip("Person", "Not yet, but in future", "0..1", "-",str)
+  ddrivetip("Person", "No", "0..1", "-",str)
 }
 function showPersonEmail() {
   str = 'Use always double quotes (") for the email address.'
-  ddrivetip("email", "Not yet, but in future", "-", "-",str)
+  ddrivetip("email", "No", "-", "-",str)
 }
 function showExecutableConfig() {
@@ -346,6 +354,16 @@ function showCommandLine() {
   ddrivetip("CommandLine", "No","0..n","-",getCommandLineDesc())
 }
+function showOutputDir() {
+  str = 'Specifies the output folder.<p>'+
+    'Use always relative paths, not absolute paths due to portability.<p>'+
+    'Use always "/" and not "\\".<p>'+
+    'If the first part of the path is equal to a project name, it is used as a shortcut to this project root. <br>'+
+    'To avoid this magic, use something like this: <br>'+
+    '<i> &nbsp; &nbsp; IncludeDir "./abc/include"</i><br>'
+  ddrivetip("outputdir", "No","0..1","-",str)
+}
 function showExtends() {
 	ddrivetip("extends", "No","0..1","-","Inherit settings from a parent config.<br>For more information see docu page 'Derive configs'.")
 }

data/lib/bake/model/language.rb CHANGED Viewed

@@ -33,6 +33,8 @@ module Cxxproject
         ["lib"]
       elsif c.name == "DefaultToolchain"
         ["basedOn"]
+      elsif c.name == "Description"
+        ["text"]
       else
         ["name"]
       end

data/lib/bake/model/metamodel.rb CHANGED Viewed

@@ -72,6 +72,7 @@ module Cxxproject
       class DefaultToolchain < ModelElement
         has_attr 'basedOn', String, :defaultValueLiteral => ""
+        has_attr 'outputDir', String, :defaultValueLiteral => ""
         contains_many 'compiler', Compiler, 'parent'
         contains_one 'archiver', Archiver, 'parent'
         contains_one 'linker', Linker, 'parent'
@@ -79,6 +80,7 @@ module Cxxproject
       end
       class Toolchain < ModelElement
+        has_attr 'outputDir', String, :defaultValueLiteral => ""
         contains_many 'compiler', Compiler, 'parent'
         contains_one 'archiver', Archiver, 'parent'
         contains_one 'linker', Linker, 'parent'
@@ -90,6 +92,10 @@ module Cxxproject
         has_attr 'email', String, :defaultValueLiteral => ""
       end
+      class Description < ModelElement
+        has_attr 'text', String, :defaultValueLiteral => ""
+      end
       class Responsible < ModelElement
         contains_many "person", Person, 'parent'
       end
@@ -212,9 +218,7 @@ module Cxxproject
       end
       class Project < ModelElement
-        #has_attr 'name', String  do
-        #  annotation :details => {'internal' => 'true'}
-        #end
+        contains_one 'description', Description, 'parent'
         contains_one 'responsible', Responsible, 'parent'
         contains_many 'config', BaseConfig_INTERNAL, 'parent'

data/lib/bake/options.rb CHANGED Viewed

@@ -10,10 +10,12 @@ module Cxxproject
     attr_reader :roots, :include_filter, :exclude_filter # String List
     attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :linkOnly, :check_uninc, :printLess, :no_autodir, :clobber, :lint, :debug, :cmake # Boolean
     attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
+    attr_reader :vars # map
     def initialize(argv)
       super(argv)
+      @vars = {}
       @build_config = ""
       @main_dir = nil
       @project = nil
@@ -68,6 +70,7 @@ module Cxxproject
       add_option(Option.new("-v2",false)                   {     set_v(2)                   })
       add_option(Option.new("--debug",false)               {     set_debug                  })
+      add_option(Option.new("--set",true)                  { |x| set_set(x)                 })
       add_option(Option.new("--clobber",false)             {     set_clobber                })
       add_option(Option.new("--ignore_cache",false)        {     set_nocache                })
@@ -124,6 +127,7 @@ module Cxxproject
       puts "                          'PRE' or 'POST' excludes all PreSteps respectively PostSteps."
       puts " --show_abs_paths         Compiler prints absolute filename paths instead of relative paths."
       puts " --no_autodir             Disable auto completion of paths like in IncludeDir"
+      puts " --set <key>=<value>      Sets a variable. Overwrites variables defined in Project.metas (can be used multiple times)."
       puts ""
       puts " --version                Print version."
       puts " -h, --help               Print this help."
@@ -331,6 +335,15 @@ module Cxxproject
       @socket = String === num ? num.to_i : num
     end
+    def set_set(str)
+      ar = str.split("=")
+      if not str.include?"=" or ar[0].length == 0
+        Printer.printError "Error: --set must be followed by key=value"
+        ExitHelper.exit(1)
+      end
+      @vars[ar[0]] = ar[1..-1].join("=")
+    end
     def set_lint_min(num)
       @lint_min = String === num ? num.to_i : num
     end

data/lib/bake/subst.rb CHANGED Viewed

@@ -2,7 +2,7 @@ module Cxxproject
   class Subst
-    def self.itute(config, projName, options, isMainProj)
+    def self.itute(config, projName, options, isMainProj, toolchain)
       @@configName = config.name
       @@projDir = config.parent.get_project_dir
@@ -23,7 +23,11 @@ module Cxxproject
         end
       end
-      @@userVarMap = {} if isMainProj
+      if isMainProj
+        @@userVarMap = {}
+      else
+        @@userVarMap = @@userVarMapMain.clone
+      end
       config.set.each do |s|
@@ -57,8 +61,13 @@ module Cxxproject
         end
       end
+      @@userVarMapMain = @@userVarMap.clone if isMainProj
-      3.times {subst(config)}
+      3.times {
+        subst(config);
+        substToolchain(toolchain)
+      }
       @@resolvedVars = 0
       lastFoundInVar = -1
@@ -86,8 +95,10 @@ module Cxxproject
         @@resolvedVars += 1
         var = str[posStart+2..posEnd-1]
-        if @@userVarMap.has_key?(var)
+        if @@options.vars.has_key?(var)
+          substStr << @@options.vars[var]
+        elsif @@userVarMap.has_key?(var)
           substStr << @@userVarMap[var]
         elsif var == "MainConfigName"
           substStr << @@options.build_config
@@ -138,9 +149,21 @@ module Cxxproject
       substStr
     end
+    def self.substToolchain(elem)
+      elem.each do |k, e|
+        if Hash === e or Array === e
+          substToolchain(e)
+        elsif String === e
+          elem[k] = substString(e)
+        end
+      end
+    end
     def self.subst(elem)
       elem.class.ecore.eAllAttributes_derived.each do |a|
         next if a.name == "file_name" or a.name == "line_number"
+        #next if Metamodel::DefaultToolchain === elem
         next if a.eType.name != "EString"
         substStr = substString(elem.getGeneric(a.name))
         elem.setGeneric(a.name, substStr)

data/lib/bake/util.rb CHANGED Viewed

@@ -39,6 +39,7 @@ end
 def integrateToolchain(tcs, toolchain)
   return tcs unless toolchain
+  tcs[:OUTPUT_DIR] = toolchain.outputDir if toolchain.outputDir != ""
   integrateLinker(tcs, toolchain.linker) if toolchain.respond_to?"linker"
   integrateArchiver(tcs, toolchain.archiver)
   toolchain.compiler.each do |c|

data/lib/bake/version.rb CHANGED Viewed

@@ -1,11 +1,11 @@
 module Cxxproject
   class Version
     def self.bake
-      "1.6.3"
+      "1.7.0"
     end
   end
-  expectedCxx = "0.5.74"
+  expectedCxx = "0.5.75"
   expectedRGen = "0.6.0"
   expectedRText = "0.2.0"

data/lib/tocxx.rb CHANGED Viewed

@@ -38,6 +38,7 @@ module Cxxproject
     def initialize(options)
       @options = options
+      @configTcMap = {}
       RakeFileUtils.verbose_flag = @options.verbose
     end
@@ -382,20 +383,31 @@ module Cxxproject
       Printer.printError "Error: --cmake not supported by this version."
     end
+    def getTc(config)
+      tcs = nil
+      if not Metamodel::CustomConfig === config
+        tcs = Utils.deep_copy(@defaultToolchain)
+        integrateToolchain(tcs, config.toolchain)
+      else
+        tcs = Utils.deep_copy(Cxxproject::Toolchain::Provider.default)
+      end
+      @configTcMap[config] = tcs
+    end
     def substVars
       @mainConfig = @project2config[@mainProjectName]
-        Subst.itute(@mainConfig, @mainProjectName, @options, true)
-      @project2config.each do |projName, config|
-        Subst.itute(config, projName, @options, false) if projName != @mainProjectName
-      end
       basedOn = @mainConfig.defaultToolchain.basedOn
       basedOn = "GCC_Lint" if @options.lint
       basedOnToolchain = Cxxproject::Toolchain::Provider[basedOn]
       @defaultToolchain = Utils.deep_copy(basedOnToolchain)
       integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
+      Subst.itute(@mainConfig, @mainProjectName, @options, true, getTc(@mainConfig))
+      @project2config.each do |projName, config|
+        Subst.itute(config, projName, @options, false, getTc(config)) if projName != @mainProjectName
+      end
     end
     def convert2bb
@@ -407,13 +419,7 @@ module Cxxproject
         bbModule = ModuleBuildingBlock.new("Project "+projName)
         bbModule.contents = []
-        tcs = nil
-        if not Metamodel::CustomConfig === config
-          tcs = Utils.deep_copy(@defaultToolchain)
-          integrateToolchain(tcs, config.toolchain)
-        else
-          tcs = Utils.deep_copy(Cxxproject::Toolchain::Provider.default)
-        end
+        tcs = @configTcMap[config]
         addSteps(config.postSteps, bbModule, projDir, "POST", tcs) if not @options.linkOnly
@@ -469,7 +475,10 @@ module Cxxproject
           end
           c.set_project_dir(projDir)
-          if projName == @mainProjectName
+          if tcs[:OUTPUT_DIR] != nil
+            p = convPath(tcs[:OUTPUT_DIR], config)
+            c.set_output_dir(p)
+          elsif projName == @mainProjectName
             c.set_output_dir(@options.build_config)
           else
             c.set_output_dir(@options.build_config + "_" + @mainProjectName)
@@ -842,13 +851,6 @@ module Cxxproject
         @runTask.prerequisites.clear
       end
-#RubyProf.start
-#result = RubyProf.stop
-#printer = RubyProf::FlatPrinter.new(result)
-#printer.print(STDOUT)
       return true
     end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cxxproject
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.74
+        version: 0.5.75
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.74
+        version: 0.5.75
 - !ruby/object:Gem::Dependency
   name: rtext
   requirement: !ruby/object:Gem::Requirement