jit: fix some hardcoded paths

Author: jcelerier

src/plugins/score-plugin-jit/JitCpp/JitPlatform.hpp

@@ -122,6 +122,58 @@ static inline std::string locateSDK()
 #endif
 }
 
+struct located_sdk
+{
+  std::string path;
+  enum
+  {
+    none,     // Nothing was found
+    platform, // Building against /usr/include, useful for dev builds
+    official  // The SDK obtained from official score releases
+  } sdk_kind
+      = none;
+
+// Do we use the score source dir or the headers from the SDK
+#if !SCORE_FHS_BUILD
+  static constexpr bool deploying = true;
+#else
+  static constexpr bool deploying = false;
+#endif
+};
+
+inline located_sdk locateSDKWithFallback()
+{
+  located_sdk ret;
+  ret.path = locateSDK();
+  if(ret.path.empty())
+    ret.sdk_kind = located_sdk::none;
+  if(ret.path.starts_with("/usr") || ret.path.starts_with("/Applications"))
+    ret.sdk_kind = located_sdk::official;
+  else
+    ret.sdk_kind = located_sdk::platform;
+
+  {
+    QDir dir(QString::fromStdString(ret.path));
+    if(!dir.exists())
+      ret.sdk_kind = located_sdk::none;
+
+    if(!dir.cd("include") || !dir.cd("c++"))
+    {
+      qDebug() << "Unable to locate standard headers, fallback to /usr";
+      ret.path = "/usr";
+      dir.setPath("/usr");
+      if(!dir.cd("include") || !dir.cd("c++"))
+      {
+        qDebug() << "Unable to locate any standard headers, install C++ development "
+                    "toolchain";
+        throw std::runtime_error("Unable to compile");
+      }
+      ret.sdk_kind = located_sdk::platform;
+    }
+  }
+  return ret;
+}
+
 static inline void
 populateCompileOptions(std::vector<std::string>& args, CompilerOptions opts)
 {
@@ -580,29 +632,9 @@ static inline auto getPotentialTriples()
  */
 static inline void populateIncludeDirs(std::vector<std::string>& args)
 {
-  auto sdk = locateSDK();
+  auto sdk_location = locateSDKWithFallback();
+  auto& sdk = sdk_location.path;
   auto qsdk = QString::fromStdString(sdk);
-  std::cerr << "\nLooking for sdk in: " << sdk << "\n";
-  qDebug() << "Looking for sdk in: " << qsdk;
-
-  bool sdk_found = true;
-
-  {
-    QDir dir(qsdk);
-    if(!dir.cd("include") || !dir.cd("c++"))
-    {
-      qDebug() << "Unable to locate standard headers, fallback to /usr";
-      qsdk = "/usr";
-      sdk = "/usr";
-      dir.setPath("/usr");
-      if(!dir.cd("include") || !dir.cd("c++"))
-      {
-        qDebug() << "Unable to locate standard headers++";
-        throw std::runtime_error("Unable to compile");
-      }
-      sdk_found = false;
-    }
-  }
 
   qDebug() << "SDK located: " << qsdk;
   std::string llvm_lib_version = SCORE_LLVM_VERSION;
@@ -699,12 +731,27 @@ static inline void populateIncludeDirs(std::vector<std::string>& args)
   ///build/score.AppDir/usr/include/
 
   auto include = [&](const std::string& path) {
-    args.push_back("-isystem" + sdk + "/include/" + path);
+    std::string path_to_include = sdk + "/include/" + path;
+    auto qpath = QString::fromStdString(path_to_include);
+    if(!QFileInfo{qpath}.isDir())
+    {
+      qDebug() << "Trying to include non-existent path: " << qpath;
+    }
+    else
+    {
+      args.push_back("-isystem" + sdk + "/include/" + path);
+    }
   };
 
 #if defined(__linux__)
-  include("x86_64-linux-gnu"); // #debian
+// #debian
+#if defined(__x86_64__)
+  include("x86_64-linux-gnu");
+#else
+  include("aarch64-linux-gnu");
 #endif
+#endif
+
   // include(""); // /usr/include
   std::string qt_folder = "qt";
   if(QFile::exists(qsdk + "/include/qt6/QtCore"))
@@ -745,16 +792,9 @@ static inline void populateIncludeDirs(std::vector<std::string>& args)
   include(qt_folder + "/QtShaderTools");
   include(qt_folder + "/QtShaderTools/" + qt_version);
   include(qt_folder + "/QtShaderTools/" + qt_version + "/QtShaderTools");
-  include(qt_folder + "/QtSerialBus");
   include(qt_folder + "/QtSerialPort");
 
-#if !SCORE_FHS_BUILD
-  bool deploying = true;
-#else
-  bool deploying = false;
-#endif
-
-  if(deploying && sdk_found)
+  if(sdk_location.sdk_kind == located_sdk::official && sdk_location.deploying)
   {
     include("score");
   }

src/plugins/score-plugin-jit/JitCpp/MetadataGenerator.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#include <JitCpp/JitPlatform.hpp>
+
 #include <score/tools/File.hpp>
 
 #include <QDir>
@@ -238,28 +240,35 @@ static void loadCMakeAddon(const QString& addon, AddonData& data, QString cm)
     }
   }
 
+  auto sdk_location = locateSDKWithFallback();
+  auto qsdk = QString::fromStdString(sdk_location.path);
+  QString prototypes_folders;
+  if(sdk_location.sdk_kind == located_sdk::official && sdk_location.deploying)
+  {
+    prototypes_folders = qsdk + "/lib/cmake/score";
+  }
+  else
+  {
+    prototypes_folders
+        = QString::fromUtf8(SCORE_ROOT_SOURCE_DIR) + "/src/plugins/score-plugin-avnd/";
+  }
+
   for(auto& gp : groups)
   {
     auto avnd_plugin_version = gp.version.toUtf8();
     auto avnd_plugin_uuid = gp.uuid.toUtf8();
     avnd_plugin_uuid.removeIf([](char c) { return c == '"'; });
     auto avnd_base_target = gp.base_target.toUtf8();
 
-    QFile proto_file = QFile(
-        "/home/jcelerier/ossia/score/src/plugins/score-plugin-avnd/"
-        "prototype.cpp.in");
+    QFile proto_file = QFile(prototypes_folders + "/prototype.cpp.in");
     proto_file.open(QIODevice::ReadOnly);
     auto proto = proto_file.readAll();
 
-    QFile cpp_proto_file = QFile(
-        "/home/jcelerier/ossia/score/src/plugins/score-plugin-avnd/"
-        "plugin_prototype.cpp.in");
+    QFile cpp_proto_file = QFile(prototypes_folders + "/plugin_prototype.cpp.in");
     cpp_proto_file.open(QIODevice::ReadOnly);
     auto cpp_proto = cpp_proto_file.readAll();
 
-    QFile hpp_proto_file = QFile(
-        "/home/jcelerier/ossia/score/src/plugins/score-plugin-avnd/"
-        "plugin_prototype.hpp.in");
+    QFile hpp_proto_file = QFile(prototypes_folders + "/plugin_prototype.hpp.in");
     hpp_proto_file.open(QIODevice::ReadOnly);
     auto hpp_proto = hpp_proto_file.readAll();