RubyGems - bake-toolkit - Versions diffs - 1.1.0 → 1.2.0 - Mend

bake-toolkit 1.1.0 → 1.2.0

Files changed (11) hide show

checksums.yaml ADDED Viewed

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 381988c79e8c8cb7d930b61b306330f360a1ced9
+  data.tar.gz: 44c5523e0894af5e842af4e9b63a0e97df39233e
+SHA512:
+  metadata.gz: 3143de2a16aee53610242d97a6425c994e8c4cdd11dd327f0754e7c1b397f78a6b7f36d2315a2b97a950aad1d37e44e7b3b705eb0c2855b1d54d26f9773eeb56
+  data.tar.gz: fbbe8ae534a1aefad7331db09ac09e25e571be3c14d04c4dd4bb3a2f5cdfd0689a6c64dd7df7bf57c7b9cb252b44ddb67d29b1fb011dcad3b230ce8cea4a72a7

data/doc/further/change.html CHANGED Viewed

@@ -7,6 +7,12 @@
 <body>
 <h1>Changelog</h1>
+May 2, 2014 - bake-toolkit 1.2.0<br>
+<ul>
+<li><b>Added: Set keyword for defining variables</b>
+<li><b>Changed: "executed in"-output now in separate line</b>
+</ul>
 March 14, 2014 - bake-toolkit 1.1.0<br>
 <ul>
 <li><b>Added: Lint support</b>

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.1.0</td><td align="right">March 14, 2014</td></tr></table>
+<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.2.0</td><td align="right">May 2, 2014</td></tr></table>
 </body>

data/doc/syntax/subst.html CHANGED Viewed

@@ -16,7 +16,15 @@
 <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):
+<p>
+<table border="1">
+  <tr><th bgcolor="#CCCCCC">Example</th><th bgcolor="#CCCCCC">Output</th></tr>
+  <tr><td>Set WORLD, value: "world!"<br>CommandLine "echo hello $(WORLD)"</td> <td>hello world!</td></tr>
+</table>
+<p>
+bake includes also some standard variables:
+<p>
 <table border="1">
   <tr><th bgcolor="#CCCCCC">Variable</th><th bgcolor="#CCCCCC">Example</th></tr>
   <tr><td>$(MainConfigName)</td> <td>Debug</td></tr>

data/doc/syntax/syntax.html CHANGED Viewed

@@ -79,6 +79,7 @@ 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="showSet()" onMouseout="notip()">Set</span> &#60;variable&#62;, value: &#60;value&#62;<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>
 &nbsp; &nbsp; <span class="help" onMouseover="showExternalLibrary()" onMouseout="notip()">ExternalLibrary</span> &#60;lib&#62;,
@@ -382,6 +383,11 @@ function showIncludeDir() {
   ddrivetip("IncludeDir", "No","0..n","-",str)
 }
+function showSet() {
+  str = 'Sets a variable for this and all dependent projects.'
+	ddrivetip("Set", "No","0..n","-",str)
+}
 function showDependency() {
   str = 'Specifies another project to be built before this project.<br>'+
     'The archive, linker libs and search paths are imported from this project to the this project automatically.'

data/lib/bake/mergeConfig.rb CHANGED Viewed

@@ -31,6 +31,8 @@ module Cxxproject
       @child.setDependency(@parent.dependency + @child.dependency)
+      @child.setSet(@parent.set + @child.set)
       manipulateLineNumbers(@parent.exLib)
       manipulateLineNumbers(@parent.exLibSearchPath)
       manipulateLineNumbers(@parent.userLibrary)

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

@@ -155,7 +155,12 @@ module Cxxproject
       class ArtifactName < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
-      end
+      end
+      class Set < ModelElement
+        has_attr 'name', String, :defaultValueLiteral => ""
+        has_attr 'value', String, :defaultValueLiteral => ""
+      end
       class BaseConfig_INTERNAL < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
@@ -166,6 +171,7 @@ module Cxxproject
         contains_many 'exLib', ExternalLibrary, 'parent'
         contains_many 'exLibSearchPath', ExternalLibrarySearchPath, 'parent'
         contains_one 'defaultToolchain', DefaultToolchain, 'parent'
+        contains_many 'set', Set, 'parent'
         module ClassModule
       	  def ident

data/lib/bake/subst.rb CHANGED Viewed

@@ -2,7 +2,7 @@ module Cxxproject
   class Subst
-    def self.itute(config, projName, options)
+    def self.itute(config, projName, options, isMainProj)
       @@configName = config.name
       @@projDir = config.parent.get_project_dir
@@ -22,7 +22,10 @@ module Cxxproject
         end
       end
-      subst(config)
+      @@userVarMap = {} if isMainProj
+      config.set.each { |s| @@userVarMap[s.name] = s.value }
+      subst(config)
     end
     def self.subst(elem)
@@ -42,7 +45,9 @@ module Cxxproject
           var = str[posStart+2..posEnd-1]
-          if var == "MainConfigName"
+          if @@userVarMap.has_key?(var)
+            substStr << @@userVarMap[var]
+          elsif var == "MainConfigName"
             substStr << @@options.build_config
           elsif var == "MainProjectName"
             substStr << @@mainProjectName
@@ -88,7 +93,7 @@ module Cxxproject
         substStr << str[posSubst..-1]
         elem.setGeneric(a.name, substStr)
-      end
+      end
       childsRefs = elem.class.ecore.eAllReferences.select{|r| r.containment}
       childsRefs.each do |c|

data/lib/bake/version.rb CHANGED Viewed

@@ -1,11 +1,11 @@
 module Cxxproject
   class Version
     def self.bake
-      "1.1.0"
+      "1.2.0"
     end
   end
-  expectedCxx = "0.5.72"
+  expectedCxx = "0.5.73"
   expectedRGen = "0.6.0"
   expectedRText = "0.2.0"

data/lib/tocxx.rb CHANGED Viewed

@@ -380,12 +380,13 @@ module Cxxproject
     def substVars
+      @mainConfig = @project2config[@mainProjectName]
+        Subst.itute(@mainConfig, @mainProjectName, @options, true)
       @project2config.each do |projName, config|
-        Subst.itute(config, projName, @options)
+        Subst.itute(config, projName, @options, false) if projName != @mainProjectName
       end
-      @mainConfig = @project2config[@mainProjectName]
       basedOn = @mainConfig.defaultToolchain.basedOn
       basedOn = "GCC_Lint" if @options.lint

metadata CHANGED Viewed

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease:
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cxxproject
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.72
+        version: 0.5.73
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.72
+        version: 0.5.73
 - !ruby/object:Gem::Dependency
   name: rtext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,14 +48,12 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.0
-description: ! '    This build tool is used to compile projects fast and easy.
-'
+description: |2
+      This build tool is used to compile projects fast and easy.
 email: alexander.schaal@esrlabs.com
 executables:
 - bake
@@ -112,24 +104,24 @@ files:
 - doc/eclipse/build/buildMain.png
 - doc/eclipse/build/console.png
 - doc/eclipse/build/problem.png
+- doc/eclipse/export.html
 - doc/eclipse/export/Script.png
 - doc/eclipse/export/Select.png
-- doc/eclipse/export.html
+- doc/eclipse/import.html
 - doc/eclipse/import/Import.png
 - doc/eclipse/import/Select.png
-- doc/eclipse/import.html
+- doc/eclipse/install.html
 - doc/eclipse/install/AddRepository.png
 - doc/eclipse/install/AvailableSoftware.png
 - doc/eclipse/install/InstallNewSoftware.png
 - doc/eclipse/install/Licenses.png
 - doc/eclipse/install/Restart.png
 - doc/eclipse/install/TrustMe.png
-- doc/eclipse/install.html
 - doc/eclipse/misc/pref.png
+- doc/eclipse/new.html
 - doc/eclipse/new/New.png
 - doc/eclipse/new/Result.png
 - doc/eclipse/new/Select.png
-- doc/eclipse/new.html
 - doc/eclipse/select/FirstSelect.png
 - doc/eclipse/select/SecondSelect.png
 - doc/eclipse/select/WrongSelect.png
@@ -147,19 +139,19 @@ files:
 - doc/syntax/derive.html
 - doc/syntax/subst.html
 - doc/syntax/syntax.html
-- doc/vs/create/cvsp.png
 - doc/vs/create.html
+- doc/vs/create/cvsp.png
+- doc/vs/install.html
 - doc/vs/install/install1.png
 - doc/vs/install/install2010.png
 - doc/vs/install/installed.png
 - doc/vs/install/site.png
 - doc/vs/install/update.png
-- doc/vs/install.html
+- doc/vs/use.html
 - doc/vs/use/error.png
 - doc/vs/use/options.png
 - doc/vs/use/select.png
 - doc/vs/use/show.png
-- doc/vs/use.html
 - license.txt
 - bin/bake
 - bin/bakery
@@ -168,6 +160,7 @@ files:
 homepage: http://www.esrlabs.com
 licenses:
 - MIT
+metadata: {}
 post_install_message:
 rdoc_options:
 - -x
@@ -175,21 +168,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Frontend for cxxproject.
 test_files: []