Merge branch 'gus' of https://github.com/paweld/1brc-ObjectPascal into gus

Author: paweld

utilities/script_builder/Common/scriptbuilder.common.pas

@@ -34,13 +34,9 @@   TBuilder = class(TObject)
     constructor Create(AConfigFile: String);
     destructor Destroy; override;
 
-    {$IFDEF UNIX}
     procedure BuildCompileScriptBash;
     procedure BuildTestScriptBash;
     procedure BuildRunScriptBash;
-    {$ELSE}
-    procedure BuildCompileScriptPowerShell;
-    {$ENDIF}
   published
   end;
 
@@ -50,7 +46,9 @@ implementation
   {$IFDEF FPC}
   fpjson
 , jsonparser
+  {$IFDEF UNIX}
 , BaseUnix
+  {$ENDIF}
   {$ELSE}
   {$ENDIF}
 ;
@@ -72,9 +70,8 @@ implementation
 
   cBaselineBinary      = 'baseline';
   cCompilerFPC         = 'fpc';
-  //  cCompilerDelphi      = 'delphi';
+  cCompilerDelphi      = 'delphi';
   cSSD                 = 'SSD';
-//  cHDD                 = 'HDD';
 
 resourcestring
   rsEPatternsLengthDOntMatch = 'Patterns length does not match';
@@ -86,7 +83,6 @@ constructor TBuilder.Create(AConfigFile: String);
   configStream: TFileStream;
   configJSONData: TJSONData;
 begin
-  { #todo 99 -ogcarreno : Config file must be used here }
   configStream:= TFileStream.Create(AConfigFile, fmOpenRead);
   try
     configJSONData:= GetJSON(configStream);
@@ -154,10 +150,15 @@ procedure TBuilder.BuildCompileScriptBash;
     begin
       Write(GenerateProgressBar(index+1, FConfig.Entries.Count, 50), lineBreak);
       if not FConfig.Entries[index].Active then continue;
+      {$IFDEF UNIX}
       if FConfig.Entries[index].Compiler <> cCompilerFPC then continue;
+      {$ELSE}
+      if FConfig.Entries[index].Compiler <> cCompilerDelphi then continue;
+      {$ENDIF}
       //if FConfig.Entries[index].EntryBinary = cBaselineBinary then continue;
       line:= line + 'function ' + FConfig.Entries[index].EntryBinary + '() {' + LineEnding + LineEnding;
       line:= line + '  echo "===== '+ FConfig.Entries[index].Name +' ======"' + LineEnding;
+      {$IFDEF UNIX}
       if FConfig.Entries[index].HasRelease then
       begin
        line:= line  +
@@ -188,22 +189,33 @@ procedure TBuilder.BuildCompileScriptBash;
         ] ) +
         LineEnding;
       end;
+      {$ELSE}
+      line:= line + '  # Needs the Delphi command line stuff' + LineEnding;
+      {$ENDIF}
       line:= line + '  echo "==========="' + LineEnding;
       line:= line + '  echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
     end;
     line:= line + 'if [ $1 == "" ];then'  + LineEnding;
     for index:= 0 to Pred(FConfig.Entries.Count) do
     begin
       if not FConfig.Entries[index].Active then continue;
+      {$IFDEF UNIX}
       if FConfig.Entries[index].Compiler <> cCompilerFPC then continue;
+      {$ELSE}
+      if FConfig.Entries[index].Compiler <> cCompilerDelphi then continue;
+      {$ENDIF}
       line:= line + '  ' + FConfig.Entries[index].EntryBinary + LineEnding;
     end;
     line:= line + 'else'  + LineEnding;
     line:= line + '  case $1 in'  + LineEnding;
     for index:= 0 to Pred(FConfig.Entries.Count) do
     begin
       if not FConfig.Entries[index].Active then continue;
+      {$IFDEF UNIX}
       if FConfig.Entries[index].Compiler <> cCompilerFPC then continue;
+      {$ELSE}
+      if FConfig.Entries[index].Compiler <> cCompilerDelphi then continue;
+      {$ENDIF}
       line:= line + '    ' + FConfig.Entries[index].EntryBinary + ')' + LineEnding;
       line:= line + '      ' + FConfig.Entries[index].EntryBinary + LineEnding;
       line:= line + '      ;;'  + LineEnding;
@@ -217,17 +229,11 @@ procedure TBuilder.BuildCompileScriptBash;
   finally
     FScriptStream.Free;
   end;
+  {$IFDEF UNIX}
   FpChmod(PChar(FScriptFile), &775);
+  {$ENDIF}
 end;
 
-{$IFNDEF UNIX}
-procedure TBuilder.BuildCompileScriptPowerShell;
-begin
-  { #todo 99 -ogcarreno : Using the command line compiler, compile the binary for Linux 64b }
-  { #todo 99 -ogcarreno : Using scp copy the resulting binary to Linux }
-end;
-{$ENDIF}
-
 procedure TBuilder.BuildTestScriptBash;
 var
   index: Integer;
@@ -308,7 +314,9 @@ procedure TBuilder.BuildTestScriptBash;
   finally
     FScriptStream.Free;
   end;
+  {$IFDEF UNIX}
   FpChmod(PChar(FScriptFile), &775);
+  {$ENDIF}
 end;
 
 procedure TBuilder.BuildRunScriptBash;
@@ -341,7 +349,7 @@ procedure TBuilder.BuildRunScriptBash;
           FConfig.Entries[index].EntryBinary,
           Format('%s%s', [
             IncludeTrailingPathDelimiter(FConfig.ResultsFolder),
-            FConfig.Entries[index].EntryBinary + '-1_000_000_000-SSD.json'
+            FConfig.Entries[index].EntryBinary + '-1_000_000_000-' + cSSD + '.json'
           ]),
           Format('%s%s %s', [
             IncludeTrailingPathDelimiter(FConfig.BinFolder),
@@ -363,7 +371,7 @@ procedure TBuilder.BuildRunScriptBash;
         ],
         [rfReplaceAll]
       );
-      line:= line + '  echo "-- SSD --"' + LineEnding + '  ' + tmpStr + LineEnding;
+      line:= line + '  echo "-- ' + cSSD + ' --"' + LineEnding + '  ' + tmpStr + LineEnding;
       line:= line + '  echo "==========="' + LineEnding;
       line:= line + '  echo' + LineEnding + LineEnding + '}' + LineEnding + LineEnding;
     end;
@@ -393,7 +401,9 @@ procedure TBuilder.BuildRunScriptBash;
   finally
     FScriptStream.Free;
   end;
+  {$IFDEF UNIX}
   FpChmod(PChar(FScriptFile), &775);
+  {$ENDIF}
 end;
 
 end.

utilities/script_builder/Lazarus/src/scriptbuilder.lpr

@@ -89,24 +89,18 @@ procedure TScriptBuilder.DoRun;
   FBuilder:= TBuilder.Create(configFilename);
   try
     WriteLn('=== Compile Script ===');
-    {$IFDEF UNIX}
     FBuilder.BuildCompileScriptBash;
-    {$ELSE}
-    FBuilder.BuildCompileScriptPowerShell;
-    {$ENDIF}
     WriteLn;
 
     {$IFDEF UNIX}
     WriteLn('=== Test Script ===');
     FBuilder.BuildTestScriptBash;
-    {$ENDIF}
     WriteLn;
 
-    {$IFDEF UNIX}
     WriteLn('=== Run Script ===');
     FBuilder.BuildRunScriptBash;
-    {$ENDIF}
     WriteLn;
+    {$ENDIF}
   finally
     FBuilder.Free;
   end;