Merge branch 'doublecmd:master' into master

Author: deep-soft

.github/scripts/create_snapshot.lnx

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# The new package will be saved here
+PACK_DIR=$PWD/doublecmd-release
+
+# Temp dir for creating *.tar.xz package
+BUILD_PACK_DIR=/var/tmp/doublecmd-$(date +%y.%m.%d)
+
+# Save revision number
+DC_REVISION=$(install/linux/update-revision.sh ./ ./)
+
+# Read version number
+DC_MAJOR=$(grep 'MajorVersionNr' src/doublecmd.lpi | grep -o '[0-9.]\+')
+DC_MINOR=$(grep 'MinorVersionNr' src/doublecmd.lpi | grep -o '[0-9.]\+' || echo 0)
+DC_MICRO=$(grep 'RevisionNr' src/doublecmd.lpi | grep -o '[0-9.]\+' || echo 0)
+DC_VER=$DC_MAJOR.$DC_MINOR.$DC_MICRO
+
+# Get libraries
+pushd install
+wget https://github.com/doublecmd/external/raw/main/linux.tar.gz
+tar xzf linux.tar.gz
+rm -f linux.tar.gz
+popd
+
+# Set widgetset
+export lcl=gtk3
+
+# Set processor architecture
+export CPU_TARGET=$(fpc -iTP)
+
+build_doublecmd()
+{
+  # Build all components of Double Commander
+  ./build.sh release
+
+  # Copy libraries
+  cp -a install/linux/lib/$CPU_TARGET/*.so ./
+
+  # Create *.tar.xz package
+  mkdir -p $BUILD_PACK_DIR
+  install/linux/install.sh --portable-prefix=$BUILD_PACK_DIR
+  pushd $BUILD_PACK_DIR
+  # Set run-time library search path
+  patchelf --set-rpath '$ORIGIN' doublecmd/doublecmd
+  tar -cJf $PACK_DIR/doublecmd-$DC_VER-$DC_REVISION.$lcl.$CPU_TARGET.tar.xz doublecmd
+  popd
+
+  # Clean DC build dir
+  ./clean.sh
+  rm -rf $BUILD_PACK_DIR
+}
+
+mkdir -p $PACK_DIR
+
+build_doublecmd

.github/workflows/snapshots.yml

@@ -106,3 +106,50 @@ jobs:
         overwrite: true
         file_glob: true
 
+  build-lin:
+    needs: build-win
+    runs-on: ubuntu-22.04
+    environment: snapshots
+    steps:
+    - name: Install dependencies
+      run: sudo apt install fpc patchelf libgtk-3-dev libdbus-1-dev
+
+    - name: Get Lazarus source
+      uses: actions/checkout@v6
+      with:
+            repository: 'fpc/Lazarus'
+
+    - name: Build and install Lazarus
+      run: |
+           make all
+           sudo make install
+
+    - name: Create Lazarus config
+      run: |
+           sudo mkdir -p /etc/lazarus
+           sudo cp tools/install/linux/environmentoptions.xml /etc/lazarus/environmentoptions.xml
+           sudo sed -i -e "s|__LAZARUSDIR__|/usr/local/share/lazarus|g" /etc/lazarus/environmentoptions.xml
+
+    - name: Checkout source
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+
+    - name: Build packages
+      run: ./.github/scripts/create_snapshot.lnx
+
+    - name: Save revision number
+      run: echo "REVISION=$(git rev-list --count HEAD)" >> "$GITHUB_ENV"
+      shell: bash
+
+    - name: Upload binaries to snapshots
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_name: doublecmd/snapshots
+        repo_token: ${{ secrets.SNAPSHOTS }}
+        file: doublecmd-release/doublecmd*.tar.xz
+        release_name: Revision ${{ env.REVISION }}
+        tag: ${{ env.REVISION }}
+        body: ${{ vars.BODY }}
+        overwrite: true
+        file_glob: true

.gitignore

@@ -16,6 +16,7 @@
 *.w?x
 units/
 /doublecmd
+tools/extractdwrflnfo
 
 # Lazarus autogenerated files (duplicated info)
 *.rst

components/doublecmd/dcclassesutf8.pas

@@ -28,7 +28,7 @@
 interface
 
 uses
-  Classes, RtlConsts, SysUtils, IniFiles;
+  Classes, RtlConsts, SysUtils, IniFiles, Math;
 
 type
   { TFileStreamEx class }
@@ -53,7 +53,7 @@   TFileStreamEx = class(THandleStream)
     property AutoSync: Boolean read FAutoSync write SetAutoSync;
     property Capacity: Int64 write SetCapacity;
     property FileName: String read FFileName;
-  end; 
+  end;
 
   { TStringListEx }
 
@@ -64,7 +64,7 @@   TStringListEx = class(TStringList)
     function IndexOfValue(const Value: String): Integer;
     procedure LoadFromFile(const FileName: String); override;
     procedure SaveToFile(const FileName: String); override;
-  end;   
+  end;
 
   { TIniFileEx }
 
@@ -82,7 +82,7 @@   TIniFileEx = class(TMemIniFile)
 implementation
 
 uses
-  DCOSUtils, LazUTF8;
+  DCOSUtils, DCConvertEncoding;
 
 { TFileStreamEx }
 
@@ -175,7 +175,7 @@ constructor TFileStreamEx.Create(const AFileName: String; Mode: LongWord);
         inherited Create(AHandle);
     end
   else
-    begin 
+    begin
       AHandle:= mbFileOpen(AFileName, Mode);
       if AHandle = feInvalidHandle then
         raise EFOpenError.CreateFmt(SFOpenError + LineEnding + mbSysErrorMessage , [AFilename])
@@ -213,11 +213,26 @@ function TFileStreamEx.Write(const Buffer; Count: LongInt): LongInt;
 { TStringListEx }
 
 function TStringListEx.DoCompareText(const S1, S2: String): PtrInt;
+var
+  U1, U2: UnicodeString;
 begin
+  U1:= CeUtf8ToUtf16(S1);
+  U2:= CeUtf8ToUtf16(S2);
+
   if CaseSensitive then
-    Result:= UTF8CompareStr(S1, S2)
+  begin
+    Result:= UnicodeCompareStr(U1, U2);
+    if Result = 0 then
+    begin
+      Result := CompareMemRange(Pointer(U1), Pointer(U2), Min(Length(U1), Length(U2)) * SizeOf(WideChar));
+      if Result = 0 then
+        Result := Length(U1) - Length(U2);
+    end
+  end
   else
-    Result:= UTF8CompareText(S1, S2);
+  begin
+    Result:= UnicodeCompareText(U1, U2);
+  end;
 end;
 
 function TStringListEx.IndexOfValue(const Value: String): Integer;

components/doublecmd/dcstrutils.pas

@@ -247,6 +247,7 @@ function TrimPath(const Path: String): String;
 }
 function TrimRightLineEnding(const sText: String; TextLineBreakStyle: TTextLineBreakStyle): String;
 function mbCompareText(const s1, s2: String): PtrInt;
+function mbCompareStr(const s1, s2: String): PtrInt;
 
 function StrNewW(const mbString: String): PWideChar;
 procedure StrDisposeW(var pStr : PWideChar);
@@ -1024,9 +1025,12 @@ function TrimRightLineEnding(const sText: String; TextLineBreakStyle: TTextLineB
 
 function mbCompareText(const s1, s2: String): PtrInt; inline;
 begin
-// From 0.9.31 LazUtils can be used but this package does not exist in 0.9.30.
-//  Result := LazUTF8.UTF8CompareText(s1, s2);
-  Result := WideCompareText(CeUtf8ToUtf16(s1), CeUtf8ToUtf16(s2));
+  Result := UnicodeCompareText(CeUtf8ToUtf16(s1), CeUtf8ToUtf16(s2));
+end;
+
+function mbCompareStr(const s1, s2: String): PtrInt; inline;
+begin
+  Result := UnicodeCompareStr(CeUtf8ToUtf16(s1), CeUtf8ToUtf16(s2));
 end;
 
 function StrNewW(const mbString: String): PWideChar;

components/doublecmd/dcunix.pas

@@ -286,13 +286,11 @@ function fnmatch(const pattern: PAnsiChar; const str: PAnsiChar; flags: cint): c
 implementation
 
 uses
-  Unix, DCConvertEncoding, LazUTF8
+  Unix, DCConvertEncoding, DCOSUtils, LazUTF8
 {$IF DEFINED(DARWIN)}
   , DCDarwin
 {$ELSEIF DEFINED(LINUX)}
-  , Dos, DCLinux, DCOSUtils
-{$ELSEIF DEFINED(FREEBSD)}
-  , DCOSUtils
+  , Dos, DCLinux
 {$ENDIF}
   ;
 
@@ -495,21 +493,22 @@ function FindMountPointPath(const FileName: String): String;
     begin
       if (I = 1) then
         sTemp:= PathDelim
-      else
+      else begin
         sTemp:= Copy(FileName, 1, I - 1);
+      end;
       // Stat for current directory
       if (fpLStat(sTemp, recStat) < 0) then Continue;
       // If it is a link then checking link destination
       if fpS_ISLNK(recStat.st_mode) then
       begin
-        sTemp:= fpReadlink(sTemp);
+        sTemp:= mbReadAllLinks(sTemp);
         Result:= FindMountPointPath(sTemp);
         Exit;
       end;
       // Check device ID
       if (recStat.st_dev <> st_dev) then
       begin
-        Result:= Copy(FileName, 1, J);
+        Result:= IncludeTrailingPathDelimiter(Copy(FileName, 1, J));
         Exit;
       end;
       J:= I;

components/synunihighlighter/source/SynUniHighlighter.pas

@@ -446,7 +446,20 @@ procedure TSynUniSyn.ResetRange;
 
 procedure TSynUniSyn.SetRange(Value: Pointer);
 //: Set current range
+{$if lcl_fullversion >= 4990000}
+var
+  Index: Integer;
+{$endif}
 begin
+{$if lcl_fullversion >= 4990000}
+  // Workaround, issue #2764
+  if (Value = nil) then
+  begin
+    Index:= LineIndex - 1;
+    PrepareLines(-1, 100);
+    Value:= CurrentRanges[Index];
+  end;
+{$endif}
   fCurrentRule := TSynRange(Value);
 end;