Skip to content

Commit 4b7b9b2

Browse files
committed
fix package files
1 parent c24ddfa commit 4b7b9b2

5 files changed

Lines changed: 89 additions & 551 deletions

File tree

Packages/ErrorSoftGroupRX12Athens.groupproj

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
<Projects Include="RX12Athens\EsVclComponentsDesign.dproj">
1616
<Dependencies/>
1717
</Projects>
18-
<Projects Include="..\Samples\TBitmapPixelsDemo\TBitmapPixelsDemo.dproj">
19-
<Dependencies/>
20-
</Projects>
21-
<Projects Include="..\..\..\Embarcadero\Studio\Projects\ggd\Project6.dproj">
22-
<Dependencies/>
23-
</Projects>
2418
</ItemGroup>
2519
<ProjectExtensions>
2620
<Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -65,32 +59,14 @@
6559
<Target Name="EsVclComponentsDesign:Make">
6660
<MSBuild Projects="RX12Athens\EsVclComponentsDesign.dproj" Targets="Make"/>
6761
</Target>
68-
<Target Name="TBitmapPixelsDemo">
69-
<MSBuild Projects="..\Samples\TBitmapPixelsDemo\TBitmapPixelsDemo.dproj"/>
70-
</Target>
71-
<Target Name="TBitmapPixelsDemo:Clean">
72-
<MSBuild Projects="..\Samples\TBitmapPixelsDemo\TBitmapPixelsDemo.dproj" Targets="Clean"/>
73-
</Target>
74-
<Target Name="TBitmapPixelsDemo:Make">
75-
<MSBuild Projects="..\Samples\TBitmapPixelsDemo\TBitmapPixelsDemo.dproj" Targets="Make"/>
76-
</Target>
77-
<Target Name="Project6">
78-
<MSBuild Projects="..\..\..\Embarcadero\Studio\Projects\ggd\Project6.dproj"/>
79-
</Target>
80-
<Target Name="Project6:Clean">
81-
<MSBuild Projects="..\..\..\Embarcadero\Studio\Projects\ggd\Project6.dproj" Targets="Clean"/>
82-
</Target>
83-
<Target Name="Project6:Make">
84-
<MSBuild Projects="..\..\..\Embarcadero\Studio\Projects\ggd\Project6.dproj" Targets="Make"/>
85-
</Target>
8662
<Target Name="Build">
87-
<CallTarget Targets="EsCore;EsVclCore;EsVclComponents;EsVclComponentsDesign;TBitmapPixelsDemo;Project6"/>
63+
<CallTarget Targets="EsCore;EsVclCore;EsVclComponents;EsVclComponentsDesign"/>
8864
</Target>
8965
<Target Name="Clean">
90-
<CallTarget Targets="EsCore:Clean;EsVclCore:Clean;EsVclComponents:Clean;EsVclComponentsDesign:Clean;TBitmapPixelsDemo:Clean;Project6:Clean"/>
66+
<CallTarget Targets="EsCore:Clean;EsVclCore:Clean;EsVclComponents:Clean;EsVclComponentsDesign:Clean"/>
9167
</Target>
9268
<Target Name="Make">
93-
<CallTarget Targets="EsCore:Make;EsVclCore:Make;EsVclComponents:Make;EsVclComponentsDesign:Make;TBitmapPixelsDemo:Make;Project6:Make"/>
69+
<CallTarget Targets="EsCore:Make;EsVclCore:Make;EsVclComponents:Make;EsVclComponentsDesign:Make"/>
9470
</Target>
9571
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
9672
</Project>

Packages/RX12Athens/EsCore.dproj

Lines changed: 21 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{2A2A93F8-4683-4314-A124-C9A73D87FC8E}</ProjectGuid>
44
<MainSource>EsCore.dpk</MainSource>
5-
<ProjectVersion>20.1</ProjectVersion>
5+
<ProjectVersion>19.5</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Debug</Config>
@@ -13,6 +13,16 @@
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
1515
</PropertyGroup>
16+
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
17+
<Base_Android>true</Base_Android>
18+
<CfgParent>Base</CfgParent>
19+
<Base>true</Base>
20+
</PropertyGroup>
21+
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
22+
<Base_Android64>true</Base_Android64>
23+
<CfgParent>Base</CfgParent>
24+
<Base>true</Base>
25+
</PropertyGroup>
1626
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
1727
<Base_Win32>true</Base_Win32>
1828
<CfgParent>Base</CfgParent>
@@ -70,6 +80,14 @@
7080
<DCC_Description>errorsoft library core</DCC_Description>
7181
<DllSuffix>290</DllSuffix>
7282
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Base_Android)'!=''">
84+
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
85+
<EnabledSysJars>annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar</EnabledSysJars>
86+
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Base_Android64)'!=''">
88+
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
89+
<EnabledSysJars>annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar</EnabledSysJars>
90+
</PropertyGroup>
7391
<PropertyGroup Condition="'$(Base_Win32)'!=''">
7492
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
7593
<BT_BuildType>Debug</BT_BuildType>
@@ -246,16 +264,6 @@
246264
<Operation>1</Operation>
247265
</Platform>
248266
</DeployClass>
249-
<DeployClass Name="AndroidSplashImageDefV21">
250-
<Platform Name="Android">
251-
<RemoteDir>res\drawable-anydpi-v21</RemoteDir>
252-
<Operation>1</Operation>
253-
</Platform>
254-
<Platform Name="Android64">
255-
<RemoteDir>res\drawable-anydpi-v21</RemoteDir>
256-
<Operation>1</Operation>
257-
</Platform>
258-
</DeployClass>
259267
<DeployClass Name="AndroidSplashStyles">
260268
<Platform Name="Android">
261269
<RemoteDir>res\values</RemoteDir>
@@ -276,66 +284,6 @@
276284
<Operation>1</Operation>
277285
</Platform>
278286
</DeployClass>
279-
<DeployClass Name="AndroidSplashStylesV31">
280-
<Platform Name="Android">
281-
<RemoteDir>res\values-v31</RemoteDir>
282-
<Operation>1</Operation>
283-
</Platform>
284-
<Platform Name="Android64">
285-
<RemoteDir>res\values-v31</RemoteDir>
286-
<Operation>1</Operation>
287-
</Platform>
288-
</DeployClass>
289-
<DeployClass Name="Android_AdaptiveIcon">
290-
<Platform Name="Android">
291-
<RemoteDir>res\drawable-anydpi-v26</RemoteDir>
292-
<Operation>1</Operation>
293-
</Platform>
294-
<Platform Name="Android64">
295-
<RemoteDir>res\drawable-anydpi-v26</RemoteDir>
296-
<Operation>1</Operation>
297-
</Platform>
298-
</DeployClass>
299-
<DeployClass Name="Android_AdaptiveIconBackground">
300-
<Platform Name="Android">
301-
<RemoteDir>res\drawable</RemoteDir>
302-
<Operation>1</Operation>
303-
</Platform>
304-
<Platform Name="Android64">
305-
<RemoteDir>res\drawable</RemoteDir>
306-
<Operation>1</Operation>
307-
</Platform>
308-
</DeployClass>
309-
<DeployClass Name="Android_AdaptiveIconForeground">
310-
<Platform Name="Android">
311-
<RemoteDir>res\drawable</RemoteDir>
312-
<Operation>1</Operation>
313-
</Platform>
314-
<Platform Name="Android64">
315-
<RemoteDir>res\drawable</RemoteDir>
316-
<Operation>1</Operation>
317-
</Platform>
318-
</DeployClass>
319-
<DeployClass Name="Android_AdaptiveIconMonochrome">
320-
<Platform Name="Android">
321-
<RemoteDir>res\drawable</RemoteDir>
322-
<Operation>1</Operation>
323-
</Platform>
324-
<Platform Name="Android64">
325-
<RemoteDir>res\drawable</RemoteDir>
326-
<Operation>1</Operation>
327-
</Platform>
328-
</DeployClass>
329-
<DeployClass Name="Android_AdaptiveIconV33">
330-
<Platform Name="Android">
331-
<RemoteDir>res\drawable-anydpi-v33</RemoteDir>
332-
<Operation>1</Operation>
333-
</Platform>
334-
<Platform Name="Android64">
335-
<RemoteDir>res\drawable-anydpi-v33</RemoteDir>
336-
<Operation>1</Operation>
337-
</Platform>
338-
</DeployClass>
339287
<DeployClass Name="Android_Colors">
340288
<Platform Name="Android">
341289
<RemoteDir>res\values</RemoteDir>
@@ -346,16 +294,6 @@
346294
<Operation>1</Operation>
347295
</Platform>
348296
</DeployClass>
349-
<DeployClass Name="Android_ColorsDark">
350-
<Platform Name="Android">
351-
<RemoteDir>res\values-night-v21</RemoteDir>
352-
<Operation>1</Operation>
353-
</Platform>
354-
<Platform Name="Android64">
355-
<RemoteDir>res\values-night-v21</RemoteDir>
356-
<Operation>1</Operation>
357-
</Platform>
358-
</DeployClass>
359297
<DeployClass Name="Android_DefaultAppIcon">
360298
<Platform Name="Android">
361299
<RemoteDir>res\drawable</RemoteDir>
@@ -526,56 +464,6 @@
526464
<Operation>1</Operation>
527465
</Platform>
528466
</DeployClass>
529-
<DeployClass Name="Android_VectorizedNotificationIcon">
530-
<Platform Name="Android">
531-
<RemoteDir>res\drawable-anydpi-v24</RemoteDir>
532-
<Operation>1</Operation>
533-
</Platform>
534-
<Platform Name="Android64">
535-
<RemoteDir>res\drawable-anydpi-v24</RemoteDir>
536-
<Operation>1</Operation>
537-
</Platform>
538-
</DeployClass>
539-
<DeployClass Name="Android_VectorizedSplash">
540-
<Platform Name="Android">
541-
<RemoteDir>res\drawable</RemoteDir>
542-
<Operation>1</Operation>
543-
</Platform>
544-
<Platform Name="Android64">
545-
<RemoteDir>res\drawable</RemoteDir>
546-
<Operation>1</Operation>
547-
</Platform>
548-
</DeployClass>
549-
<DeployClass Name="Android_VectorizedSplashDark">
550-
<Platform Name="Android">
551-
<RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
552-
<Operation>1</Operation>
553-
</Platform>
554-
<Platform Name="Android64">
555-
<RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
556-
<Operation>1</Operation>
557-
</Platform>
558-
</DeployClass>
559-
<DeployClass Name="Android_VectorizedSplashV31">
560-
<Platform Name="Android">
561-
<RemoteDir>res\drawable-anydpi-v31</RemoteDir>
562-
<Operation>1</Operation>
563-
</Platform>
564-
<Platform Name="Android64">
565-
<RemoteDir>res\drawable-anydpi-v31</RemoteDir>
566-
<Operation>1</Operation>
567-
</Platform>
568-
</DeployClass>
569-
<DeployClass Name="Android_VectorizedSplashV31Dark">
570-
<Platform Name="Android">
571-
<RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
572-
<Operation>1</Operation>
573-
</Platform>
574-
<Platform Name="Android64">
575-
<RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
576-
<Operation>1</Operation>
577-
</Platform>
578-
</DeployClass>
579467
<DeployClass Name="DebugSymbols">
580468
<Platform Name="iOSSimulator">
581469
<Operation>1</Operation>
@@ -1016,6 +904,8 @@
1016904
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
1017905
</Deployment>
1018906
<Platforms>
907+
<Platform value="Android">False</Platform>
908+
<Platform value="Android64">False</Platform>
1019909
<Platform value="Win32">True</Platform>
1020910
<Platform value="Win64">True</Platform>
1021911
</Platforms>

0 commit comments

Comments
 (0)