fix design path in designtime packages

Author: digao-dalpiaz

CompInstall.ini

@@ -3,7 +3,7 @@ IniVersion=2
 
 [General]
 Name=Digao Dalpiaz - Dam component
-Version=6.3
+Version=6.4
 DelphiVersions=XE3;XE4;XE5;XE6;XE7;XE8;10;10.1;10.2;10.3;10.4;11;12
 Packages=DamCommonPackage;DamPackage_VCL;DamPackage_FMX;DamDesignPackage_VCL;DamDesignPackage_FMX
 AddLibrary=1

README.md

@@ -36,13 +36,17 @@
 
 ## What's New
 
-- 02/22/2024 (Version 6.3)
+- 02/23/2024 (Version 6.4)
 
-   - Fixed Lazarus Design Package compiling.
+   - Fixed included files path in Design packages (the files was referencing "Design" folder twice).
 
 <details>
   <summary>Click here to view the entire changelog</summary>
 
+- 02/22/2024 (Version 6.3)
+
+   - Fixed Lazarus Design Package compiling.
+
 - 02/20/2024 (Version 6.2)
 
    - Reorganization of component folders (Please completely delete the previous component folder). **WARNING! DCU output folder changed. Now output directory is `Lib\{Platform}\{Config}`. Please review your Library Paths.**
@@ -325,18 +329,11 @@ The Message Dialog: :stuck_out_tongue:
 ### Delphi manual installation
 
 1. Open **Dam.groupproj** in the Delphi.
-
-2. Ensure **Win32** Platform and **Release** config are selected in all packages.
-
+2. Choose desired platform and ensure **Release** config are selected in all packages (Design packages must be compiled in Win32 platform).
 3. Right-click at root item in the tree and choose **Build All**.
-
-4. If you want to use 64 bit platform, change platform in all packages and run a new build.
-
-5. Right-click at **DamDesignPackage_VCL** / **DamDesignPackage_FMX** and choose **Install**.
-
-6. Add Library Path according to the platform in Tools\Options. Example: If you are using Win32, set path = `Lib\Win32\Release`.
-
-7. Run **AfterBuild.bat** to publish DFM and RES to Release folders.
+4. Right-click at **DamDesignPackage_VCL** / **DamDesignPackage_FMX** and choose **Install**.
+5. Add Library Path according to the platform in Tools\Options. Example: If you are using Win32, set path = `Lib\Win32\Release`.
+6. Run **AfterBuild.bat** to publish DFM and RES to Release folders.
 
 > Supports Delphi XE3..Delphi 12
 

Source/Design/DamDesignPackage_FMX.dpk

@@ -32,16 +32,15 @@ package DamDesignPackage_FMX;
 {$IMPLICITBUILD ON}
 
 requires
-  rtl,
   designide,
   DamPackage_FMX,
   DzHTMLText_VCL;
 
 contains
-  FMX.DamFileGenerator in 'Design\FMX.DamFileGenerator.pas',
-  FMX.DamFind in 'Design\FMX.DamFind.pas',
-  FMX.DamList in 'Design\FMX.DamList.pas',
-  FMX.DamMsgEdit in 'Design\FMX.DamMsgEdit.pas',
-  FMX.DamReg in 'Design\FMX.DamReg.pas';
+  FMX.DamFileGenerator in 'FMX.DamFileGenerator.pas',
+  FMX.DamFind in 'FMX.DamFind.pas',
+  FMX.DamList in 'FMX.DamList.pas',
+  FMX.DamMsgEdit in 'FMX.DamMsgEdit.pas',
+  FMX.DamReg in 'FMX.DamReg.pas';
 
 end.

Source/Design/DamDesignPackage_FMX.dproj

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <ProjectGuid>{9D697ED4-C6BC-41D4-B466-409EA0FF0E1A}</ProjectGuid>
         <MainSource>DamDesignPackage_FMX.dpk</MainSource>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>19.5</ProjectVersion>
         <FrameworkType>FMX</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Release</Config>
@@ -103,15 +103,14 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Dam.dcr"/>
-        <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="designide.dcp"/>
         <DCCReference Include="DamPackage_FMX.dcp"/>
         <DCCReference Include="DzHTMLText_VCL.dcp"/>
-        <DCCReference Include="Design\FMX.DamFileGenerator.pas"/>
-        <DCCReference Include="Design\FMX.DamFind.pas"/>
-        <DCCReference Include="Design\FMX.DamList.pas"/>
-        <DCCReference Include="Design\FMX.DamMsgEdit.pas"/>
-        <DCCReference Include="Design\FMX.DamReg.pas"/>
+        <DCCReference Include="FMX.DamFileGenerator.pas"/>
+        <DCCReference Include="FMX.DamFind.pas"/>
+        <DCCReference Include="FMX.DamList.pas"/>
+        <DCCReference Include="FMX.DamMsgEdit.pas"/>
+        <DCCReference Include="FMX.DamReg.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -135,7 +134,7 @@
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Win32">True</Platform>
-                <Platform value="Win64">True</Platform>
+                <Platform value="Win64">False</Platform>
             </Platforms>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Source/Design/DamDesignPackage_FMX.res

@@ -32,16 +32,15 @@ package DamDesignPackage_VCL;
 {$IMPLICITBUILD ON}
 
 requires
-  rtl,
   designide,
   DzHTMLText_VCL,
   DamPackage_VCL;
 
 contains
-  Vcl.DamFileGenerator in 'Design\Vcl.DamFileGenerator.pas',
-  Vcl.DamFind in 'Design\Vcl.DamFind.pas',
-  Vcl.DamList in 'Design\Vcl.DamList.pas',
-  Vcl.DamMsgEdit in 'Design\Vcl.DamMsgEdit.pas',
-  Vcl.DamReg in 'Design\Vcl.DamReg.pas';
+  Vcl.DamFileGenerator in 'Vcl.DamFileGenerator.pas',
+  Vcl.DamFind in 'Vcl.DamFind.pas',
+  Vcl.DamList in 'Vcl.DamList.pas',
+  Vcl.DamMsgEdit in 'Vcl.DamMsgEdit.pas',
+  Vcl.DamReg in 'Vcl.DamReg.pas';
 
 end.

Source/Design/DamDesignPackage_VCL.dpk

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <ProjectGuid>{2752669B-6202-4A0D-93C1-31F3493FAF32}</ProjectGuid>
         <MainSource>DamDesignPackage_VCL.dpk</MainSource>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>19.5</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Release</Config>
@@ -102,15 +102,14 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Dam.dcr"/>
-        <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="designide.dcp"/>
         <DCCReference Include="DzHTMLText_VCL.dcp"/>
         <DCCReference Include="DamPackage_VCL.dcp"/>
-        <DCCReference Include="Design\Vcl.DamFileGenerator.pas"/>
-        <DCCReference Include="Design\Vcl.DamFind.pas"/>
-        <DCCReference Include="Design\Vcl.DamList.pas"/>
-        <DCCReference Include="Design\Vcl.DamMsgEdit.pas"/>
-        <DCCReference Include="Design\Vcl.DamReg.pas"/>
+        <DCCReference Include="Vcl.DamFileGenerator.pas"/>
+        <DCCReference Include="Vcl.DamFind.pas"/>
+        <DCCReference Include="Vcl.DamList.pas"/>
+        <DCCReference Include="Vcl.DamMsgEdit.pas"/>
+        <DCCReference Include="Vcl.DamReg.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -134,7 +133,7 @@
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Win32">True</Platform>
-                <Platform value="Win64">True</Platform>
+                <Platform value="Win64">False</Platform>
             </Platforms>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Source/Design/DamDesignPackage_VCL.dproj

@@ -216,7 +216,7 @@ implementation
   {$ENDIF}
 {$ENDIF};
 
-const STR_VERSION = '6.3';
+const STR_VERSION = '6.4';
 
 var ObjDefault: TDam = nil;