bake-toolkit 2.13.1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ae365608038ccaf88303f9be5d0887da17c44e
-  data.tar.gz: 27c9988e483477fb3564edb94384ce8563956994
+  metadata.gz: 91d09292a427862e30c5186cd001f2d44a16c443
+  data.tar.gz: 5066825781d3e23c2f579fe515c0cbc018363a2b
 SHA512:
-  metadata.gz: 092287cccad07175f4486e8d7e1a1aad2cfc2b436cfa5e9b3724440456f0da06290650fb629534615c9b2fc821010b4ce933d3648e6f8fa0a5a7363bc9db0769
-  data.tar.gz: 9a7b6caffe913d55669bf72cd1cfc91b5d3afbf7feadfe4d26a733f8e7da1eb508548eaef79824ea448a6e7dc1e9a5a3714987c65e3cf15126c0344bbd55065b
+  metadata.gz: 76c2d19fdbc1e7c048be12b8c5cdc4ddb4650619701f6bf3e6967c8f63c6220dee43a9c6260326cbc82f3695018d51d339463351fd869c7f13c7fdf0f24a0ed4
+  data.tar.gz: 54d98c73eb4efffb313ae10a3dd59fac712f01ece458f17cd2e7437db970ddce0de0b1ee94d03b7ef2c47784a344f4ea5b03f689e072717b9976718c182c8b78

data/documentation/_build/html/_sources/changelog.txt

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+January 14, 2015 - bake-toolkit 2.14.0
+    * Added: possibility to change configs via command line, e.g. changing compiler, see "adapt" docu page
+    * Changed: extending configs in a Project.meta file made more generic, see "derive" docu page
+    * Changed: default order of filenames changed, now order in Project.meta has the highest priority as intended. Results of glob patterns are sorted alphabetically as before.
+    * Changed: libraries from makefiles are linked now after other libraries defined from the same config
+    * Added: IncludeDir now possible for CustomConfigs
+    * Bugfix: --abs-paths now works with --incs-and-defs
 December 23, 2015 - bake-toolkit 2.13.1
     * Bugfix: merging configs was extremely slow in 2.12.2 and 2.13.0
 December 23, 2015 - bake-toolkit 2.13.0

data/documentation/_build/html/_sources/index.txt

@@ -1,4 +1,4 @@
-bake 2.13.1
+bake 2.14.0
 ==========================================
 bake, building software **fast** and **easy**!
 

data/documentation/_build/html/_sources/syntax/adapt_configs.txt

@@ -0,0 +1,143 @@
+Adapt configs
+=============
+
+Introduction
+************
+
+If you want to manipulate existing configs without changing them, you can "adapt" them via command line.
+
+.. code-block:: console
+
+    User@Host:~$ bake test --adapt abc
+
+bake searches for abc/Adapt.meta within the workspace roots. If found, the configs from the adapt file are parsed:
+
+.. code-block:: text
+
+    Adapt {
+      ExecutableConfig ... # 0..n
+      LibraryConfig ... # 0..n
+      CustomConfig ... # 0..n
+    }
+
+Here is an example to change the DefaultToolchain
+
+.. code-block:: text
+
+    Adapt {
+      ExecutableConfig test, project: __MAIN__, type: replace {
+        DefaultToolchain GCC
+      }
+    }
+
+Effectiveness
+*************
+
+The adapt configs can be applied to all configs from regular build. This can be controlled by the config names and the project attributes. The example above
+is adapted only to the config "test" of the main project. __MAIN__ and __ALL__ are keywords. __MAIN__ means the main project or config, __ALL__ means all
+projects or configs. If you want to apply the changes only to the top level config, write:
+
+.. code-block:: text
+
+      ExecutableConfig __MAIN__, project: __MAIN__, ...
+
+If you want to apply the changes to all configs, write:
+
+.. code-block:: text
+
+      ExecutableConfig __ALL__, project: __ALL__, ...
+
+It is possible to mix the keywords with reals project or config names.
+
+Occurrences
+***********
+    
+You can specify more configs in one adapt file and you can specify more than one adapt file:
+
+.. code-block:: text
+
+    Adapt {
+      ExecutableConfig ..., project: ..., type: ... {
+        ...
+      }
+      ExecutableConfig ..., project: ..., type: ... {
+        ...
+      }
+      LibraryConfig ..., project: ..., type: ... {
+        ...
+      }
+      ...
+    }
+
+.. code-block:: console
+
+    User@Host:~$ bake test --adapt abc --adapt xy
+
+They will be applied in the specified order.
+
+Types
+*****
+
+It is possible to specify the type of adaption:
+
+.. code-block:: text
+
+      ExecutableConfig ..., type: replace
+
+The type can be "replace", "remove" or "extend".
+
+Type: extend
+------------
+
+This works exactly like for :doc:`derive_configs`.
+
+Type: remove
+------------
+
+If parent elements can be found which matches to the child elements, they will be removed.
+ 
+Example project config:
+
+.. code-block:: text
+
+    ExecutableConfig test {
+      DefaultToolchain GCC
+    }
+
+Example adapt configs:
+
+.. code-block:: text
+
+    ExecutableConfig __ALL__, project: __ALL__, type: remove {
+      DefaultToolchain # remove ok
+    }
+
+    ExecutableConfig __ALL__, project: __ALL__, type: remove {
+      DefaultToolchain GCC # remove ok
+    }
+
+    ExecutableConfig __ALL__, project: __ALL__, type: remove {
+      DefaultToolchain Diab # remove NOT ok
+    }
+
+    ExecutableConfig __ALL__, project: __ALL__, type: remove {
+      DefaultToolchain GCC, eclipseOrder: true # remove NOT ok
+    }
+
+Type: replace
+-------------
+
+This is for convenience. "replace" will remove all elements with the same type and extends the configs.
+
+Example:
+
+.. code-block:: text
+
+    ExecutableConfig __ALL__, project: __ALL__, type: replace {
+      Files "*.cpp"
+      DefaultToolchain GCC {
+        Linker command: "link.exe"
+      }
+    }
+
+This removes all "Files" and the "DefaultToolchain" from the original config regardless their attributes and replaces them by the elements of the adapt config.

data/documentation/_build/html/_sources/syntax/derive_configs.txt

@@ -19,75 +19,63 @@ Derving a config in bake is pretty straight forward, and looks like this:
 
     The config type of the parent config does not matter, but only settings which are valid in BOTH configs will be inherited.
     In the example above D gets the dependencies from A, because "Dependency" is valid in all configs, but D does not get 
-    the "Files" from A, because "Files" is not valid in CustomConfig.
+    the "Files" from A and B, because "Files" is not valid in CustomConfig.
 
 
 Inheritance implications
 ************************
 
-============================        =========================================
-Setting                             Derived
-============================        =========================================
-Set                                 parent + child
+In general it is very easy.
 
-Dependency                          parent + child
+- Elements which can exist more than once (e.g. "Files"), are simply concatenated. First the parent elements, then the client elements.
+- Elements which can exist only once:
+ 
+  - if it exists in EITHER child OR parent, use this one
+  - is it exists in BOTH, attributes are merged (child attributes have high priority) and sub elements are inherited recursively
 
-ExternalLibrary                     parent + child
-                                    (ordered by line number)
+The following example
 
-ExternalLibrarySearchPath           parent + child
-                                    (ordered by line number)
-
-UserLibrary                         parent + child
-                                    (ordered by line number)
-
-PreSteps                            parent + child
-
-PostSteps                           parent + child
-
-Makefile                            used from parent if not 
-                                    in child
-
-CommandLine                         used from parent if not
-                                    in child 
-
-Files                               parent + child
-
-ExcludeFiles                        parent + child
-
-IncludeDir                          parent + child
-
-LinkerScript                        used from parent if not in child
-
-ArtifactName                        used from parent if not in child
-
-MapFile                             used from parent if not in child
-============================        =========================================
-
-
-============================        =========================================
-Toolchain Setting                   Derived
-============================        =========================================
-basedOn                             used from parent if not in child
-
-outputDir                           used from parent if not in child
-
-command                             used from parent if not in child
-
-LibPrefixFlags                      parent + child
-
-LibPostfixFlags                     parent + child
-
-Flags                               parent + child
-
-Define                              parent + child
-
-InternalDefines                     used from parent if not in child
+.. code-block:: text
 
-InternalIncludes                    used from parent if not in child
+    ExecutableConfig A {
+      Files "x.cpp"
+      Files "y.cpp"
+      ArtifactName "z.exe"
+      DefaultToolchain GCC {
+        Linker {
+          Flags "-O3"
+        }
+      }
+    }
+    ExecutableConfig B, extends: A {
+      Files "z.cpp"
+      IncludeDir "inc"
+      ArtifactName "a.exe"
+      DefaultToolchain Diab {
+        Compiler CPP {
+          Define "TEST"
+        }
+      }
+    }
+    
+results implicitly in:
 
-LintPolicy                          parent + child
+.. code-block:: text
 
-Docu                                used from parent if not in child
-============================        =========================================
+    ExecutableConfig B {
+      Files "x.cpp"
+      Files "y.cpp"
+      Files "z.cpp"
+      IncludeDir "inc"
+      ArtifactName "a.exe"
+      DefaultToolchain Diab {
+        Compiler CPP {
+          Define "TEST"
+        }
+        Linker {
+          Flags "-O3"
+        }
+      }
+    }
+    
 

data/documentation/_build/html/_sources/syntax/syntax.txt

@@ -7,4 +7,5 @@ Syntax
     project_meta_syntax
     variable_substitutions
     derive_configs
+    adapt_configs
 

data/documentation/_build/html/_static/syntax.html

@@ -69,6 +69,8 @@ z-index: 100;
 			  
 			  <span><span style="background-color:#EEEEEE;" class="show">
 &nbsp; &nbsp; <span class="mycomment"># Valid for all config types</span><br><br>
+&nbsp; &nbsp; <span class="help" onMouseover="showDescription()" onMouseout="notip()">Description</span>  &#60;text&#62;<br>
+&nbsp; &nbsp; <span class="help" onMouseover="showIncludeDir()" onMouseout="notip()">IncludeDir</span> &#60;dir&#62;, <span class="help" onMouseover="showInherit()" onMouseout="notip()">inherit</span>: true|false, <span class="help" onMouseover="showInfix()" onMouseout="notip()">inject</span>: front|back<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showSet()" onMouseout="notip()">Set</span> &#60;variable&#62;, value: &#60;value&#62; | cmd: &#60;line&#62;, <span class="help" onMouseover="showEnv()" onMouseout="notip()">env</span>: true|false<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showDependency()" onMouseout="notip()">Dependency</span> &#60;project&#62;,
               <span class="help" onMouseover="showDependencyConfig()" onMouseout="notip()">config</span>: &#60;name&#62;<br>
@@ -151,7 +153,6 @@ z-index: 100;
 &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showFilesDefine()" onMouseout="notip()">Define</span> &#60;define&#62;<br>
 &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;, <span class="help" onMouseover="showInherit()" onMouseout="notip()">inherit</span>: true|false, <span class="help" onMouseover="showInfix()" onMouseout="notip()">inject</span>: front|back<br>
 
 </span><br></span>
 
@@ -217,7 +218,7 @@ function showResponsible() {
 }
 
 function showDescription() {
-  str = 'Description of the project.'
+  str = 'Description of the project or config.'
   ddrivetip("Description", "No", "0..1", "-",str)
 }
 
@@ -403,7 +404,8 @@ function showCommandLine() {
 
 
 function showEclipseOrder() {
-  str = 'If not specified or false, all files are compiled in alphabetical order using their full names.<p>'+
+  str = 'If not specified or false, all files are compiled in order of appearance in Project.meta. '+
+  'If the filename is a glob pattern, files are sorted alphabetically.<p>'+
   'If true, files are compiled in alphabetical order within a folder, '+
   'but the folders are sorted in reverse alphabetical order.<br>'+
   'This is only used for backward compatibility.'
@@ -662,14 +664,14 @@ return false
 
 function positiontip(e){
 if (enabletip){
-var curX=(ns6)?e.pageX : event.clientX+ietruebody().scrollLeft;
-var curY=(ns6)?e.pageY : event.clientY+ietruebody().scrollTop;
+var curX=(ns6)?e.offsetX : event.clientX+ietruebody().scrollLeft;
+var curY=(ns6)?e.pageY-80 : event.clientY+ietruebody().scrollTop;
 //Find out how close the mouse is to the corner of the window
 var rightedge=ie&&!window.opera? ietruebody().clientWidth-event.clientX-offsetxpoint : window.innerWidth-e.clientX-offsetxpoint
 var bottomedge=ie&&!window.opera? ietruebody().clientHeight-event.clientY-offsetypoint*2 : window.innerHeight-e.clientY-offsetypoint
 var bottom=ie&&!window.opera? ietruebody().clientHeight : window.innerHeight
 
-var leftedge=(offsetxpoint<0)? offsetxpoint*(-1) : -1000
+var leftedge=(offsetxpoint<0)? offsetxpoint*(-1) : offsetxpoint
 
 //if the horizontal distance isn't enough to accomodate the width of the context menu
 if (rightedge<tipobj.offsetWidth+offsetxpoint/2)
@@ -690,6 +692,7 @@ tipobj.style.visibility="visible"
 }
 }
 
+
 function notip(){
 if (ns6||ie){
 enabletip=false

data/documentation/_build/html/changelog.html

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Changelog &mdash; bake 2.13.1 documentation</title>
+    <title>Changelog &mdash; bake 2.14.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '2.13.1',
+        VERSION:     '2.14.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.13.1 documentation" href="index.html" />
+    <link rel="top" title="bake 2.14.0 documentation" href="index.html" />
     <link rel="next" title="License" href="license.html" />
     <link rel="prev" title="Known Issues" href="known_issues.html" />
 <meta charset='utf-8'>
@@ -140,6 +140,16 @@
   <div class="section" id="changelog">
 <h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">¶</a></h1>
 <dl class="docutils">
+<dt>January 14, 2015 - bake-toolkit 2.14.0</dt>
+<dd><ul class="first last simple">
+<li>Added: possibility to change configs via command line, e.g. changing compiler, see &#8220;adapt&#8221; docu page</li>
+<li>Changed: extending configs in a Project.meta file made more generic, see &#8220;derive&#8221; docu page</li>
+<li>Changed: default order of filenames changed, now order in Project.meta has the highest priority as intended. Results of glob patterns are sorted alphabetically as before.</li>
+<li>Changed: libraries from makefiles are linked now after other libraries defined from the same config</li>
+<li>Added: IncludeDir now possible for CustomConfigs</li>
+<li>Bugfix: &#8211;abs-paths now works with &#8211;incs-and-defs</li>
+</ul>
+</dd>
 <dt>December 23, 2015 - bake-toolkit 2.13.1</dt>
 <dd><ul class="first last simple">
 <li>Bugfix: merging configs was extremely slow in 2.12.2 and 2.13.0</li>
@@ -842,7 +852,7 @@ write a PreStep which copies the file from the new location to the old one.</p>
       
     </p>
     <p>
-        &copy; Copyright 2015, E.S.R.Labs AG.<br/>
+        &copy; Copyright 2016, E.S.R.Labs AG.<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.3.1.<br/>
     </p>
   </div>

data/documentation/_build/html/commandline/commandline.html

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Commandline &mdash; bake 2.13.1 documentation</title>
+    <title>Commandline &mdash; bake 2.14.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.13.1',
+        VERSION:     '2.14.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,9 +29,9 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.13.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.14.0 documentation" href="../index.html" />
     <link rel="next" title="IDE Support" href="../ide/ide_integrations.html" />
-    <link rel="prev" title="Derive configs" href="../syntax/derive_configs.html" />
+    <link rel="prev" title="Adapt configs" href="../syntax/adapt_configs.html" />
 <meta charset='utf-8'>
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
 <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
@@ -120,7 +120,7 @@
               
                 
   <li>
-    <a href="../syntax/derive_configs.html" title="Previous Chapter: Derive configs"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; Derive configs</span>
+    <a href="../syntax/adapt_configs.html" title="Previous Chapter: Adapt configs"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; Adapt configs</span>
     </a>
   </li>
   <li>
@@ -276,7 +276,7 @@ Example:</p>
       
     </p>
     <p>
-        &copy; Copyright 2015, E.S.R.Labs AG.<br/>
+        &copy; Copyright 2016, E.S.R.Labs AG.<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.3.1.<br/>
     </p>
   </div>