Changeset 18 for trunk/Backends/Subversion/USubversion.pas

Timestamp:

Nov 6, 2017, 1:14:20 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Build with newer Lazarus version.
• Fixed: Creation of application configuration file.
• Fixed: Wrong decimal point used for XML datetime decode.
• Added: Detect Subversion exe files from TortoiseSVN directory on Windows.

File:

• trunk/Backends/Subversion/USubversion.pas (modified) (2 diffs)

trunk/Backends/Subversion/USubversion.pas

@@ -50 +50 @@
 
 procedure TRepositorySubversion.Execute(Parameters: array of string);
+var
+  ToolPath: string;
 begin
   {$IFDEF Linux}
-  ExecuteProcess('/usr/bin/svnadmin', Parameters);
+  ToolPath := '/usr/bin/svnadmin';
   {$ENDIF}
   {$IFDEF Windows}
-  ExecuteProcess('c:\Program Files\Subversion\bin\svnadmin.exe', Parameters);
-  {$ENDIF}
+  ToolPath := 'c:\Program Files\Subversion\bin\svnadmin.exe';
+  if not FileExists(ToolPath) then
+    ToolPath := 'C:\Program Files\TortoiseSVN\bin\svnadmin.exe';
+  {$ENDIF}
+  ExecuteProcess(ToolPath, Parameters);
 end;
 
@@ -83 +88 @@
 
 procedure TSubversion.Execute(Parameters: array of string);
+var
+  ToolPath: string;
 begin
   {$IFDEF Linux}
-  ExecuteProcess('/usr/bin/svn', Parameters);
+  ToolPath := '/usr/bin/svn';
   {$ENDIF}
   {$IFDEF Windows}
-  ExecuteProcess('c:\Program Files\Subversion\bin\svn.exe', Parameters);
-  {$ENDIF}
+  ToolPath := 'c:\Program Files\Subversion\bin\svn.exe';
+  if not FileExists(ToolPath) then
+    ToolPath := 'C:\Program Files\TortoiseSVN\bin\svn.exe';
+  {$ENDIF}
+  ExecuteProcess(ToolPath, Parameters);
 end;