gprfiles: remove relative with + make generated dir setable

rhubert · reet- · commit 2b2bee381d12 · 2025-04-10T17:55:51.000+02:00
diff --git a/components/ahci_drv/ahci_drv.gpr b/components/ahci_drv/ahci_drv.gpr
@@ -16,14 +16,14 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmuchannel/libmuchannel";
-with "../libmudebuglog/libmudebuglog";
+with "libmuchannel";
+with "libmudebuglog";
+with "common_strings";
 
 project Ahci_Drv extends "../component_spark" is
 
    for Languages use ("Ada", "Asm");
-   for Source_Dirs use ("generated", "src", "../../common/strings/impl")
-     & Component_Spark.Src_Dirs;
+   for Source_Dirs use (external("GENERATED"), "src", "../src");
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
    for Main use ("ahci_drv");
 
diff --git a/components/common.gpr b/components/common.gpr
@@ -16,7 +16,8 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../build-cfg/gpr/shared";
+with "shared";
+with "muen_common";
 
 abstract project Common is
 
@@ -26,7 +27,7 @@ abstract project Common is
    type Proof_Type is ("limited", "complete");
    Proof_Mode : Proof_Type := external ("proofs", "limited");
 
-   Src_Dirs := ("../../common/src", "../src");
+   Src_Dirs := ("src");
    Extra_Warning_Switches := ();
    Extra_Compiler_Switches := ();
    Preprocessor_Switches := ();
@@ -59,7 +60,7 @@ abstract project Common is
    end case;
 
    package Builder is
-      for Global_Configuration_Pragmas use "../build-cfg/gpr/restrictions.adc";
+      for Global_Configuration_Pragmas use external ("BUILD_CFG_PATH") & "/restrictions.adc";
    end Builder;
 
    package Compiler is
@@ -69,7 +70,7 @@ abstract project Common is
         & Preprocessor_Switches
         & Shared.Warning_Switches
         & Extra_Warning_Switches;
-      for Local_Configuration_Pragmas use "../build-cfg/gpr/restrictions-" & Build_Mode & ".adc";
+      for Local_Configuration_Pragmas use external ("BUILD_CFG_PATH") & "/restrictions-" & Build_Mode & ".adc";
    end Compiler;
 
    package Naming is
diff --git a/components/component.ld b/components/component.ld
@@ -62,6 +62,7 @@ SECTIONS
 		*(.comment)
 		*(.eh_frame)
 		*(.eh_frame_hdr)
+		*(.note.gnu.build-id)
 		*(.note.gnu.property)
 		*(.dynamic)
 		*(.dyns*)
diff --git a/components/component_spark.gpr b/components/component_spark.gpr
@@ -16,7 +16,7 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../build-cfg/gpr/shared";
+with "shared";
 
 abstract project Component_Spark extends "common.gpr" is
 
diff --git a/components/controller/controller.gpr b/components/controller/controller.gpr
@@ -16,17 +16,15 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmudebuglog/libmudebuglog";
-with "../libmucontroltypes/libmucontroltypes";
+with "common_strings";
+with "muinterrupts";
+with "libmudebuglog";
+with "libmucontroltypes";
 
 project Controller extends "../component_spark" is
 
-   Extra_Dirs := Component_Spark.Src_Dirs
-     & "../../common/muinterrupts"
-     & "../../common/strings/impl";
-
    for Languages use ("Ada", "Asm");
-   for Source_Dirs use ("generated", "src") & Extra_Dirs;
+   for Source_Dirs use (external("GENERATED"), "src", "../src");
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
    for Main use ("controller");
 
diff --git a/components/dbgserver/dbgserver.gpr b/components/dbgserver/dbgserver.gpr
@@ -15,20 +15,20 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libxhcidbg/libxhcidbg";
-with "../libmudebuglog/libmudebuglog";
-with "../libmusinfo/libmusinfo";
-with "generated/dbg_config";
+with "libxhcidbg";
+with "libmudebuglog";
+with "libmusinfo";
+with "dbg_config";
+with "crash_audit";
+with "muen_common";
+with "common_debug";
+with "common_strings";
 
 project Dbgserver extends "../component_spark" is
 
    Src_Dirs :=
-     ("../../common/debug",
-      "../../common/src",
-      "../../common/crash_audit",
-      "../../common/strings/impl",
-      "../src",
-      "generated",
+     ("../src",
+      external("GENERATED"),
       "src",
       "src/sinks/pcspkr",
       "src/sinks/serial",
diff --git a/components/dbgserver/src/dbg-crash_audit.ads b/components/dbgserver/src/dbg-crash_audit.ads
@@ -17,6 +17,7 @@
 --
 
 package Dbg.Crash_Audit
+with SPARK_Mode => Off
 is
 
    --  Process crash audit records if present.
diff --git a/components/dm/dm.gpr b/components/dm/dm.gpr
@@ -16,14 +16,14 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmudebuglog/libmudebuglog";
-with "../libmudm/libmudm";
+with "common_strings";
+with "libmudebuglog";
+with "libmudm";
 
 project Dm extends "../component_spark" is
 
    for Languages use ("Ada", "Asm");
-   for Source_Dirs use ("generated", "src", "../../common/strings/impl")
-     & Component_Spark.Src_Dirs;
+   for Source_Dirs use (external("GENERATED"), "src", "../src");
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
    for Main use ("dm");
 
diff --git a/components/example/example.gpr b/components/example/example.gpr
@@ -16,20 +16,18 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmudebuglog/libmudebuglog";
-with "../libmusinfo/libmusinfo";
-with "../libmucontrol/libmucontrol";
-with "generated/example_config";
+with "libmudebuglog";
+with "libmusinfo";
+with "libmucontrol";
+with "example_config";
+with "common_strings";
+with "crash_audit";
+with "common_debug";
+with "mutimedevents";
 
 project Example extends "../component_spark" is
 
-   Src_Dirs := Component_Spark.Src_Dirs
-     & "src"
-     & "generated"
-     & "../../common/strings/impl"
-     & "../../common/crash_audit"
-     & "../../common/debug"
-     & "../../common/mutimedevents";
+   Src_Dirs := ("src", external("GENERATED"), "../src");
    Obj_Suffix := "/";
 
    case example_config.ahci_drv_enabled is
diff --git a/components/isolation_tests/isolation_tests.gpr b/components/isolation_tests/isolation_tests.gpr
@@ -16,17 +16,16 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmudebuglog/libmudebuglog";
-with "../libmusinfo/libmusinfo";
+with "libmudebuglog";
+with "libmusinfo";
+with "common_strings";
 
 project Isolation_Tests extends "../component_spark" is
 
    Extra_Dirs := Component_Spark.Src_Dirs;
-   Extra_Dirs := Extra_Dirs
-     & "../../common/strings/impl";
 
    for Languages use ("Ada", "Asm");
-   for Source_Dirs use ("generated", "src") & Extra_Dirs;
+   for Source_Dirs use (external("GENERATED"), "src", "../src") & Extra_Dirs;
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
    for Main use ("isolation_tests");
 
diff --git a/components/isolation_tests_monitor/isolation_tests_monitor.gpr b/components/isolation_tests_monitor/isolation_tests_monitor.gpr
@@ -19,7 +19,7 @@
 project Isolation_Tests_Monitor extends "../component_spark" is
 
    for Languages use ("Ada", "Asm");
-   for Source_Dirs use ("generated", "src") & Component_Spark.Src_Dirs;
+   for Source_Dirs use (external("GENERATED"), "src", "../src") & Component_Spark.Src_Dirs;
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
    for Main use ("isolation_tests_monitor");
 
diff --git a/components/libmuchannel/libmuchannel.gpr b/components/libmuchannel/libmuchannel.gpr
@@ -26,7 +26,7 @@
 --  POSSIBILITY OF SUCH DAMAGE.
 --
 
-library project Libmuchannel extends "../library_spark" is
+library project Libmuchannel extends "library_spark" is
 
    for Languages use ("Ada");
    for Source_Dirs use ("src");
diff --git a/components/libmucontrol/libmucontrol.gpr b/components/libmucontrol/libmucontrol.gpr
@@ -26,12 +26,12 @@
 --  POSSIBILITY OF SUCH DAMAGE.
 --
 
-with "../libmucontroltypes/libmucontroltypes";
+with "libmucontroltypes";
 
 library project Libmucontrol extends "../library_spark" is
 
    for Languages use ("Ada");
-   for Source_Dirs use ("generated", "src");
+   for Source_Dirs use (external("GENERATED"), "src");
    for Object_Dir use "obj/" & Library_Spark.Build_Mode;
    for Library_Dir use "lib/" & Library_Spark.Build_Mode;
    for Library_Name use "mucontrol";
diff --git a/components/libmudebuglog/libmudebuglog.gpr b/components/libmudebuglog/libmudebuglog.gpr
@@ -25,13 +25,13 @@
 --  POSSIBILITY OF SUCH DAMAGE.
 --
 
-with "../libmusinfo/libmusinfo";
-with "../libmuchannel/libmuchannel";
+with "libmusinfo";
+with "libmuchannel";
 
-library project Libmudebuglog extends "../library_spark" is
+library project Libmudebuglog extends "library_spark" is
 
    for Languages use ("Ada");
-   for Source_Dirs use ("generated", "src");
+   for Source_Dirs use (external("LIBMUDEBUGLOG_GENERATED", "generated"), "src");
    for Object_Dir use "obj/" & Library_Spark.Build_Mode;
    for Library_Dir use "lib/" & Library_Spark.Build_Mode;
    for Library_Name use "mudebuglog";
diff --git a/components/libmudm/libmudm.gpr b/components/libmudm/libmudm.gpr
@@ -26,12 +26,12 @@
 --  POSSIBILITY OF SUCH DAMAGE.
 --
 
-with "../libmusinfo/libmusinfo";
+with "libmusinfo";
 
 library project Libmudm extends "../library_spark" is
 
    for Languages use ("Ada");
-   for Source_Dirs use ("src", "generated");
+   for Source_Dirs use ("src", external("GENERATED"));
    for Object_Dir use "obj/" & Library_Spark.Build_Mode;
    for Library_Dir use "lib/" & Library_Spark.Build_Mode;
    for Library_Name use "mudm";
diff --git a/components/libmuinit/libmuinit.gpr b/components/libmuinit/libmuinit.gpr
@@ -26,9 +26,9 @@
 --  POSSIBILITY OF SUCH DAMAGE.
 --
 
-with "../../build-cfg/gpr/shared.gpr";
-with "../libmusinfo/libmusinfo";
-with "../libmucontrol/libmucontrol";
+with "shared";
+with "libmusinfo";
+with "libmucontrol";
 with "libsparkcrypto";
 
 library project Libmuinit extends "../library_spark" is
diff --git a/components/libmusinfo/libmusinfo.gpr b/components/libmusinfo/libmusinfo.gpr
@@ -30,9 +30,7 @@ library project Libmusinfo extends "../library_spark" is
 
    for Languages use ("Ada");
    for Source_Dirs use
-     ("src",
-      "../../common/musinfo",
-      "../../common/muschedinfo");
+     ("src")
    for Object_Dir use "obj/" & Library_Spark.Build_Mode;
    for Library_Dir use "lib/" & Library_Spark.Build_Mode;
    for Library_Name use "musinfo";
diff --git a/components/libmutime/libmutime.gpr b/components/libmutime/libmutime.gpr
@@ -29,7 +29,7 @@
 library project Libmutime extends "../library_spark" is
 
    for Languages use ("Ada");
-   for Source_Dirs use ("generated", "src");
+   for Source_Dirs use (external("LIBMUTIME_GENERATED"), "src");
    for Object_Dir use "obj/" & Library_Spark.Build_Mode;
    for Library_Dir use "lib/" & Library_Spark.Build_Mode;
    for Library_Name use "mutime";
diff --git a/components/muinit/muinit.gpr b/components/muinit/muinit.gpr
@@ -26,9 +26,9 @@
 --  POSSIBILITY OF SUCH DAMAGE.
 --
 
-with "../../build-cfg/gpr/shared.gpr";
-with "../libmusinfo/libmusinfo";
-with "../libmuinit/libmuinit";
+with "shared";
+with "libmusinfo";
+with "libmuinit";
 with "libsparkcrypto";
 
 project Muinit extends "../common" is
diff --git a/components/ps2_drv/ps2_drv.gpr b/components/ps2_drv/ps2_drv.gpr
@@ -16,17 +16,16 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmudebuglog/libmudebuglog";
+with "libmudebuglog";
+with "common_strings";
+with "muen_common";
 
 project Ps2_Drv extends "../component_spark" is
 
    for Languages use ("Ada", "Asm");
    for Source_Dirs use
-     ("../../common/src",
-      "../../common/strings/impl",
-      "../src",
-      "generated",
-      "src");
+     (external("GENERATED"),
+      "src", "../src");
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
 
    for Main use ("ps2_drv");
diff --git a/components/sl/sl.gpr b/components/sl/sl.gpr
@@ -16,12 +16,12 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmusinfo/libmusinfo";
-with "../libmuinit/libmuinit";
+with "libmusinfo";
+with "libmuinit";
 
 project Sl extends "../component_spark" is
 
-   Extra_Dirs := Component_Spark.Src_Dirs & "generated";
+   Extra_Dirs := Component_Spark.Src_Dirs & external("GENERATED");
 
    case Component_Spark.Build_Mode is
       when "debug"   => Extra_Dirs := Extra_Dirs & Component_Spark.Build_Mode;
@@ -30,7 +30,7 @@ project Sl extends "../component_spark" is
    end case;
 
    for Languages use ("Ada", "Asm");
-   for Source_Dirs use ("src") & Extra_Dirs;
+   for Source_Dirs use ("src", "../src") & Extra_Dirs;
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
    for Main use ("sl");
 
diff --git a/components/sm/sm.gpr b/components/sm/sm.gpr
@@ -16,11 +16,12 @@
 --  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
-with "../libmudebuglog/libmudebuglog";
-with "../libmutime/libmutime";
-with "../libmudm/libmudm";
-with "../libmucontrol/libmucontrol";
-with "generated/config";
+with "common_strings";
+with "libmudebuglog";
+with "libmutime";
+with "libmudm";
+with "libmucontrol";
+with "config";
 
 project Sm extends "../component_spark" is
 
@@ -39,7 +40,7 @@ project Sm extends "../component_spark" is
    end Naming;
 
    for Languages use ("Ada", "Asm");
-   for Source_Dirs use ("generated", "src", "../../common/strings/impl")
+   for Source_Dirs use (external("GENERATED"), "src", "../src")
      & Component_Spark.Src_Dirs;
    for Object_Dir use "obj/" & Component_Spark.Build_Mode;
    for Main use ("sm");
diff --git a/components/src/sk-hypercall.ads b/components/src/sk-hypercall.ads
diff --git a/components/tau0/tau0.gpr b/components/tau0/tau0.gpr
diff --git a/components/time/time.gpr b/components/time/time.gpr
diff --git a/components/vt/vt.gpr b/components/vt/vt.gpr
diff --git a/kernel/kernel.gpr b/kernel/kernel.gpr
