[plc4x] branch develop updated: - Added some more documentation on installing prerequisites on windows - Fixed the python detection in the prerequisiteCheck.groovy script

[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 6032544  - Added some more documentation on installing prerequisites on windows - Fixed the python detection in the prerequisiteCheck.groovy script
6032544 is described below

commit 60325448136810c0637b674722bd0238609117e9
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu May 14 13:11:21 2020 +0200

    - Added some more documentation on installing prerequisites on windows
    - Fixed the python detection in the prerequisiteCheck.groovy script
---
 src/main/script/prerequisiteCheck.groovy            | 17 +----------------
 src/site/asciidoc/developers/preparing/windows.adoc | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index c86b5b5..01b44c4 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -272,7 +272,7 @@ def checkPython() {
         def stdErr = new StringBuilder()
         process.consumeProcessOutput(stdOut, stdErr)
         process.waitForOrKill(500)
-        Matcher matcher = extractVersion(stdErr)
+        Matcher matcher = extractVersion(stdOut + stdErr)
         if (matcher.size() > 0) {
             def curVersion = matcher[0][1]
             def result = checkVersionAtLeast(curVersion, "2.7.0")
@@ -281,21 +281,6 @@ def checkPython() {
             }
         } else {
             println "missing"
-            // For debugging regular build failures on our build vm
-            println "StdOut: " + stdOut
-            println "StrErr: " + stdErr
-            println "matcher size: " + matcher.size()
-            for (int i = 0; i < matcher.size(); i++) {
-                println "matcher[" + i + "]=" + matcher[i]
-            }
-            // Example for a failed python detection:
-            //
-            //Detecting Python version: missing
-            //StdOut:
-            //StrErr: Python 2.7.12
-            // Example of a successful detection
-            //StrErr:
-            //2.7.15        OK
             allConditionsMet = false
         }
     } catch(Exception e) {
diff --git a/src/site/asciidoc/developers/preparing/windows.adoc b/src/site/asciidoc/developers/preparing/windows.adoc
index a6348ff..6bc5edc 100644
--- a/src/site/asciidoc/developers/preparing/windows.adoc
+++ b/src/site/asciidoc/developers/preparing/windows.adoc
@@ -75,6 +75,9 @@ If you get any successful output, you probably don't need to do anything.
 
 Usually this is already installed on Windows machines.
 
+Download the installer from https://dotnet.microsoft.com/download/dotnet-core/3.1[here]
+(Be sure to download an installer from the second column labeled `Build apps - SDK`)
+
 === python
 
 Checking:
@@ -138,3 +141,20 @@ Not quite sure which elements are really needed, better just install all of them
 Make sure it's `bin` directory is added to your systems `PATH`, however the installer should have taken care of this.
 Also make sure you restarted your IDE and or console window after changing the `PATH` settings for the changes to take effect.
 
+=== OpenSSL
+
+It is encouraged to build them yourself, but binaries can be downloaded from sites like:
+https://slproweb.com/products/Win32OpenSSL.html[this]
+
+Usually I download the 64Bit installer.
+
+Be sure to add the `bin` directory to the systems Path.
+
+=== Clang
+
+Same with OpenSSL, it's a little tricky to find pre-compiled binaries for windows.
+
+Seem the versions available https://releases.llvm.org/download.html[here] to the trick.
+Download and install the `LLVM` package.
+
+Select to add the LLVM to the path (doesn't matter if just for the current user or for all)