UPD: Remove dependency on LCL for DCXmlConfig, use lazutils instead (requires Lazarus >= 1.0 from now).

components/KASToolBar/kascomp.lpk

@@ -56,23 +56,19 @@
       </Item5>
     </Files>
     <Type Value="RunAndDesignTime"/>
-    <RequiredPkgs Count="4">
+    <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="doublecmd_common"/>
-        <MinVersion Minor="1" Valid="True"/>
+        <MinVersion Minor="3" Valid="True"/>
       </Item1>
       <Item2>
-        <PackageName Value="doublecmd_common_lcl"/>
-        <MinVersion Minor="1" Valid="True"/>
-      </Item2>
-      <Item3>
         <PackageName Value="LCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item3>
-      <Item4>
+      </Item2>
+      <Item3>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item4>
+      </Item3>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>

components/doublecmd/dcxmlconfig.pas

@@ -147,7 +147,7 @@ type
 implementation
 
 uses
-  LCLProc, DCOSUtils, DCClassesUtf8, URIParser;
+  LazUTF8, LazLogger, DCOSUtils, DCClassesUtf8, URIParser;
 
 const
   BoolStrings: array[Boolean] of DOMString = ('False', 'True');
@@ -564,7 +564,7 @@ begin
       ErrMsg := 'Error loading configuration file ' + FileName;
       if e.Message <> EmptyStr then
         ErrMsg := ErrMsg + ': ' + e.Message;
-      DebugLn(ErrMsg);
+      DebugLogger.DebugLn(ErrMsg);
       Result := False;
     end;
   end;
@@ -588,7 +588,7 @@ begin
       if not mbRenameFile(sTmpConfigFileName, FileName) then
       begin
         mbDeleteFile(sTmpConfigFileName);
-        Debugln('Cannot save configuration file ', FileName);
+        DebugLogger.Debugln('Cannot save configuration file ', FileName);
       end
       else
         Result := True;
@@ -596,13 +596,13 @@ begin
       on e: EStreamError do
       begin
         mbDeleteFile(sTmpConfigFileName);
-        Debugln('Error saving configuration file ', FileName, ': ' + e.Message);
+        DebugLogger.Debugln('Error saving configuration file ', FileName, ': ' + e.Message);
       end;
     end;
   end
   else
   begin
-    Debugln('Cannot save configuration file ', FileName, ' - check permissions');
+    DebugLogger.Debugln('Cannot save configuration file ', FileName, ' - check permissions');
   end;
 end;
 

components/doublecmd/doublecmd_common.lpk

@@ -1,79 +1,86 @@
-<?xml version="1.0"?>
-<CONFIG>
-  <Package Version="4">
-    <PathDelim Value="\"/>
-    <Name Value="doublecmd_common"/>
-    <Author Value="Alexander Koblov"/>
-    <CompilerOptions>
-      <Version Value="11"/>
-      <PathDelim Value="\"/>
-      <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
-      </SearchPaths>
-      <Parsing>
-        <SyntaxOptions>
-          <IncludeAssertionCode Value="True"/>
-        </SyntaxOptions>
-      </Parsing>
-      <CodeGeneration>
-        <Checks>
-          <RangeChecks Value="True"/>
-          <OverflowChecks Value="True"/>
-        </Checks>
-      </CodeGeneration>
-      <Other>
-        <CompilerMessages>
-          <MsgFileName Value=""/>
-        </CompilerMessages>
-        <CustomOptions Value="-fPIC"/>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
-    </CompilerOptions>
-    <Description Value="Common units for Double Commander"/>
-    <License Value="GNU GPL 2"/>
-    <Version Minor="2"/>
-    <Files Count="7">
-      <Item1>
-        <Filename Value="dcclassesutf8.pas"/>
-        <UnitName Value="DCClassesUtf8"/>
-      </Item1>
-      <Item2>
-        <Filename Value="dcosutils.pas"/>
-        <UnitName Value="DCOSUtils"/>
-      </Item2>
-      <Item3>
-        <Filename Value="dcstrutils.pas"/>
-        <UnitName Value="DCStrUtils"/>
-      </Item3>
-      <Item4>
-        <Filename Value="dcbasictypes.pas"/>
-        <UnitName Value="DCBasicTypes"/>
-      </Item4>
-      <Item5>
-        <Filename Value="dcfileattributes.pas"/>
-        <UnitName Value="DCFileAttributes"/>
-      </Item5>
-      <Item6>
-        <Filename Value="dcconvertencoding.pas"/>
-        <UnitName Value="DCConvertEncoding"/>
-      </Item6>
-      <Item7>
-        <Filename Value="dcdatetimeutils.pas"/>
-        <UnitName Value="DCDateTimeUtils"/>
-      </Item7>
-    </Files>
-    <RequiredPkgs Count="1">
-      <Item1>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item1>
-    </RequiredPkgs>
-    <UsageOptions>
-      <CustomOptions Value="-fPIC"/>
-      <UnitPath Value="$(PkgOutDir)"/>
-    </UsageOptions>
-    <PublishOptions>
-      <Version Value="2"/>
-    </PublishOptions>
-  </Package>
-</CONFIG>
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="4">
+    <PathDelim Value="\"/>
+    <Name Value="doublecmd_common"/>
+    <Author Value="Alexander Koblov"/>
+    <CompilerOptions>
+      <Version Value="11"/>
+      <PathDelim Value="\"/>
+      <SearchPaths>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <IncludeAssertionCode Value="True"/>
+        </SyntaxOptions>
+      </Parsing>
+      <CodeGeneration>
+        <Checks>
+          <RangeChecks Value="True"/>
+          <OverflowChecks Value="True"/>
+        </Checks>
+      </CodeGeneration>
+      <Other>
+        <CompilerMessages>
+          <MsgFileName Value=""/>
+        </CompilerMessages>
+        <CustomOptions Value="-fPIC"/>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <Description Value="Common units for Double Commander"/>
+    <License Value="GNU GPL 2"/>
+    <Version Minor="3"/>
+    <Files Count="8">
+      <Item1>
+        <Filename Value="dcclassesutf8.pas"/>
+        <UnitName Value="DCClassesUtf8"/>
+      </Item1>
+      <Item2>
+        <Filename Value="dcosutils.pas"/>
+        <UnitName Value="DCOSUtils"/>
+      </Item2>
+      <Item3>
+        <Filename Value="dcstrutils.pas"/>
+        <UnitName Value="DCStrUtils"/>
+      </Item3>
+      <Item4>
+        <Filename Value="dcbasictypes.pas"/>
+        <UnitName Value="DCBasicTypes"/>
+      </Item4>
+      <Item5>
+        <Filename Value="dcfileattributes.pas"/>
+        <UnitName Value="DCFileAttributes"/>
+      </Item5>
+      <Item6>
+        <Filename Value="dcconvertencoding.pas"/>
+        <UnitName Value="DCConvertEncoding"/>
+      </Item6>
+      <Item7>
+        <Filename Value="dcdatetimeutils.pas"/>
+        <UnitName Value="DCDateTimeUtils"/>
+      </Item7>
+      <Item8>
+        <Filename Value="dcxmlconfig.pas"/>
+        <UnitName Value="DCXmlConfig"/>
+      </Item8>
+    </Files>
+    <RequiredPkgs Count="2">
+      <Item1>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="LazUtils"/>
+      </Item2>
+    </RequiredPkgs>
+    <UsageOptions>
+      <CustomOptions Value="-fPIC"/>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>

components/doublecmd/doublecmd_common.pas

@@ -8,7 +8,7 @@ interface
 
 uses
   DCClassesUtf8, DCOSUtils, DCStrUtils, DCBasicTypes, DCFileAttributes, 
-  DCConvertEncoding, DCDateTimeUtils;
+  DCConvertEncoding, DCDateTimeUtils, DCXmlConfig;
 
 implementation
 

components/doublecmd/doublecmd_common_lcl.lpk

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<CONFIG>
-  <Package Version="4">
-    <PathDelim Value="\"/>
-    <Name Value="doublecmd_common_lcl"/>
-    <Author Value="Alexander Koblov"/>
-    <CompilerOptions>
-      <Version Value="11"/>
-      <PathDelim Value="\"/>
-      <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
-      </SearchPaths>
-      <Parsing>
-        <SyntaxOptions>
-          <IncludeAssertionCode Value="True"/>
-        </SyntaxOptions>
-      </Parsing>
-      <CodeGeneration>
-        <Checks>
-          <RangeChecks Value="True"/>
-          <OverflowChecks Value="True"/>
-        </Checks>
-      </CodeGeneration>
-      <Other>
-        <CompilerMessages>
-          <MsgFileName Value=""/>
-        </CompilerMessages>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
-    </CompilerOptions>
-    <Description Value="Common units for Double Commander
-This package uses LCL"/>
-    <License Value="GNU GPL 2"/>
-    <Version Minor="1"/>
-    <Files Count="1">
-      <Item1>
-        <Filename Value="dcxmlconfig.pas"/>
-        <UnitName Value="DCXmlConfig"/>
-      </Item1>
-    </Files>
-    <RequiredPkgs Count="3">
-      <Item1>
-        <PackageName Value="doublecmd_common"/>
-        <MinVersion Minor="1" Valid="True"/>
-      </Item1>
-      <Item2>
-        <PackageName Value="LCL"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item2>
-      <Item3>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item3>
-    </RequiredPkgs>
-    <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)"/>
-    </UsageOptions>
-    <PublishOptions>
-      <Version Value="2"/>
-    </PublishOptions>
-  </Package>
-</CONFIG>

components/doublecmd/doublecmd_common_lcl.pas

@@ -1,14 +0,0 @@
-{ This file was automatically created by Lazarus. Do not edit!
-  This source is only used to compile and install the package.
- }
-
-unit doublecmd_common_lcl;
-
-interface
-
-uses
-  DCXmlConfig;
-
-implementation
-
-end.

src/doublecmd.lpi

@@ -240,7 +240,7 @@ end;"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="12">
+    <RequiredPackages Count="11">
       <Item1>
         <PackageName Value="dcpcrypt"/>
       </Item1>
@@ -279,12 +279,8 @@ end;"/>
       </Item10>
       <Item11>
         <PackageName Value="doublecmd_common"/>
-        <MinVersion Minor="2" Valid="True"/>
+        <MinVersion Minor="3" Valid="True"/>
       </Item11>
-      <Item12>
-        <PackageName Value="doublecmd_common_lcl"/>
-        <MinVersion Minor="1" Valid="True"/>
-      </Item12>
     </RequiredPackages>
     <Units Count="205">
       <Unit0>
@@ -1088,6 +1084,7 @@ end;"/>
       <Unit116>
         <Filename Value="filesources\ufilesourcecopyoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileSourceCopyOperation"/>
       </Unit116>
       <Unit117>
         <Filename Value="filesources\ufilesourcecreatedirectoryoperation.pas"/>
@@ -1096,6 +1093,7 @@ end;"/>
       <Unit118>
         <Filename Value="filesources\ufilesourcedeleteoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileSourceDeleteOperation"/>
       </Unit118>
       <Unit119>
         <Filename Value="filesources\ufilesourceexecuteoperation.pas"/>
@@ -1112,6 +1110,7 @@ end;"/>
       <Unit122>
         <Filename Value="filesources\ufilesourceoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileSourceOperation"/>
       </Unit122>
       <Unit123>
         <Filename Value="filesources\ufilesourceoperationmessageboxesui.pas"/>
@@ -1128,6 +1127,9 @@ end;"/>
       <Unit126>
         <Filename Value="filesources\ufilesourceoperationoptionsui.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="FileSourceOperationOptionsUI"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Frame"/>
       </Unit126>
       <Unit127>
         <Filename Value="filesources\ufilesourceoperationtypes.pas"/>
@@ -1180,7 +1182,9 @@ end;"/>
       <Unit139>
         <Filename Value="filesources\filesystem\ffilesystemcopymoveoperationoptions.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="FileSystemCopyMoveOperationOptionsUI"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Frame"/>
       </Unit139>
       <Unit140>
         <Filename Value="filesources\filesystem\ufilesystemcalcchecksumoperation.pas"/>
@@ -1213,10 +1217,12 @@ end;"/>
       <Unit147>
         <Filename Value="filesources\filesystem\ufilesystemfilesource.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileSystemFileSource"/>
       </Unit147>
       <Unit148>
         <Filename Value="filesources\filesystem\ufilesystemlistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileSystemListOperation"/>
       </Unit148>
       <Unit149>
         <Filename Value="filesources\filesystem\ufilesystemmoveoperation.pas"/>
@@ -1241,7 +1247,9 @@ end;"/>
       <Unit154>
         <Filename Value="filesources\multiarchive\fmultiarchivecopyoperationoptions.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="MultiArchiveCopyOperationOptionsUI"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Frame"/>
       </Unit154>
       <Unit155>
         <Filename Value="filesources\multiarchive\umultiarchivecalcstatisticsoperation.pas"/>
@@ -1270,6 +1278,7 @@ end;"/>
       <Unit161>
         <Filename Value="filesources\multiarchive\umultiarchivelistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uMultiArchiveListOperation"/>
       </Unit161>
       <Unit162>
         <Filename Value="filesources\multiarchive\umultiarchivetestarchiveoperation.pas"/>
@@ -1286,6 +1295,7 @@ end;"/>
       <Unit165>
         <Filename Value="filesources\multilist\umultilistlistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uMultiListListOperation"/>
       </Unit165>
       <Unit166>
         <Filename Value="filesources\searchresult\usearchresultfilesource.pas"/>
@@ -1294,6 +1304,7 @@ end;"/>
       <Unit167>
         <Filename Value="filesources\searchresult\usearchresultlistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uSearchResultListOperation"/>
       </Unit167>
       <Unit168>
         <Filename Value="filesources\tempfilesystem\utempfilesystemfilesource.pas"/>
@@ -1310,11 +1321,14 @@ end;"/>
       <Unit171>
         <Filename Value="filesources\vfs\uvfslistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uVfsListOperation"/>
       </Unit171>
       <Unit172>
         <Filename Value="filesources\wcxarchive\fwcxarchivecopyoperationoptions.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="WcxArchiveCopyOperationOptionsUI"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Frame"/>
       </Unit172>
       <Unit173>
         <Filename Value="filesources\wcxarchive\uwcxarchivecalcstatisticsoperation.pas"/>
@@ -1327,6 +1341,7 @@ end;"/>
       <Unit175>
         <Filename Value="filesources\wcxarchive\uwcxarchivecopyoutoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uWcxArchiveCopyOutOperation"/>
       </Unit175>
       <Unit176>
         <Filename Value="filesources\wcxarchive\uwcxarchivedeleteoperation.pas"/>
@@ -1343,6 +1358,7 @@ end;"/>
       <Unit179>
         <Filename Value="filesources\wcxarchive\uwcxarchivelistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uWcxArchiveListOperation"/>
       </Unit179>
       <Unit180>
         <Filename Value="filesources\wcxarchive\uwcxarchivetestarchiveoperation.pas"/>
@@ -1351,7 +1367,9 @@ end;"/>
       <Unit181>
         <Filename Value="filesources\wfxplugin\fwfxplugincopymoveoperationoptions.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="WfxPluginCopyMoveOperationOptionsUI"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Frame"/>
       </Unit181>
       <Unit182>
         <Filename Value="filesources\wfxplugin\uwfxplugincopyinoperation.pas"/>
@@ -1384,6 +1402,7 @@ end;"/>
       <Unit189>
         <Filename Value="filesources\wfxplugin\uwfxpluginlistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uWfxPluginListOperation"/>
       </Unit189>
       <Unit190>
         <Filename Value="filesources\wfxplugin\uwfxpluginmoveoperation.pas"/>
@@ -1408,6 +1427,7 @@ end;"/>
       <Unit195>
         <Filename Value="filesources\winnet\uwinnetlistoperation.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uWinNetListOperation"/>
       </Unit195>
       <Unit196>
         <Filename Value="fileviews\ubrieffileview.pas"/>
@@ -1422,6 +1442,7 @@ end;"/>
       <Unit198>
         <Filename Value="fileviews\ucolumnsfileviewvtv.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uColumnsFileViewVtv"/>
       </Unit198>
       <Unit199>
         <Filename Value="fileviews\ufileview.pas"/>
@@ -1431,22 +1452,27 @@ end;"/>
       <Unit200>
         <Filename Value="fileviews\ufileviewheader.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileViewHeader"/>
       </Unit200>
       <Unit201>
         <Filename Value="fileviews\ufileviewhistory.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileViewHistory"/>
       </Unit201>
       <Unit202>
         <Filename Value="fileviews\ufileviewwithpanels.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileViewWithPanels"/>
       </Unit202>
       <Unit203>
         <Filename Value="fileviews\ufileviewworker.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileViewWorker"/>
       </Unit203>
       <Unit204>
         <Filename Value="fileviews\uorderedfileview.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uOrderedFileView"/>
       </Unit204>
     </Units>
   </ProjectOptions>