Fixed fiddle exception and local __THIS__

esrlabs · Sep 7, 2020 · 79b494a · 79b494a
1 parent 665d697
commit 79b494a
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 10 deletions.
diff --git a/documentation/changelog.rst b/documentation/changelog.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+September 7, 2020 - bake-toolkit 2.65.1
+    * Bugfix: __THIS__ in Project.meta was resolved to main project name, not local project name
+    * Bugfix: Fixed an exception with old Ruby versions where "fiddle" is not available
+
 August 26, 2020 - bake-toolkit 2.65.0
     * Bugfix: Dependency to gem thwait 0.1.0 instead of latest version (they messed it up, latest gem might abort the builds on some systems)
     * Bugfix: Skip CompilationCheck on dry run

diff --git a/documentation/index.rst b/documentation/index.rst
@@ -1,4 +1,4 @@
-bake 2.65.0
+bake 2.65.1
 ==========================================
 bake, building software **fast** and **easy**!
 

diff --git a/install-docs/changelog.html b/install-docs/changelog.html
@@ -117,6 +117,11 @@
   <div class="section" id="changelog">
 <h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">¶</a></h1>
 <dl>
+<dt>September 7, 2020 - bake-toolkit 2.65.1</dt><dd><ul class="simple">
+<li><p>Bugfix: __THIS__ in Project.meta was resolved to main project name, not local project name</p></li>
+<li><p>Bugfix: Fixed an exception with old Ruby versions where “fiddle” is not available</p></li>
+</ul>
+</dd>
 <dt>August 26, 2020 - bake-toolkit 2.65.0</dt><dd><ul class="simple">
 <li><p>Bugfix: Dependency to gem thwait 0.1.0 instead of latest version (they messed it up, latest gem might abort the builds on some systems)</p></li>
 <li><p>Bugfix: Skip CompilationCheck on dry run</p></li>

diff --git a/install-docs/index.html b/install-docs/index.html
@@ -4,7 +4,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>bake 2.65.0 &#8212; bake documentation</title>
+    <title>bake 2.65.1 &#8212; bake documentation</title>
     <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" type="text/css" href="_static/custom.css" />
@@ -83,7 +83,7 @@
   <ul class="dropdown-menu localtoc"
       role="menu"
       aria-labelledby="dLabelLocalToc"><ul>
-<li><a class="reference internal" href="#">bake 2.65.0</a><ul>
+<li><a class="reference internal" href="#">bake 2.65.1</a><ul>
 </ul>
 </li>
 </ul>
@@ -115,8 +115,8 @@
   <div class="row">
     <div class="body col-md-12 content" role="main">
 
-  <div class="section" id="bake-2-65-0">
-<h1>bake 2.65.0<a class="headerlink" href="#bake-2-65-0" title="Permalink to this headline">¶</a></h1>
+  <div class="section" id="bake-2-65-1">
+<h1>bake 2.65.1<a class="headerlink" href="#bake-2-65-1" title="Permalink to this headline">¶</a></h1>
 <p>bake, building software <strong>fast</strong> and <strong>easy</strong>!</p>
 <table class="docutils align-default">
 <colgroup>

diff --git a/install-docs/objects.inv b/install-docs/objects.inv
diff --git a/install-docs/searchindex.js b/install-docs/searchindex.js
diff --git a/lib/bake/config/loader.rb b/lib/bake/config/loader.rb
@@ -237,7 +237,7 @@ def loadProjMeta(filename)
       if adaptRoots.length > 0
         adaptRoots.each do |adapt|
           Bake::Config::checkVer(adapt.requiredBakeVersion)
-          adapt.mainProject = @mainProjectName if adapt.mainProject == "__THIS__"
+          adapt.mainProject = proj.name if adapt.mainProject == "__THIS__"
           adaptConfigs = adapt.getConfig
           AdaptConfig.checkSyntax(adaptConfigs, filename, true)
           adaptConfigs.each do |ac|

diff --git a/lib/blocks/compile.rb b/lib/blocks/compile.rb
@@ -37,7 +37,7 @@ def realname file
     x = longname(shortname(file))
   end
 
-rescue Fiddle::DLError
+rescue Exception
 
   def realname file
     file

diff --git a/lib/common/version.rb b/lib/common/version.rb
@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.65.0"
+      "2.65.1"
     end
 
     def self.printBakeVersion(ry = "")

diff --git a/rake_helper/spec.rb b/rake_helper/spec.rb
@@ -19,7 +19,7 @@ def at_exit(&block)
 rescue LoadError
 end
 
-SPEC_PATTERN ='spec/**/*_spec.rb'
+SPEC_PATTERN ='spec/**/local_adapt_spec.rb'
 
 puts "Creating dummy libs"
 `gcc -r -c rake_helper/dummy.c -o rake_helper/dummy.a`

diff --git a/spec/local_adapt_spec.rb b/spec/local_adapt_spec.rb
@@ -95,6 +95,19 @@ module Bake
     expect($mystring.include?("ADAPT_09")).to be == false
   end
 
+  it '__THIS__ applies to local project' do
+    Bake.startBake("localAdapt/main3", ["test"])
+    expect($mystring.include?("start this test")).to be == true
+    expect($mystring.include?("hello main3")).to be == true
+    expect($mystring.include?("hello main4")).to be == true
+  end
+
+  it '__THIS__ does not apply to main project' do
+    Bake.startBake("localAdapt/main4", ["test"])
+    expect($mystring.include?("start this test")).to be == false
+    expect($mystring.include?("hello main3")).to be == true
+    expect($mystring.include?("hello main4")).to be == true
+  end
 
 end
 

diff --git a/spec/testdata/localAdapt/main3/Project.meta b/spec/testdata/localAdapt/main3/Project.meta
@@ -0,0 +1,16 @@
+Project default: test {
+  CustomConfig test {
+    Dependency main4
+    DefaultToolchain GCC
+    CommandLine "echo hello main3", echo: off
+  }
+}
+
+If mainProject: __THIS__ {
+  CustomConfig test, type: extend {
+    StartupSteps {
+      CommandLine "echo start this test", echo: off
+    }
+  }
+
+}
diff --git a/spec/testdata/localAdapt/main4/Project.meta b/spec/testdata/localAdapt/main4/Project.meta
@@ -0,0 +1,7 @@
+Project default: test {
+  CustomConfig test {
+    Dependency main3
+    DefaultToolchain GCC
+    CommandLine "echo hello main4", echo: off
+  }
+}