FIX: Build DC under Linux when project widgetset <> IDE widgetset

components/ZVDateTimeCtrls/zvdatetimectrls.lpk

@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="ZVDateTimeCtrls"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Zoran Vučenović"/>
     <CompilerOptions>
-      <Version Value="9"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
+      <Conditionals Value="if LCLWidgetType &lt;> GetIDEValue('LCLWidgetType') then
+begin
+  UnitPath += '$(FallbackOutputRoot)/IDEIntf/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
+  UsageUnitPath += '$(FallbackOutputRoot)/IDEIntf/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
+end;"/>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
       </Other>

components/build.sh

@@ -4,6 +4,15 @@
 # This script run from main build.sh script
 # If you run it direct, set up $lazbuild first
 
+# Rebuild widget dependent packages
+if [ -d /usr/lib/lazarus/default ]
+  then
+  $lazbuild /usr/lib/lazarus/default/components/lazcontrols/lazcontrols.lpk $DC_ARCH -B
+  $lazbuild /usr/lib/lazarus/default/components/synedit/synedit.lpk $DC_ARCH -B
+  $lazbuild /usr/lib/lazarus/default/ideintf/ideintf.lpk $DC_ARCH -B
+fi
+
+# Build components
 basedir=$(pwd)
 cd components
 $lazbuild chsdet/chsdet.lpk $DC_ARCH

components/gifanim/pkg_gifanim.lpk

@@ -1,16 +1,21 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="pkg_gifanim"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Laurent Jacques"/>
     <CompilerOptions>
-      <Version Value="8"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="$(LazarusDir)\ide\"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
+      <Conditionals Value="if LCLWidgetType &lt;> GetIDEValue('LCLWidgetType') then
+begin
+  UnitPath += '$(FallbackOutputRoot)/IDEIntf/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
+  UsageUnitPath += '$(FallbackOutputRoot)/IDEIntf/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
+end;"/>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
@@ -42,7 +47,7 @@
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>

src/doublecmd.lpi

@@ -30,7 +30,7 @@
       <Item1 Name="Debug" Default="True"/>
       <Item2 Name="Debug + HeapTrc">
         <CompilerOptions>
-          <Version Value="9"/>
+          <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
             <Filename Value="..\doublecmd"/>
@@ -59,7 +59,7 @@
           </CodeGeneration>
           <Linking>
             <Debugging>
-              <GenerateDebugInfo Value="True"/>
+              <DebugInfoType Value="dsStabs"/>
               <UseHeaptrc Value="True"/>
             </Debugging>
           </Linking>
@@ -79,7 +79,7 @@
       </Item2>
       <Item3 Name="NoDebug Full Optimizations">
         <CompilerOptions>
-          <Version Value="9"/>
+          <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
             <Filename Value="..\doublecmd"/>
@@ -105,6 +105,7 @@
           </CodeGeneration>
           <Linking>
             <Debugging>
+              <GenerateDebugInfo Value="False"/>
               <UseLineInfoUnit Value="False"/>
             </Debugging>
           </Linking>
@@ -123,7 +124,7 @@
       </Item3>
       <Item4 Name="Nightly">
         <CompilerOptions>
-          <Version Value="9"/>
+          <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
             <Filename Value="..\doublecmd"/>
@@ -150,8 +151,8 @@
           </CodeGeneration>
           <Linking>
             <Debugging>
+              <DebugInfoType Value="dsDwarf2Set"/>
               <UseLineInfoUnit Value="False"/>
-              <GenerateDwarf Value="True"/>
               <UseExternalDbgSyms Value="True"/>
             </Debugging>
           </Linking>
@@ -167,7 +168,7 @@
       </Item4>
       <Item5 Name="Beta">
         <CompilerOptions>
-          <Version Value="9"/>
+          <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
             <Filename Value="..\doublecmd"/>
@@ -179,6 +180,11 @@
             <UnitOutputDirectory Value="..\units\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
             <SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType);$(fpcsrcdir)\packages\fcl-base\src"/>
           </SearchPaths>
+          <Conditionals Value="if LCLWidgetType &lt;> GetIDEValue('LCLWidgetType') then
+begin
+  UnitPath += '$(FallbackOutputRoot)/LazControls/lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
+  UnitPath += '$(FallbackOutputRoot)/SynEdit/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
+end;"/>
           <Parsing>
             <SyntaxOptions>
               <IncludeAssertionCode Value="True"/>
@@ -195,8 +201,8 @@
           </CodeGeneration>
           <Linking>
             <Debugging>
+              <DebugInfoType Value="dsDwarf2Set"/>
               <UseLineInfoUnit Value="False"/>
-              <GenerateDwarf Value="True"/>
               <UseExternalDbgSyms Value="True"/>
             </Debugging>
             <Options>
@@ -1051,6 +1057,7 @@
       <Unit109>
         <Filename Value="fileviews\ufileviewwithmainctrl.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileViewWithMainCtrl"/>
       </Unit109>
       <Unit110>
         <Filename Value="filesources\uarchivefilesource.pas"/>
@@ -1059,10 +1066,12 @@
       <Unit111>
         <Filename Value="filesources\uarchivefilesourceutil.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uArchiveFileSourceUtil"/>
       </Unit111>
       <Unit112>
         <Filename Value="filesources\ufilesource.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileSource"/>
       </Unit112>
       <Unit113>
         <Filename Value="filesources\ufilesourcecalcchecksumoperation.pas"/>
@@ -1403,10 +1412,12 @@
       <Unit196>
         <Filename Value="fileviews\ubrieffileview.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uBriefFileView"/>
       </Unit196>
       <Unit197>
         <Filename Value="fileviews\ucolumnsfileview.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uColumnsFileView"/>
       </Unit197>
       <Unit198>
         <Filename Value="fileviews\ucolumnsfileviewvtv.pas"/>
@@ -1415,6 +1426,7 @@
       <Unit199>
         <Filename Value="fileviews\ufileview.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="uFileView"/>
       </Unit199>
       <Unit200>
         <Filename Value="fileviews\ufileviewheader.pas"/>
@@ -1439,7 +1451,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
       <Filename Value="..\doublecmd"/>
@@ -1472,7 +1484,7 @@ end;"/>
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <GenerateDebugInfo Value="True"/>
+        <DebugInfoType Value="dsStabs"/>
       </Debugging>
     </Linking>
     <Other>