Build R-Interface with Rtools static toolchain

Author: FBartos

.github/workflows/windows.yml

@@ -89,6 +89,38 @@ jobs:
         env: 
             VCINSTALLDIR: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/"
 
+      - name: Check R-Interface DLL dependencies
+        shell: pwsh
+        run: |
+            $objdump = "C:\rtools45\x86_64-w64-mingw32.static.posix\bin\objdump.exe"
+            $dlls = @(
+                "jasp-build\R-Interface\libR-Interface.dll",
+                "jasp-build\R-Interface\libR-InterfaceNoRInside.dll"
+            )
+
+            foreach ($dll in $dlls) {
+                Write-Host "Imports for $dll"
+                if (-not (Test-Path $dll)) {
+                    Write-Error "Missing DLL: $dll"
+                    exit 1
+                }
+
+                $objdumpOutput = & $objdump -p $dll
+                if ($LASTEXITCODE -ne 0) {
+                    Write-Error "objdump failed for $dll"
+                    exit $LASTEXITCODE
+                }
+
+                $imports = $objdumpOutput | Select-String -Pattern "DLL Name"
+                $imports
+
+                $forbidden = $imports | Select-String -Pattern "libgcc|libstdc\+\+|libwinpthread"
+                if ($forbidden) {
+                    Write-Error "Unexpected MinGW runtime dependency in $dll"
+                    exit 1
+                }
+            }
+
       - name: Run Tests
         shell: pwsh
         run: |

CMakeLists.txt

@@ -206,16 +206,21 @@ else()
                ${CMAKE_BINARY_DIR}/R-Interface/libR-InterfaceNoRInside.dll
                ${CMAKE_BINARY_DIR}/R-Interface/libR-InterfaceNoRInside.dll.a
         COMMAND
-      ${CMAKE_COMMAND} -G "MinGW Makefiles" -S . -B
-      ${CMAKE_BINARY_DIR}/R-Interface "-DRTOOLS_PATH:PATH=${RTOOLS_PATH}"
+      ${CMAKE_COMMAND} -E env
+      "PATH=${RTOOLS_STATIC_TOOLCHAIN_BIN};${RTOOLS_BUILD_TOOLS_BIN};$ENV{PATH}"
+      ${CMAKE_COMMAND} -G "${RTOOLS_R_INTERFACE_GENERATOR}" -S . -B
+      ${CMAKE_BINARY_DIR}/R-Interface
       "-DCMAKE_C_COMPILER:PATH=${RTOOLS_C_COMPILER}"
       "-DCMAKE_CXX_COMPILER:PATH=${RTOOLS_CXX_COMPILER}"
       "-DCMAKE_MAKE_PROGRAM:PATH=${RTOOLS_MAKE_PROGRAM}"
       "-DJASP_BINARY_DIR:PATH=${CMAKE_BINARY_DIR}"
       "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
       "-DR_VERSION:STRING=${R_VERSION}"
-    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/R-Interface
-    USES_TERMINAL
+    COMMAND
+      ${CMAKE_COMMAND} -E env
+      "PATH=${RTOOLS_STATIC_TOOLCHAIN_BIN};${RTOOLS_BUILD_TOOLS_BIN};$ENV{PATH}"
+      ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/R-Interface
+    VERBATIM
     COMMENT "------ Configuring and Building the libR-Interface")
 
   add_dependencies(SyntaxInterface R-Interface)

Desktop/gui/jaspConfiguration/jaspconfigurationtomlparser.cpp

@@ -14,11 +14,18 @@ bool JASPConfigurationTOMLParser::parse(JASPConfiguration *target, const QString
 
 	try
 	{
-		tbl = toml::parse(input.toStdString());
+		auto result = toml::parse(input.toStdString());
+		if(!result)
+		{
+			Log::log() << "Parsing failed: " << result.error() << std::endl;
+			return false;
+		}
+		tbl = std::move(result).table();
 	}
 	catch (const toml::parse_error& err)
 	{
 		Log::log() << "Parsing failed: " << err << std::endl;
+		return false;
 	}
 
 	//jasp version

Desktop/mainwindow.cpp

@@ -30,6 +30,7 @@
 #include <QMenuBar>
 #include <exception>
 #include <iostream>
+#include <streambuf>
 
 #include "log.h"
 #include "timers.h"
@@ -65,14 +66,28 @@
 #include "rsyntax/formulabase.h"
 #include "utilities/desktopcommunicator.h"
 
-#include "boost/iostreams/stream.hpp"
-#include <boost/iostreams/device/null.hpp>
-
 #include "communitydefs.h"
 
 using namespace std;
 using namespace Modules;
 
+namespace
+{
+class NullBuffer : public std::streambuf
+{
+protected:
+	int_type overflow(int_type ch) override { return traits_type::not_eof(ch); }
+	std::streamsize xsputn(const char *, std::streamsize count) override { return count; }
+};
+
+std::ostream & nullOutputStream()
+{
+	static NullBuffer buffer;
+	static std::ostream stream(&buffer);
+	return stream;
+}
+}
+
 MainWindow * MainWindow::_singleton	= nullptr;
 
 MainWindow::MainWindow(Application * application) : QObject(application), _application(application)
@@ -894,7 +909,7 @@ void MainWindow::initLog()
 {
 	assert(_engineSync != nullptr && _preferences != nullptr);
 
-	static boost::iostreams::stream<boost::iostreams::null_sink> nullstream((boost::iostreams::null_sink())); //https://stackoverflow.com/questions/8243743/is-there-a-null-stdostream-implementation-in-c-or-libraries
+	std::ostream & nullstream = nullOutputStream();
 
 	Log::logFileNameBase = (AppDirs::logDir() + "JASP "  + getSortableTimestamp()).toStdString();
 	Log::init(&nullstream);

Engine/main.cpp

@@ -21,12 +21,28 @@
 #include <iostream>
 #include <fstream>
 #include <codecvt>
+#include <streambuf>
 #include "otoolstuff.h"
 #include "dirs.h"
-#include "boost/iostreams/stream.hpp"
-#include <boost/iostreams/device/null.hpp>
 #include "rbridge.h"
 
+namespace
+{
+class NullBuffer : public std::streambuf
+{
+protected:
+	int_type overflow(int_type ch) override { return traits_type::not_eof(ch); }
+	std::streamsize xsputn(const char *, std::streamsize count) override { return count; }
+};
+
+std::ostream & nullOutputStream()
+{
+	static NullBuffer buffer;
+	static std::ostream stream(&buffer);
+	return stream;
+}
+}
+
 #ifdef _WIN32
 void openConsoleOutput(unsigned long slaveNo, unsigned parentPID)
 {
@@ -78,7 +94,7 @@ int main(int argc, char *argv[])
             Dirs::setReportingDir(argv[5]);
 
 #endif
-		static boost::iostreams::stream<boost::iostreams::null_sink> nullstream((boost::iostreams::null_sink())); //https://stackoverflow.com/questions/8243743/is-there-a-null-stdostream-implementation-in-c-or-libraries
+		std::ostream & nullstream = nullOutputStream();
 		Log::logFileNameBase = logFileBase;
 		Log::init(&nullstream);
 		Log::setLogFileName(logFileBase + " Engine " + std::to_string(slaveNo) + ".log");

Tools/CMake/Deploy.win.cmake.in

@@ -1,13 +1,18 @@
 # This file is generated from `Deploy.win.cmake.in`.
 #
-# It is being used to run the `macdeployqt` on the `JASP.app` binary, as well
-# as the JASPEngine
+# It is being used to run `windeployqt` on the installed JASP binaries.
+
+set(_JASP_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}")
 
 execute_process(
   COMMAND_ECHO STDOUT
-  WORKING_DIRECTORY "@CMAKE_INSTALL_PREFIX@"
+  WORKING_DIRECTORY "${_JASP_INSTALL_BINDIR}"
   COMMAND
-    @CMAKE_BINARY_DIR@/deploy.cmd
+    "@DEPLOYQT_EXECUTABLE@"
+    @WINDEPLOY_QT_BUILD_TYPE@
+    "--qmldir=@JASP_QML_FILES@"
+    "${_JASP_INSTALL_BINDIR}/JASPDesktop.exe"
+    "${_JASP_INSTALL_BINDIR}/JASPEngine.exe"
   RESULT_VARIABLE result)
 
 if(result)

Tools/CMake/Programs.cmake

@@ -130,23 +130,55 @@ endif()
 
 if(WIN32)
 
+  set(_QT_DEPLOY_BIN_HINTS)
+  foreach(_QT_PREFIX IN LISTS CMAKE_PREFIX_PATH)
+    if(EXISTS "${_QT_PREFIX}/bin")
+      list(APPEND _QT_DEPLOY_BIN_HINTS "${_QT_PREFIX}/bin")
+    endif()
+  endforeach()
+
   find_program(
-    DEPLOYQT_EXECUTABLE
-    NAMES windeployqt
-    PATHS ${Qt6_DIR}/bin)
+    _DEPLOYQT_EXECUTABLE_FROM_PREFIX
+    NAMES windeployqt windeployqt.exe
+    PATHS ${_QT_DEPLOY_BIN_HINTS}
+    NO_DEFAULT_PATH)
+
+  if(_DEPLOYQT_EXECUTABLE_FROM_PREFIX)
+    set(DEPLOYQT_EXECUTABLE
+        "${_DEPLOYQT_EXECUTABLE_FROM_PREFIX}"
+        CACHE FILEPATH "Path to the windeployqt executable matching the configured Qt prefix"
+        FORCE)
+  else()
+    find_program(DEPLOYQT_EXECUTABLE NAMES windeployqt windeployqt.exe)
+  endif()
 
-  # look for Rtools from most newest to oldest
-    message(CHECK_START "Looking for Rtools $ENV{RTOOLS45_HOME}")
+  message(STATUS "  ${DEPLOYQT_EXECUTABLE}")
+
+  message(CHECK_START "Looking for Rtools $ENV{RTOOLS45_HOME}")
   if(DEFINED ENV{RTOOLS45_HOME})
-		set(RTOOLS_PATH "$ENV{RTOOLS45_HOME}/ucrt64" CACHE PATH "Path to Rtools45 x64 folder, e.g., C:/rtools45/ucrt64")
+    file(TO_CMAKE_PATH "$ENV{RTOOLS45_HOME}" _RTOOLS45_HOME)
+    set(RTOOLS_ROOT "${_RTOOLS45_HOME}" CACHE PATH "Path to Rtools45 installation root, e.g., C:/rtools45")
 	else()
-		set(RTOOLS_PATH "C:/rtools45/ucrt64" CACHE PATH "Path to Rtools45 x64 folder, e.g., C:/rtools45/ucrt64")
+    set(RTOOLS_ROOT "C:/rtools45" CACHE PATH "Path to Rtools45 installation root, e.g., C:/rtools45")
 	endif()
+  set(RTOOLS_PATH "${RTOOLS_ROOT}/ucrt64" CACHE PATH "Path to Rtools45 UCRT64 package folder, e.g., C:/rtools45/ucrt64")
+
+  get_filename_component(_RTOOLS_ROOT_FROM_UCRT "${RTOOLS_PATH}" DIRECTORY)
+  set(RTOOLS_STATIC_TOOLCHAIN_PATH
+      "${_RTOOLS_ROOT_FROM_UCRT}/x86_64-w64-mingw32.static.posix"
+      CACHE PATH
+      "Path to Rtools45 static.posix compiler toolchain, e.g., C:/rtools45/x86_64-w64-mingw32.static.posix")
+  set(RTOOLS_BUILD_TOOLS_PATH
+      "${_RTOOLS_ROOT_FROM_UCRT}/usr"
+      CACHE PATH
+      "Path to Rtools45 MSYS build tools, e.g., C:/rtools45/usr")
 
   if(EXISTS ${RTOOLS_PATH})
 
     message(CHECK_PASS "found")
-    message(STATUS "  ${RTOOLS_PATH}")
+    message(STATUS "  UCRT package path: ${RTOOLS_PATH}")
+    message(STATUS "  static toolchain:  ${RTOOLS_STATIC_TOOLCHAIN_PATH}")
+    message(STATUS "  build tools:       ${RTOOLS_BUILD_TOOLS_PATH}")
 
     message(CHECK_START 
             "Looking for Rtools legacy and auto remove it, if not work please remove such `RTOOLS44_HOME` manually from Windows environment settings."
@@ -164,10 +196,23 @@ if(WIN32)
   else()
     message(
       FATAL_ERROR
-        "Rtools not found. Rtools is required for building on Windows, please follow the build instruction before you continue. If you have installed the MINGW in a custom location, you can set the RTOOLS_PATH to your MinGW x64 path, e.g., C:/rtools45/ucrt64"
+        "Rtools not found. Rtools is required for building on Windows, please follow the build instruction before you continue. If you have installed the MINGW in a custom location, you can set the RTOOLS_PATH to your UCRT64 package path, e.g., C:/rtools45/ucrt64"
     )
   endif()
 
+  if(NOT EXISTS "${RTOOLS_STATIC_TOOLCHAIN_PATH}/bin/gcc.exe"
+     OR NOT EXISTS "${RTOOLS_STATIC_TOOLCHAIN_PATH}/bin/g++.exe")
+    message(
+      FATAL_ERROR
+        "Rtools static.posix compiler toolchain not found. Set RTOOLS_STATIC_TOOLCHAIN_PATH to the Rtools static toolchain path, e.g., C:/rtools45/x86_64-w64-mingw32.static.posix")
+  endif()
+
+  if(NOT EXISTS "${RTOOLS_BUILD_TOOLS_PATH}/bin/make.exe")
+    message(
+      FATAL_ERROR
+        "Rtools MSYS make not found. Set RTOOLS_BUILD_TOOLS_PATH to the Rtools build tools path, e.g., C:/rtools45/usr")
+  endif()
+
   if(DEFINED ENV{WIX})
     set(WIX_PATH "$ENV{WIX}/bin" CACHE PATH "Path to your WIX installation, e.g., C:\\Program Files (x86)\\WiX Toolset v3.11\\bin")
   else()
@@ -207,9 +252,12 @@ if(WIN32)
     LIGHT_EXECUTABLE_NATIVE)
   message(STATUS "  ${LIGHT_EXECUTABLE_NATIVE}")
 
-  set(RTOOLS_C_COMPILER "${RTOOLS_PATH}/bin/gcc.exe")
-  set(RTOOLS_CXX_COMPILER "${RTOOLS_PATH}/bin/g++.exe")
-  set(RTOOLS_MAKE_PROGRAM "${RTOOLS_PATH}/bin/mingw32-make.exe")
+  set(RTOOLS_STATIC_TOOLCHAIN_BIN "${RTOOLS_STATIC_TOOLCHAIN_PATH}/bin")
+  set(RTOOLS_BUILD_TOOLS_BIN "${RTOOLS_BUILD_TOOLS_PATH}/bin")
+  set(RTOOLS_C_COMPILER "${RTOOLS_STATIC_TOOLCHAIN_BIN}/gcc.exe")
+  set(RTOOLS_CXX_COMPILER "${RTOOLS_STATIC_TOOLCHAIN_BIN}/g++.exe")
+  set(RTOOLS_MAKE_PROGRAM "${RTOOLS_BUILD_TOOLS_BIN}/make.exe")
+  set(RTOOLS_R_INTERFACE_GENERATOR "Unix Makefiles")
 
 endif()