+8

SunSerega · Jun 24, 2023 · 48e9be9 · 48e9be9
1 parent baeb1ad
commit 48e9be9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/on commit.yaml b/.github/workflows/on commit.yaml
@@ -43,7 +43,7 @@ jobs:
               run: |
               
                 Start-Process -FilePath 'D:\PABCNETC\pabcnetcclear.exe' -ArgumentList '"PackAll.pas"' -Wait -NoNewWindow
-                Start-Process -FilePath 'PackAll.exe' -ArgumentList '"Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=/home/PABCNETC/pabcnetcclear.exe"' -Wait -NoNewWindow
+                Start-Process -FilePath 'PackAll.exe' -ArgumentList '"Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=D:\PABCNETC\pabcnetcclear.exe"' -Wait -NoNewWindow
                 
             - name: Check for changes
               run: |
@@ -91,8 +91,8 @@ jobs:
                 #unzip -j PABCNETC.zip -d PABCNETC
                 
                 sudo apt-get install -y minizip
-                mkdir /home/PABCNETC
-                miniunzip ../PABCNETC.zip -d /home/PABCNETC
+                mkdir ../PABCNETC
+                miniunzip ../PABCNETC.zip -d ../PABCNETC
                 
             - name: Install Mono
               run: |
@@ -109,8 +109,8 @@ jobs:
             - name: Build and run OpenCL program
               run: |
               
-                mono "/home/PABCNETC/pabcnetcclear.exe" "PackAll.pas"
-                mono "PackAll.exe" "Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=/home/PABCNETC/pabcnetcclear.exe"
+                mono "../PABCNETC/pabcnetcclear.exe" "PackAll.pas"
+                mono "PackAll.exe" "Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=../PABCNETC/pabcnetcclear.exe"
                 
             - name: Check for changes
               run: |

diff --git a/Utils/AOtp.pas b/Utils/AOtp.pas
@@ -352,9 +352,8 @@ procedure ErrOtp(e: Exception);
   begin
     if '[REDIRECTIOMODE]' not in System.Environment.GetCommandLineArgs.Skip(1).Take(1) then
       ReadString(#10'Press Enter to exit:');
-    Halt;
-  end else
-    Halt(e.HResult);
+  end;
+  Halt(e.HResult);
 
 end;
 

diff --git a/Utils/SubExecuters.pas b/Utils/SubExecuters.pas
@@ -63,9 +63,11 @@
       Result := false;
       if not FileExists(path) then
       begin
-        Otp(new OtpLine($'WARNING: pas_comp_path "{path}" did not refer to a file', true));
+        Otp(new OtpLine($'WARNING: PasCompPath "{path}" did not refer to a file', true));
         exit;
       end;
+      path := System.IO.Path.GetFullPath(path);
+      Otp(new OtpLine($'PasCompPath is set to "{path}"', true));
       if pas_comp_path<>nil then
         raise new System.InvalidOperationException($'Path already set to: {pas_comp_path}');
       pas_comp_path := path;