From e6cafdb3cf366670c10e4a8ff62bf9125fad66eb Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sun, 20 Aug 2023 15:34:44 +0100
Subject: [PATCH] Adjusted TDF mapping to use paths relative to the resources
 directory

---
 build/scripts/Avr8TargetDescriptionFiles.php                  | 4 ++--
 .../AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/scripts/Avr8TargetDescriptionFiles.php b/build/scripts/Avr8TargetDescriptionFiles.php
index 0fe53b92..21210033 100644
--- a/build/scripts/Avr8TargetDescriptionFiles.php
+++ b/build/scripts/Avr8TargetDescriptionFiles.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Copies AVR8 target description files to AVR_TDF_DEST_FILE_PATH, in preparation for a build, and creates a JSON
- * mapping of target signatures to file paths (relative to Bloom's binary).
+ * mapping of target signatures to file paths (relative to Bloom's resource directory).
  * The JSON mapping is compiled as a Qt resource and used for looking-up target description file paths, by target ID.
  *
  * This script should be run as part of the build process.
@@ -18,7 +18,7 @@ if (empty($buildPath)) {
 require_once __DIR__ . "/TargetDescriptionFiles/Factory.php";
 
 define("AVR_TDF_DEST_FILE_PATH", $buildPath . "/resources/TargetDescriptionFiles/AVR");
-define("AVR_TDF_DEST_RELATIVE_FILE_PATH", "../resources/TargetDescriptionFiles/AVR");
+define("AVR_TDF_DEST_RELATIVE_FILE_PATH", "TargetDescriptionFiles/AVR");
 define("AVR_TDF_MAPPING_FILE_PATH", AVR_TDF_DEST_FILE_PATH . "/Mapping.json");
 
 // Empty destination directory
diff --git a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
index a94caca5..1e483826 100644
--- a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
+++ b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
@@ -34,7 +34,7 @@ namespace Targets::Microchip::Avr::Avr8Bit::TargetDescription
 
         const auto descriptionFileObject = descriptionFileObjectIt.value().toObject();
         const auto descriptionFilePath = QString::fromStdString(
-            Services::PathService::applicationDirPath()) + "/" + descriptionFileObject.find("tdfPath")->toString();
+            Services::PathService::resourcesDirPath()) + "/" + descriptionFileObject.find("tdfPath")->toString();
 
         Logger::debug("Loading AVR8 target description file: " + descriptionFilePath.toStdString());