From 28ed01f506f2024cfb52db85348b887f2ded4e5d Mon Sep 17 00:00:00 2001
From: John Lindsay <jlindsay@uoguelph.ca>
Date: Wed, 22 May 2024 12:18:23 -0400
Subject: [PATCH] Updates

---
 .github/workflows/build-wheels.yml |  3 ++-
 build.py                           | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 7bf45216..bb7b6a64 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         # os: [ubuntu-latest, windows-latest, macOS-latest, ubuntu-20.04, ]
-        os: [ubuntu-22.04] #, windows-latest, macos-12, macOS-latest]
+        os: [ubuntu-22.04, windows-latest, macos-12, macOS-latest]
         python-version: ['3.11']
 
     steps:
@@ -32,6 +32,7 @@ jobs:
         run: |
           sudo apt install musl-tools
 
+      # Compiling the WbRunner app on linux causes an error related to openssl, so use exclude_runner
       - name: Run build script linux
         if: startsWith(matrix.os, 'ubuntu')
         run: python build.py do_clean exclude_runner zip
diff --git a/build.py b/build.py
index 1dd65253..0dbe8fbf 100755
--- a/build.py
+++ b/build.py
@@ -9,13 +9,15 @@
 # Script Keyword Arguments:
 #
 # do_clean           If present, the existing files will be cleaned before compiling.
-# exclude_runner     Excludes the WhiteboxTools Runner app from the build (Windows and macos). 
+# exclude_runner     Excludes the WhiteboxTools Runner app from the build. 
 # zip                Creates a zip file output in addition to the WBT folder
 #
 # Notes:
 # You will need Rust installed before running the script. The output will be contained within a
-# folder named 'WBT'. The WhiteboxTools Runner app will always be excluded from Linux builds. 
-# Compiling the Runner causes an error on our Ubuntu compile target.
+# folder named 'WBT'. The WhiteboxTools Runner app often results in an error when compiling on
+# Linux. This seems to be related to openssl libraries, which need to be set up correctly. If 
+# you are unable to figure out the set-up correctly and you do not need the Runner app, you
+# would be advised to use the exclude_runner argument on linux.
 #
 # Example:
 # python3 build.py do_clean exclude_runner zip
@@ -44,7 +46,7 @@ def build(do_clean=False, exclude_runner=False, create_zip_artifact=False):
 
     # Create the Cargo.toml file
     workspace_str = '[workspace]\nmembers = ["whitebox-common", "whitebox-lidar", "whitebox-plugins", "whitebox-raster", "whitebox-runner", "whitebox-tools-app", "whitebox-vector"]\n\n'
-    if exclude_runner: # or platform.system() == 'Linux':
+    if exclude_runner:
         # Exclude the runner if the second command line arg is set to True or if the platform is linux
         workspace_str = '[workspace]\nmembers = ["whitebox-common", "whitebox-lidar", "whitebox-plugins", "whitebox-raster", "whitebox-tools-app", "whitebox-vector"]\n\n'