feat: Now can use trunk lazbuild

Author: gcarreno

entries/entries.json.example

@@ -13,6 +13,7 @@
             "name": "Official Baseline",
             "notes": "Beeing the last of all",
             "compiler": "fpc",
+            "use-trunk": false,
             "entry-folder": "../baseline/Lazarus/src",
             "entry-binary": "baseline",
             "lpi": "baseline.lpi",
@@ -26,6 +27,7 @@
             "name": "Gustavo Carreno",
             "notes": "Using 30 threads",
             "compiler": "fpc",
+            "use-trunk": false,
             "entry-folder": "gcarreno/src",
             "entry-binary": "gcarreno",
             "lpi": "gcarreno.lpi",

utilities/common/utilities.data.config.pas

@@ -46,6 +46,7 @@   TConfig = class(TObject)
     FHyperfine: TJSONStringType;
 
     FLazbuild: TJSONStringType;
+    FLazbuildTrunk: TJSONStringType;
     FDelphiCompiler: TJSONStringType;
 
     FOutputHash: TJSONStringType;
@@ -95,6 +96,9 @@   TConfig = class(TObject)
     property Lazbuild: TJSONStringType
       read FLazbuild
       write FLazbuild;
+    property LazbuildTrunk: TJSONStringType
+      read FLazbuildTrunk
+      write FLazbuildTrunk;
     property DelphiCompiler: TJSONStringType
       read FDelphiCompiler
       write FDelphiCompiler;
@@ -120,6 +124,7 @@ implementation
   cJSONInput          = 'input';
   cJSONHyperfine      = 'hyperfine';
   cJSONLazbuild       = 'lazbuild';
+  cJSONLazbuildTrunk  = 'lazbuild-trunk';
   cJSONDelphiCompiler = 'delphi-compiler';
   cJSONOutpuHash      = 'output-hash';
   cJSONEntries        = 'entries';
@@ -144,6 +149,7 @@ constructor TConfig.Create;
   FInput:= '';
   FHyperfine:= '';
   FLazbuild:= '';
+  FLazbuildTrunk:= '';
   FDelphiCompiler:= '';
   FOutputHash:= '';
 end;
@@ -187,6 +193,7 @@ procedure TConfig.setFromJSONObject(const AJSONObject: TJSONObject);
   FHyperfine:= AJSONObject.Get(cJSONHyperfine, FHyperfine);
 
   FLazbuild:= AJSONObject.Get(cJSONLazbuild, FLazbuild);
+  FLazbuildTrunk:= AJSONObject.Get(cJSONLazbuildTrunk, FLazbuildTrunk);
   FDelphiCompiler:= AJSONObject.Get(cJSONDelphiCompiler, FDelphiCompiler);
 
   FOutputHash:= AJSONObject.Get(cJSONOutpuHash, FOutputHash);

utilities/common/utilities.data.entries.pas

@@ -37,6 +37,7 @@   TEntry = class(TObject)
     FName: TJSONStringType;
     FNotes: TJSONStringType;
     FCompiler: TJSONStringType;
+    FUseTrunk: Boolean;
     FEntryFolder: TJSONStringType;
     FEntryBinary: TJSONStringType;
     FLPI: TJSONStringType;
@@ -68,6 +69,9 @@   TEntry = class(TObject)
     property Compiler: TJSONStringType
       read FCompiler
       write FCompiler;
+    property UseTrunk: Boolean
+      read FUseTrunk
+      write FUseTrunk;
     property EntryFolder: TJSONStringType
       read FEntryFolder
       write FEntryFolder;
@@ -146,6 +150,7 @@ implementation
   cJSONName        = 'name';
   cJSONNotes       = 'notes';
   cJSONCompiler    = 'compiler';
+  cJSONUseTrunk    = 'use-trunk';
   cJSONEntryFolder = 'entry-folder';
   cJSONEntryBinary = 'entry-binary';
   cJSONLPI         = 'lpi';
@@ -169,6 +174,7 @@ constructor TEntry.Create;
   FName:= '';
   FNotes:= '';
   FCompiler:= '';
+  FUseTrunk:= False;
   FEntryFolder:= '';
   FEntryBinary:= '';
   FLPI:= '';
@@ -204,6 +210,7 @@ procedure TEntry.setFromJSONObject(const AJSONObject: TJSONObject);
   FName:= AJSONObject.Get(cJSONName, FName);
   FNotes:= AJSONObject.Get(cJSONNotes, FNotes);
   FCompiler:= AJSONObject.Get(cJSONCompiler, FCompiler);
+  FUseTrunk:= AJSONObject.Get(cJSONUseTrunk, FUseTrunk);
   FEntryFolder:= AJSONObject.Get(cJSONEntryFolder, FEntryFolder);
   FEntryBinary:= AJSONObject.Get(cJSONEntryBinary, FEntryBinary);
   FLPI:= AJSONObject.Get(cJSONLPI, FLPI);

utilities/script_builder/Common/scriptbuilder.common.pas

@@ -171,15 +171,22 @@ function TBuilder.GetVariablesBash: String;
 end;
 
 function TBuilder.GetFunctionCompileBash(const AEntry: TEntry): String;
+var
+  lazbuild: String;
 begin
   Result:= 'function ' + AEntry.EntryBinary + '() {' + LineEnding;
   Result:= Result + '  echo "===== '+ UTF8Encode(AEntry.Name) +' ======"' + LineEnding;
   {$IFDEF UNIX}
+  if AEntry.UseTrunk then
+   lazbuild:= FConfig.LazbuildTrunk
+  else
+    lazbuild:= FConfig.Lazbuild;
+
   if AEntry.HasRelease then
   begin
    Result:= Result + '  ' +
    Format(cLazbuildRelease, [
-     FConfig.Lazbuild,
+     lazbuild,
      '${ENTRIES}/' + AEntry.EntryFolder + '/' + AEntry.LPI
    ] ) +
    LineEnding;
@@ -188,7 +195,7 @@ function TBuilder.GetFunctionCompileBash(const AEntry: TEntry): String;
   begin
     Result:= Result + '  ' +
     Format(cLazbuildDefault, [
-      FConfig.Lazbuild,
+      lazbuild,
       '${ENTRIES}/' + AEntry.EntryFolder + '/' + AEntry.LPI
     ] ) +
     LineEnding;