Rework printLibDir, printIncludeDir, printArchDir, printDspDir, printPaths functions to use C++17 filsesystem.

Author: sletz

.github/workflows/windows.yml

@@ -41,12 +41,13 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: >-
-            base-devel
-            git
-            make
-            python
-            mingw-w64-x86_64-toolchain
+        install: >-
+          base-devel
+          git
+          make
+          python
+          mingw-w64-x86_64-toolchain
+          mingw-w64-x86_64-cmake
 
       - name: Build Faust with MSYS2
         shell: msys2 {0}

compiler/global.cpp

@@ -21,6 +21,7 @@
 
 #include <limits.h>
 #include <cstdint>
+#include <filesystem>
 
 #include "absprim.hh"
 #include "acosprim.hh"
@@ -1999,11 +2000,6 @@ void global::parseSourceFiles()
 /****************************************************************
  Faust directories information
  *****************************************************************/
-#ifdef WIN32
-#define kPSEP '\\'
-#else
-#define kPSEP '/'
-#endif
 
 #ifndef LIBDIR
 #define LIBDIR "lib"
@@ -2547,27 +2543,27 @@ string global::printHelp()
 
 string global::printLibDir()
 {
-    stringstream sstr;
-    sstr << gFaustRootDir << kPSEP << LIBDIR << endl;
-    return sstr.str();
+    namespace fs = std::filesystem;
+    fs::path path = fs::path(gFaustRootDir) / "lib";
+    return path.string() + '\n';
 }
 string global::printIncludeDir()
 {
-    stringstream sstr;
-    sstr << gFaustRootDir << kPSEP << "include" << endl;
-    return sstr.str();
+    namespace fs = std::filesystem;
+    fs::path path = fs::path(gFaustRootDir) / "include";
+    return path.string() + '\n';
 }
 string global::printArchDir()
 {
-    stringstream sstr;
-    sstr << gFaustRootDir << kPSEP << "share" << kPSEP << "faust" << endl;
-    return sstr.str();
+    namespace fs = std::filesystem;
+    fs::path path = fs::path(gFaustRootDir) / "share" / "faust";
+    return path.string() + '\n';
 }
 string global::printDspDir()
 {
-    stringstream sstr;
-    sstr << gFaustRootDir << kPSEP << "share" << kPSEP << "faust" << endl;
-    return sstr.str();
+    namespace fs = std::filesystem;
+    fs::path path = fs::path(gFaustRootDir) / "share" / "faust";
+    return path.string() + '\n';
 }
 string global::printPaths()
 {