fix: Correct args parsing for Windows/Linux

Author: gcarreno

baseline/Common/baseline.console.pas

@@ -39,7 +39,7 @@ interface
 
 procedure WriteHelp;
 {$IFNDEF FPC}
-function ParseCmdLineParams (out aInputFile: string): Boolean;
+function ParseCmdLineParams(out aInputFile: string): Boolean;
 {$ENDIF}
 
 
@@ -66,7 +66,7 @@ procedure WriteHelp;
 end;
 
 {$IFNDEF FPC}
-function ArrayContains (const aArray: array of string; const aValue: string): Boolean;
+function ArrayContains(const aArray: array of string; const aValue: string): Boolean;
 var
   iValue: string;
 begin
@@ -81,41 +81,50 @@ function ArrayContains (const aArray: array of string; const aValue: string): Bo
   end;
 end;
 
-function ParseCmdLineParams (out aInputFile: string): Boolean;
+function ParseCmdLineParams(out aInputFile: string): Boolean;
 var
   I: Integer;
 begin
   Result := False;
   aInputFile := '';
 
   // 0 is the exe path, so we start at 1
+{$IFNDEF LINUX}
   for I := 1 to ParamCount do
+{$ELSE}
+  for I := 1 to ParamCount + 1 do
+{$ENDIF}
   begin
-    if ArrayContains (cOptionHelp, ParamStr(I)) then
+    if ArrayContains(cOptionHelp, ParamStr(I)) then
     begin
       WriteHelp;
-      exit;
-    end
-    else if ArrayContains (cOptionVersion, ParamStr(I)) then
-    begin
-      WriteLn(Format(rsGeneratorVersion, [ cVersion ]));
-      exit;
+      Exit;
     end
-    else if ArrayContains (cOptionInput, ParamStr(I)) then
-    begin
-      // must be followed by the user's specified input file
-      if (I+1) <= ParamCount then
-        aInputFile := ExpandFileName (ParamStr (I+1));
-      if not TFile.Exists (aInputFile) then
-        WriteLn(Format(rsErrorMessage, [ Format(rsNoInputFile, [aInputFile]) ]))
-      else
+    else
+      if ArrayContains(cOptionVersion, ParamStr(I)) then
       begin
-        Result := True;
+        WriteLn(Format(rsGeneratorVersion, [ cVersion ]));
         exit;
-      end;
-    end
-    else
-      WriteLn(Format(rsErrorMessage, [ rsMissingInputFlag ]));
+      end
+      else
+        if ArrayContains(cOptionInput, ParamStr(I)) then
+        begin
+          // must be followed by the user's specified input file
+          if (I+1) <= ParamCount then
+            aInputFile := ExpandFileName (ParamStr (I+1));
+          if (aInputFile = '') or (not TFile.Exists (aInputFile)) then
+          begin
+            WriteLn(Format(rsErrorMessage, [ Format(rsNoInputFile, [aInputFile]) ]));
+            Exit;
+          end
+          else
+          begin
+            Result := True;
+            Exit;
+          end;
+        end
+        else
+          WriteLn(Format(rsErrorMessage, [ rsMissingInputFlag ]));
   end;
 end;
 {$ENDIF}

baseline/Delphi/src/Baseline.dpr

@@ -11,13 +11,12 @@ uses
 ;
 
 var
-  //vInputFilePath: string;
   vBaseline: TBaseline;
 begin
   try
-    if ParseCmdLineParams (inputFilename) then
+    if ParseCmdLineParams(inputFilename) then
     begin
-      vBaseline := TBaseline.Create (inputFilename);
+      vBaseline := TBaseline.Create(inputFilename);
       try
         vBaseline.Generate;
       finally
@@ -27,6 +26,6 @@ begin
 
   except
     on E: Exception do
-      Writeln(Format(rsErrorMessage, [ E.ClassName, ': ', E.Message ]));
+      WriteLn(Format(rsErrorMessage, [ E.ClassName, ': ', E.Message ]));
   end;
 end.

baseline/Delphi/src/Baseline.dproj

@@ -225,13 +225,15 @@
         <Debugger_Launcher>/usr/bin/gnome-terminal -- &quot;%debuggee%&quot;</Debugger_Launcher>
         <Manifest_File>(None)</Manifest_File>
         <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
+        <DCC_Define>LINUX;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <DCC_ExeOutput>..\..\bin</DCC_ExeOutput>
         <DCC_UnitSearchPath>..\..\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>(None)</Manifest_File>
         <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
+        <DCC_Define>WIN64;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">