Changeset 18

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.

Location:

trunk

Files:

• Backends/Subversion/USubversion.pas (modified) (2 diffs)
• Packages/Common/UXMLUtils.pas (modified) (1 diff)
• Packages/TemplateGenerics/Generic/GenericMatrix.inc (modified) (1 diff)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (4 diffs)
• VCSCommander.lpi (modified) (1 diff)
• VCSCommander.res (modified) ( previous)

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;
 

trunk/Packages/Common/UXMLUtils.pas

@@ -97 +97 @@
       if Pos('Z', XMLDateTime) > 0 then
         LeftCutString(XMLDateTime, Part, 'Z');
-      SecondFraction := StrToFloat('0.' + Part);
+      SecondFraction := StrToFloat('0' + DecimalSeparator + Part);
       Millisecond := Trunc(SecondFraction * 1000);
     end else begin

trunk/Packages/TemplateGenerics/Generic/GenericMatrix.inc

@@ -50 +50 @@
     function Implode(RowSeparator, ColSeparator: string; Converter: TToStringConverter): string;
     procedure Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);
-    function IndexOf(Item: TGMatrixItem; Start: TIndex = 0): TIndex;
-    function IndexOfList(List: TGMatrix; Start: TIndex = 0): TIndex;
+    function IndexOf(Item: TGMatrixItem; Start: TIndex): TIndex;
+    function IndexOfList(List: TGMatrix; Start: TIndex): TIndex;
     procedure Insert(Index: TIndex; Item: TGMatrixItem);
     procedure InsertList(Index: TIndex; List: TGMatrix);

trunk/UCore.lfm

@@ -105 +105 @@
   end
   object XMLConfig1: TXMLConfig
-    Filename = 'Config.xml'
     StartEmpty = False
     RootName = 'CONFIG'
+    ReadOnly = False
     left = 96
     top = 96

trunk/UCore.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, UVCS, UProject,
-  ULastOpenedList, Forms, Dialogs, Contnrs, UBackend;
+  ULastOpenedList, Forms, Dialogs, Menus, Contnrs, UBackend;
 
 type
@@ -113 +113 @@
 begin
   Backends := TObjectList.Create;
+  Project := nil;
 end;
 
@@ -181 +182 @@
   XMLConfig1.SetValue('UserName', UserName);
   XMLConfig1.SetValue('Email', Email);
+  XmlConfig1.Flush;
 end;
 
@@ -186 +188 @@
 begin
   RegisterBackends;
+  XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
+  ForceDirectoriesUTF8(ExtractFileDir(XMLConfig1.Filename));
   LoadConfig;
   if (LastOpenedListProject.Items.Count > 0) and DirectoryExistsUTF8(LastOpenedListProject.Items[0]) then

trunk/VCSCommander.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <General>
       <SessionStorage Value="InProjectDir"/>