[plc4x] branch develop updated: PLC4X-151 Build for boost fails on Jenkins - Tried to make Boost build with clang instead of gcc to reduce the amount of memory needed.

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5447a45  PLC4X-151 Build for boost fails on Jenkins - Tried to make Boost build with clang instead of gcc to reduce the amount of memory needed.
5447a45 is described below

commit 5447a452792e84e1bae65f0a71553bcbb7ea6716
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Dec 5 15:57:24 2019 +0100

    PLC4X-151 Build for boost fails on Jenkins
    - Tried to make Boost build with clang instead of gcc to reduce the amount of memory needed.
---
 src/main/script/prerequisiteCheck.groovy | 17 +++++++++++++++++
 src/site/site.xml                        |  2 +-
 tools/boost/pom.xml                      |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index 1e282d8..4860668 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -146,6 +146,22 @@ def checkGpp() {
     }
 }
 
+def checkClang() {
+    print "Detecting clang version:     "
+    def output = "clang --version".execute().text
+    Matcher matcher = extractVersion(output)
+    if(matcher.size() > 0) {
+        def curVersion = matcher[0][1]
+        def result = checkVersionAtLeast(curVersion, "1.0.0")
+        if(!result) {
+            allConditionsMet = false
+        }
+    } else {
+        println "missing"
+        allConditionsMet = false
+    }
+}
+
 def checkPython() {
     print "Detecting Python version:  "
     def process = ("python --version").execute()
@@ -315,6 +331,7 @@ if(proxiesEnabled) {
 }
 
 if(proxiesEnabled || cppEnabled) {
+    checkClang()
     checkGcc()
 }
 
diff --git a/src/site/site.xml b/src/site/site.xml
index 4e72149..e545fea 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -85,7 +85,7 @@
         <script>
           document.addEventListener("DOMContentLoaded", function(event) {
             /* Add an image for promoting Apache events below the right banner */
-            $("#bannerRight").append('<p id="apacheEvents"><a href="//www.apache.org/events/current-event.html"><img src="//www.apache.org/events/current-event-234x60.png"/></a></p>');
+            $("#bannerRight").parent.append('<p id="apacheEvents"><a href="//www.apache.org/events/current-event.html"><img src="//www.apache.org/events/current-event-234x60.png"/></a></p>');
             /* Append the trademarks info to the copyright section */
             $(".copyright").append('<p>Apache PLC4X, PLC4X, Apache, the Apache feather logo, and the Apache PLC4X project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>');
           });
diff --git a/tools/boost/pom.xml b/tools/boost/pom.xml
index 83cb237..1175ee9 100644
--- a/tools/boost/pom.xml
+++ b/tools/boost/pom.xml
@@ -81,7 +81,8 @@
             <configuration>
               <executable>${boost.bootstrap.executable}</executable>
               <arguments>
-                <argument>gcc</argument>
+                <!-- Use clang instead of gcc as this requires far less memory -->
+                <argument>--with-toolset=clang</argument>
               </arguments>
               <workingDirectory>${project.build.directory}/boost_${boost.version.underline}</workingDirectory>
             </configuration>