Skip to content

Commit f422325

Browse files
carloBarazzettacarloBarazzetta
committed
Renamed folder D11_0 to D11
Changed LibSuffix for 10.4 and 11 to {auto}
1 parent ecf3138 commit f422325

12 files changed

+78
-66
lines changed

‎Images/DemoDataAwareDbGridTopCenter.png‎

-745 Bytes
Loading

‎Packages/D10_4/DBAwareLabeledComponents.dpk‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ package DBAwareLabeledComponents;
99
{$EXTENDEDSYNTAX ON}
1010
{$IMPORTEDDATA ON}
1111
{$IOCHECKS ON}
12-
{$LOCALSYMBOLS ON}
12+
{$LOCALSYMBOLS OFF}
1313
{$LONGSTRINGS ON}
1414
{$OPENSTRINGS ON}
15-
{$OPTIMIZATION OFF}
15+
{$OPTIMIZATION ON}
1616
{$OVERFLOWCHECKS OFF}
1717
{$RANGECHECKS OFF}
18-
{$REFERENCEINFO ON}
18+
{$REFERENCEINFO OFF}
1919
{$SAFEDIVIDE OFF}
20-
{$STACKFRAMES ON}
20+
{$STACKFRAMES OFF}
2121
{$TYPEDADDRESS OFF}
2222
{$VARSTRINGCHECKS ON}
2323
{$WRITEABLECONST OFF}
2424
{$MINENUMSIZE 1}
2525
{$IMAGEBASE $400000}
26-
{$DEFINE DEBUG}
26+
{$DEFINE RELEASE}
2727
{$ENDIF IMPLICITBUILDING}
28-
{$DESCRIPTION 'Dataaware Labeled Components by Ethea'}
29-
{$LIBSUFFIX '_D10.4'}
28+
{$DESCRIPTION 'Ethea: Dataaware Labeled Components'}
29+
{$LIBSUFFIX AUTO}
3030
{$RUNONLY}
3131
{$IMPLICITBUILD ON}
3232

‎Packages/D10_4/DBAwareLabeledComponents.dproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
<VerInfo_Locale>1033</VerInfo_Locale>
6262
<VerInfo_Keys>CompanyName=DBAwareLabeledComponents;FileDescription=Dataaware Labeled Components;FileVersion=1.0.0.0;InternalName=;LegalCopyright=Copyright (c) 2021 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProgramID=;ProductName=;ProductVersion=1.0;Comments=</VerInfo_Keys>
6363
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
64-
<DCC_Description>Dataaware Labeled Components by Ethea</DCC_Description>
64+
<DCC_Description>Ethea: Dataaware Labeled Components</DCC_Description>
6565
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
66-
<DllSuffix>_D10.4</DllSuffix>
66+
<DllSuffix>$(Auto)</DllSuffix>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
6969
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
@@ -142,6 +142,7 @@
142142
<Source Name="MainSource">DBAwareLabeledComponents.dpk</Source>
143143
</Source>
144144
<Excluded_Packages>
145+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
145146
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
146147
</Excluded_Packages>
147148
</Delphi.Personality>

‎Packages/D10_4/dclDBAwareLabeledComponents.dpk‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ package dclDBAwareLabeledComponents;
99
{$EXTENDEDSYNTAX ON}
1010
{$IMPORTEDDATA ON}
1111
{$IOCHECKS ON}
12-
{$LOCALSYMBOLS ON}
12+
{$LOCALSYMBOLS OFF}
1313
{$LONGSTRINGS ON}
1414
{$OPENSTRINGS ON}
15-
{$OPTIMIZATION OFF}
15+
{$OPTIMIZATION ON}
1616
{$OVERFLOWCHECKS OFF}
1717
{$RANGECHECKS OFF}
18-
{$REFERENCEINFO ON}
18+
{$REFERENCEINFO OFF}
1919
{$SAFEDIVIDE OFF}
20-
{$STACKFRAMES ON}
20+
{$STACKFRAMES OFF}
2121
{$TYPEDADDRESS OFF}
2222
{$VARSTRINGCHECKS ON}
2323
{$WRITEABLECONST OFF}
2424
{$MINENUMSIZE 1}
2525
{$IMAGEBASE $400000}
26-
{$DEFINE DEBUG}
26+
{$DEFINE RELEASE}
2727
{$ENDIF IMPLICITBUILDING}
28-
{$DESCRIPTION 'Dataaware Labeled Components by Ethea'}
29-
{$LIBSUFFIX '_D10.4'}
28+
{$DESCRIPTION 'Ethea: Dataaware Labeled Components'}
29+
{$LIBSUFFIX AUTO}
3030
{$DESIGNONLY}
3131
{$IMPLICITBUILD ON}
3232

‎Packages/D10_4/dclDBAwareLabeledComponents.dproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<VerInfo_Locale>1033</VerInfo_Locale>
6262
<VerInfo_Keys>CompanyName=DBAwareLabeledComponents;FileDescription=Dataaware Labeled Components;FileVersion=1.0.0.0;InternalName=;LegalCopyright=Copyright (c) 2021 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProgramID=;ProductName=;ProductVersion=1.0;Comments=</VerInfo_Keys>
6363
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
64-
<DCC_Description>Dataaware Labeled Components by Ethea</DCC_Description>
65-
<DllSuffix>_D10.4</DllSuffix>
64+
<DCC_Description>Ethea: Dataaware Labeled Components</DCC_Description>
65+
<DllSuffix>$(Auto)</DllSuffix>
6666
<DesignOnlyPackage>true</DesignOnlyPackage>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
@@ -120,7 +120,7 @@
120120
<Source Name="MainSource">dclDBAwareLabeledComponents.dpk</Source>
121121
</Source>
122122
<Excluded_Packages>
123-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclDBAwareLabeledComponents_D10.4.bpl">Dataaware Labeled Components by Ethea</Excluded_Packages>
123+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
124124
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
125125
</Excluded_Packages>
126126
</Delphi.Personality>

Packages/D11_0/DBAwareLabeledComponents.dpk renamed to Packages/D11/DBAwareLabeledComponents.dpk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ package DBAwareLabeledComponents;
2525
{$IMAGEBASE $400000}
2626
{$DEFINE RELEASE}
2727
{$ENDIF IMPLICITBUILDING}
28-
{$DESCRIPTION 'Dataaware Labeled Components by Ethea'}
29-
{$LIBSUFFIX '_D11.0'}
28+
{$DESCRIPTION 'Ethea: Dataaware Labeled Components'}
29+
{$LIBSUFFIX AUTO}
3030
{$RUNONLY}
3131
{$IMPLICITBUILD ON}
3232

Packages/D11_0/DBAwareLabeledComponents.dproj renamed to Packages/D11/DBAwareLabeledComponents.dproj

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{AC2210B3-7649-4313-B116-99479BF9B465}</ProjectGuid>
44
<MainSource>DBAwareLabeledComponents.dpk</MainSource>
5-
<ProjectVersion>19.3</ProjectVersion>
5+
<ProjectVersion>19.4</ProjectVersion>
66
<FrameworkType>VCL</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Release</Config>
@@ -34,6 +34,12 @@
3434
<CfgParent>Base</CfgParent>
3535
<Base>true</Base>
3636
</PropertyGroup>
37+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
38+
<Cfg_2_Win32>true</Cfg_2_Win32>
39+
<CfgParent>Cfg_2</CfgParent>
40+
<Cfg_2>true</Cfg_2>
41+
<Base>true</Base>
42+
</PropertyGroup>
3743
<PropertyGroup Condition="'$(Base)'!=''">
3844
<DCC_DcuOutput>..\..\Dcu\D11.0\$(Platform)\$(Config)</DCC_DcuOutput>
3945
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
@@ -51,9 +57,9 @@
5157
<VerInfo_Locale>1033</VerInfo_Locale>
5258
<VerInfo_Keys>CompanyName=DBAwareLabeledComponents;FileDescription=Dataaware Labeled Components;FileVersion=1.0.0.0;InternalName=;LegalCopyright=Copyright (c) 2021 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProgramID=;ProductName=;ProductVersion=1.0;Comments=</VerInfo_Keys>
5359
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
54-
<DCC_Description>Dataaware Labeled Components by Ethea</DCC_Description>
60+
<DCC_Description>Ethea: Dataaware Labeled Components</DCC_Description>
5561
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
56-
<DllSuffix>_D11.0</DllSuffix>
62+
<DllSuffix>$(Auto)</DllSuffix>
5763
</PropertyGroup>
5864
<PropertyGroup Condition="'$(Base_Win32)'!=''">
5965
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -76,6 +82,9 @@
7682
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
7783
<DCC_DebugInformation>0</DCC_DebugInformation>
7884
</PropertyGroup>
85+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
86+
<DCC_Description>Ethea: Dataaware Labeled Components</DCC_Description>
87+
</PropertyGroup>
7988
<ItemGroup>
8089
<DelphiCompile Include="$(MainSource)">
8190
<MainSource>MainSource</MainSource>
@@ -128,18 +137,12 @@
128137
<Excluded_Packages>
129138
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
130139
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
140+
<Excluded_Packages Name="D:\ETHEA\XLSSuit6\Package\DDX11\XLSRWII6_DDX11.bpl">File D:\ETHEA\XLSSuit6\Package\DDX11\XLSRWII6_DDX11.bpl not found</Excluded_Packages>
131141
</Excluded_Packages>
132142
</Delphi.Personality>
133143
<Deployment Version="3">
134-
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\DBAwareLabeledComponents_D10.4.bpl" Configuration="Release" Class="ProjectOutput">
135-
<Platform Name="Win32">
136-
<RemoteName>DBAwareLabeledComponents.bpl</RemoteName>
137-
<Overwrite>true</Overwrite>
138-
</Platform>
139-
</DeployFile>
140-
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\DBAwareLabeledComponents.bpl" Configuration="Debug" Class="ProjectOutput">
141-
<Platform Name="Win32">
142-
<RemoteName>DBAwareLabeledComponents.bpl</RemoteName>
144+
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
145+
<Platform Name="iOSSimulator">
143146
<Overwrite>true</Overwrite>
144147
</Platform>
145148
</DeployFile>
@@ -153,8 +156,15 @@
153156
<Overwrite>true</Overwrite>
154157
</Platform>
155158
</DeployFile>
156-
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
157-
<Platform Name="iOSSimulator">
159+
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\DBAwareLabeledComponents.bpl" Configuration="Debug" Class="ProjectOutput">
160+
<Platform Name="Win32">
161+
<RemoteName>DBAwareLabeledComponents.bpl</RemoteName>
162+
<Overwrite>true</Overwrite>
163+
</Platform>
164+
</DeployFile>
165+
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\DBAwareLabeledComponents_D10.4.bpl" Configuration="Release" Class="ProjectOutput">
166+
<Platform Name="Win32">
167+
<RemoteName>DBAwareLabeledComponents.bpl</RemoteName>
158168
<Overwrite>true</Overwrite>
159169
</Platform>
160170
</DeployFile>
@@ -872,17 +882,17 @@
872882
<Operation>1</Operation>
873883
</Platform>
874884
</DeployClass>
875-
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
876-
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
877-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
878-
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
879885
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
880-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
881-
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
886+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
882887
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
883888
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
884-
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
885889
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
890+
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
891+
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
892+
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
893+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
894+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
895+
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
886896
</Deployment>
887897
<Platforms>
888898
<Platform value="Win32">True</Platform>

Packages/D11_0/DBAwareLabeledComponents.res renamed to Packages/D11/DBAwareLabeledComponents.res

File renamed without changes.

Packages/D11_0/PackageGroup.groupproj renamed to Packages/D11/PackageGroup.groupproj

File renamed without changes.

Packages/D11_0/dclDBAwareLabeledComponents.dpk renamed to Packages/D11/dclDBAwareLabeledComponents.dpk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ package dclDBAwareLabeledComponents;
2525
{$IMAGEBASE $400000}
2626
{$DEFINE RELEASE}
2727
{$ENDIF IMPLICITBUILDING}
28-
{$DESCRIPTION 'Dataaware Labeled Components by Ethea'}
29-
{$LIBSUFFIX '_D11.0'}
28+
{$DESCRIPTION 'Ethea: Dataaware Labeled Components'}
29+
{$LIBSUFFIX AUTO}
3030
{$DESIGNONLY}
3131
{$IMPLICITBUILD ON}
3232

0 commit comments

Comments
 (0)