Remove per-OS code in favor of GNAT.OS_Lib

alire-project · Jul 10, 2024 · 8f0542b · 8f0542b
1 parent 432ae28
commit 8f0542b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 39 deletions.
diff --git a/src/alire/alire.adb b/src/alire/alire.adb
@@ -11,6 +11,8 @@ with GNATCOLL.OS.Constants;
 
 package body Alire is
 
+   package OS renames GNAT.OS_Lib;
+
    ---------
    -- "=" --
    ---------
@@ -37,7 +39,17 @@ package body Alire is
    -- Check_Absolute_Path --
    -------------------------
 
-   function Check_Absolute_Path (Path : Any_Path) return Boolean is separate;
+   function Check_Absolute_Path (Path : Any_Path) return Boolean
+      is (OS.Is_Absolute_Path (Path)
+          and then
+          --  On Windows, we must ensure the path is not only absolute but
+          --  also that it has a drive letter. This is not checked by the
+          --  GNAT.OS_Lib function.
+            (if OS.Directory_Separator = '\'
+             then
+               (Path'Length >= 3
+                and then Path (Path'First) in 'a' .. 'z' | 'A' .. 'Z'
+                and then Path (Path'First + 1) = ':')));
 
    -------------
    -- Err_Log --

diff --git a/src/alire/os_freebsd/alire-check_absolute_path.adb b/src/alire/os_freebsd/alire-check_absolute_path.adb
diff --git a/src/alire/os_linux/alire-check_absolute_path.adb b/src/alire/os_linux/alire-check_absolute_path.adb
diff --git a/src/alire/os_macos/alire-check_absolute_path.adb b/src/alire/os_macos/alire-check_absolute_path.adb
diff --git a/src/alire/os_openbsd/alire-check_absolute_path.adb b/src/alire/os_openbsd/alire-check_absolute_path.adb
diff --git a/src/alire/os_windows/alire-check_absolute_path.adb b/src/alire/os_windows/alire-check_absolute_path.adb
diff --git a/testsuite/run.sh b/testsuite/run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+clear
+python3 run.py -M1 "$@"