refactor: Better path concatenation

Author: gcarreno

entries/entries.json.example

@@ -9,6 +9,17 @@
     "lazbuild": "{...}FreePascal_3.0/lazarus/lazbuild",
     "output-hash": "0000000000000000000000000000000000000000000000000000000000000000",
     "entries": [
+        {
+            "name": "Official Baseline",
+            "notes": "Beeing the last of all",
+            "compiler": "fpc",
+            "entry-folder": "../baseline/Lazarus/src",
+            "entry-binary": "baseline",
+            "lpi": "baseline.lpi",
+            "has-release": true,
+            "threads": 1,
+            "run-params": "-i [[input]]"
+        },
         {
             "name": "Gustavo Carreno",
             "notes": "Using 30 threads",

utilities/script_builder/Common/scriptbuilder.common.pas

@@ -61,8 +61,8 @@ implementation
   cTestBash            = 'test_all.sh';
   cRunBash             = 'run_all.sh';
 
-  cLazbuild            = '%s -B "%s%s%s"';
-  cLazbuildRelease     = '%s -B --bm="Release" "%s%s%s"';
+  cLazbuild            = '%s -B "%s"';
+  cLazbuildRelease     = '%s -B --bm="Release" "%s"';
 
   cReplaceName         = '[[name]]';
   cReplaceJSONResults  = '[[results-json]]';
@@ -151,9 +151,13 @@ procedure TBuilder.BuildCompileScriptBash;
        line:= line  +
        Format(cLazbuildRelease, [
          FConfig.Lazbuild,
-         IncludeTrailingPathDelimiter(FConfig.EntriesFolder),
-         IncludeTrailingPathDelimiter(FConfig.Entries[index].EntryFolder),
-         FConfig.Entries[index].LPI
+         ExpandFileName(
+           ConcatPaths([
+             IncludeTrailingPathDelimiter(FConfig.EntriesFolder),
+             IncludeTrailingPathDelimiter(FConfig.Entries[index].EntryFolder),
+             FConfig.Entries[index].LPI
+           ])
+         )
        ] ) +
        LineEnding;
       end
@@ -162,9 +166,13 @@ procedure TBuilder.BuildCompileScriptBash;
         line:= line  +
         Format(cLazbuild, [
           FConfig.Lazbuild,
-          IncludeTrailingPathDelimiter(FConfig.EntriesFolder),
-          IncludeTrailingPathDelimiter(FConfig.Entries[index].EntryFolder),
-          FConfig.Entries[index].LPI
+          ExpandFileName(
+            ConcatPaths([
+              IncludeTrailingPathDelimiter(FConfig.EntriesFolder),
+              IncludeTrailingPathDelimiter(FConfig.Entries[index].EntryFolder),
+              FConfig.Entries[index].LPI
+            ])
+          )
         ] ) +
         LineEnding;
       end;