Skip to content

Commit

Permalink
- Fixed READCOM_App.dpr to include Object Debugger only in DEBUG conf…
Browse files Browse the repository at this point in the history
…iguration (else wasn't finding FormMessage.pas which was set to only be included at IFDEF DEBUG)

- Included latest debug build executable
- Changed Targets for Release configurations to App Store for platforms that support it
- Changed Zoomicon.Media.FMX.dpk to not include SVGIconImage and SVGIconImageList at required clause for non-Win32 platforms. Seems SVGIconImageList from GetIt doesn't add packages for all platforms (see EtheaDev/SVGIconImageList#286)
  • Loading branch information
birbilis committed Nov 19, 2024
1 parent 22d86fe commit ec54130
Show file tree
Hide file tree
Showing 18 changed files with 136 additions and 32 deletions.
2 changes: 1 addition & 1 deletion App/READCOM_App.dpr
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ uses
System.StartUpCopy,
{$IFDEF DEBUG}
FormMessage in '..\3rdPartyLib\object-debugger-for-firemonkey\FormMessage.pas' {MessageForm},
{$ENDIF }
ObjectDebuggerFMXFrame in '..\3rdPartyLib\object-debugger-for-firemonkey\ObjectDebuggerFMXFrame.pas' {FMXObjectDebuggerFrame: TFrame},
ObjectDebuggerFMXForm in '..\3rdPartyLib\object-debugger-for-firemonkey\DemoDesktop\ObjectDebuggerFMXForm.pas' {ObjectDebuggerFMXForm},
{$ENDIF }
Zoomicon.Helpers.RTL.ClassListHelpers in '..\Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL.ClassListHelpers.pas',
Zoomicon.Helpers.RTL.ComponentHelpers in '..\Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL.ComponentHelpers.pas',
Zoomicon.Helpers.RTL.StreamHelpers in '..\Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL.StreamHelpers.pas',
Expand Down
10 changes: 6 additions & 4 deletions App/READCOM_App.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<FrameworkType>FMX</FrameworkType>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win64</Platform>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>693267</TargetedPlatforms>
<AppType>Application</AppType>
<MainSource>READCOM_App.dpr</MainSource>
Expand Down Expand Up @@ -467,9 +467,9 @@
<AUP_ACCESS_FINE_LOCATION>false</AUP_ACCESS_FINE_LOCATION>
<AUP_CALL_PHONE>false</AUP_CALL_PHONE>
<AUP_READ_PHONE_STATE>false</AUP_READ_PHONE_STATE>
<BT_BuildType>AppStore</BT_BuildType>
<Android_BackgroundColor>#FFFFFF</Android_BackgroundColor>
<Android_DarkBackgroundColor>#000000</Android_DarkBackgroundColor>
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
Expand Down Expand Up @@ -507,7 +507,7 @@
<PF_AppSpecificPassword>852847CD5F90079FCF3CE53CA4437BACE45C080C7EB7ECA49F0C7772D849A8ACA5FF5D197F6E1C61C1BD5765FAB3C363BAB3361C04652294162B458CE5F52284C946F35DD545FA95BFA2AF3F072C1D0A92003E071DBA097BE3FD16D14425789365CA9A8422F1</PF_AppSpecificPassword>
<PF_DeveloperIDCert>Developer ID Application: Georgios Birmpilis (KVJTZJTSS6)</PF_DeveloperIDCert>
<PF_StapleTicket>true</PF_StapleTicket>
<BT_BuildType>DeveloperID</BT_BuildType>
<BT_BuildType>AppStore</BT_BuildType>
<VerInfo_Build>2</VerInfo_Build>
<Icns_MainIcns>READCOM_App\LaunchGen\Icon_MainIcon.icns</Icns_MainIcns>
</PropertyGroup>
Expand All @@ -522,7 +522,7 @@
<PF_AppSpecificPassword>852847CD5F90079FCF3CE53CA4437BACE45C080C7EB7ECA49F0C7772D849A8ACA5FF5D197F6E1C61C1BD5765FAB3C363BAB3361C04652294162B458CE5F52284C946F35DD545FA95BFA2AF3F072C1D0A92003E071DBA097BE3FD16D14425789365CA9A8422F1</PF_AppSpecificPassword>
<PF_StapleTicket>true</PF_StapleTicket>
<PF_DeveloperIDCert>Developer ID Application: Georgios Birmpilis (KVJTZJTSS6)</PF_DeveloperIDCert>
<BT_BuildType>DeveloperID</BT_BuildType>
<BT_BuildType>AppStore</BT_BuildType>
<VerInfo_Build>2</VerInfo_Build>
<Icns_MainIcns>READCOM_App\LaunchGen\Icon_MainIcon.icns</Icns_MainIcns>
<PF_DevSandBox>Apple Distribution: Georgios Birmpilis (KVJTZJTSS6)</PF_DevSandBox>
Expand All @@ -542,6 +542,7 @@
<PF_UWPPackageDisplayName>READ-COM: Reading Communities</PF_UWPPackageDisplayName>
<PF_UWPPublisherDisplayName>Zoomicon</PF_UWPPublisherDisplayName>
<VerInfo_Release>3</VerInfo_Release>
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
Expand All @@ -553,6 +554,7 @@
<VerInfo_PreRelease>true</VerInfo_PreRelease>
<VerInfo_Keys>CompanyName=Zoomicon;FileDescription=READ-COM: Reading Communities (0.7.2);FileVersion=0.7.2.0;InternalName=READCOM_App;LegalCopyright=Zoomicon;LegalTrademarks=;OriginalFilename=;ProgramID=com.zoomicon.readcom.app;ProductName=READ-COM: Reading Communities;ProductVersion=0.7.2.0;Comments=</VerInfo_Keys>
<VerInfo_Release>1</VerInfo_Release>
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
Expand Down
Binary file modified App/READCOM_App.res
Binary file not shown.
Binary file modified App/Win32/Debug/READCOM_App.exe
Binary file not shown.
72 changes: 61 additions & 11 deletions READCOM.groupproj
Original file line number Diff line number Diff line change
Expand Up @@ -118,46 +118,90 @@
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
<ItemGroup Condition="'$(BuildGroup)'=='All Platforms'">
<BuildGroupProject Include="Zoomicon.Text\Zoomicon.Text.dproj">
<ProjectGuid>{024B7E47-45DD-414D-AB87-1A51D735D639}</ProjectGuid>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Introspection\Zoomicon.Introspection.FMX.dproj">
<ProjectGuid>{B42CA181-8650-490B-BB64-1D04F3C529A9}</ProjectGuid>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Helpers.FMX\Zoomicon.Helpers.FMX.dproj">
<ProjectGuid>{15A4C580-B074-4A34-9E19-5DDBAAED1C56}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Win32</Platforms>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Zooming\Zoomicon.Zooming.FMX.dproj">
<ProjectGuid>{E21B9910-DD63-4407-8956-7913CC34AAE8}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Win32</Platforms>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Manipulation\Zoomicon.Manipulation.FMX.dproj">
<ProjectGuid>{5FA59D31-3E92-458C-B539-3809C8A0E13C}</ProjectGuid>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Media\Zoomicon.Media.FMX.dproj">
<ProjectGuid>{6E2C0463-4BB6-4FCC-AA63-3D1E63BDF956}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Win32</Platforms>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="App\READCOM_App.dproj">
<ProjectGuid>{B62CC64D-8B42-4BF6-98BF-575769C693DD}</ProjectGuid>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL.dproj">
<ProjectGuid>{8AEEF5E7-E3D7-4CE9-93CD-80F346D9C7FF}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Win32</Platforms>
<Configurations>Release</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
</ItemGroup>
<ItemGroup Condition="'$(BuildGroup)'=='All Platforms - Debug'">
<BuildGroupProject Include="Zoomicon.Text\Zoomicon.Text.dproj">
<ProjectGuid>{024B7E47-45DD-414D-AB87-1A51D735D639}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Win32</Platforms>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Introspection\Zoomicon.Introspection.FMX.dproj">
<ProjectGuid>{B42CA181-8650-490B-BB64-1D04F3C529A9}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Win32</Platforms>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Helpers.FMX\Zoomicon.Helpers.FMX.dproj">
<ProjectGuid>{15A4C580-B074-4A34-9E19-5DDBAAED1C56}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Zooming\Zoomicon.Zooming.FMX.dproj">
<ProjectGuid>{E21B9910-DD63-4407-8956-7913CC34AAE8}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Manipulation\Zoomicon.Manipulation.FMX.dproj">
<ProjectGuid>{5FA59D31-3E92-458C-B539-3809C8A0E13C}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Win32</Platforms>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Media\Zoomicon.Media.FMX.dproj">
<ProjectGuid>{6E2C0463-4BB6-4FCC-AA63-3D1E63BDF956}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="App\READCOM_App.dproj">
Expand All @@ -166,5 +210,11 @@
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
<BuildGroupProject Include="Zoomicon.Helpers.RTL\Zoomicon.Helpers.RTL.dproj">
<ProjectGuid>{8AEEF5E7-E3D7-4CE9-93CD-80F346D9C7FF}</ProjectGuid>
<Configurations>Debug</Configurations>
<Platforms>Android;Android64;iOSDevice64;iOSSimARM64;OSX64;OSXARM64;Win32;Win64</Platforms>
<Enabled>True</Enabled>
</BuildGroupProject>
</ItemGroup>
</Project>
49 changes: 47 additions & 2 deletions Zoomicon.Helpers.FMX/Zoomicon.Helpers.FMX.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<MainSource>Zoomicon.Helpers.FMX.dpk</MainSource>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<TargetedPlatforms>1741843</TargetedPlatforms>
<TargetedPlatforms>693267</TargetedPlatforms>
<AppType>Package</AppType>
<FrameworkType>FMX</FrameworkType>
<ProjectVersion>20.2</ProjectVersion>
Expand Down Expand Up @@ -64,6 +64,36 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android)'!=''">
<Cfg_1_Android>true</Cfg_1_Android>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android64)'!=''">
<Cfg_1_Android64>true</Cfg_1_Android64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
<Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSX64)'!=''">
<Cfg_1_OSX64>true</Cfg_1_OSX64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='OSXARM64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSXARM64)'!=''">
<Cfg_1_OSXARM64>true</Cfg_1_OSXARM64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
Expand Down Expand Up @@ -172,6 +202,21 @@
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Android)'!=''">
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Android64)'!=''">
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_OSXARM64)'!=''">
<BT_BuildType>AppStore</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
<DCC_Optimize>false</DCC_Optimize>
Expand Down Expand Up @@ -238,7 +283,7 @@
<Platform value="OSXARM64">True</Platform>
<Platform value="Win32">True</Platform>
<Platform value="Win64">True</Platform>
<Platform value="Win64x">True</Platform>
<Platform value="Win64x">False</Platform>
</Platforms>
<Deployment Version="5">
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
Expand Down
Binary file modified Zoomicon.Helpers.FMX/Zoomicon.Helpers.FMX.res
Binary file not shown.
4 changes: 2 additions & 2 deletions Zoomicon.Helpers.RTL/Zoomicon.Helpers.RTL.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1741843</TargetedPlatforms>
<TargetedPlatforms>693267</TargetedPlatforms>
<AppType>Package</AppType>
<ProjectName Condition="'$(ProjectName)'==''">Zoomicon.Helpers.RTL</ProjectName>
</PropertyGroup>
Expand Down Expand Up @@ -1090,7 +1090,7 @@
<Platform value="OSXARM64">True</Platform>
<Platform value="Win32">True</Platform>
<Platform value="Win64">True</Platform>
<Platform value="Win64x">True</Platform>
<Platform value="Win64x">False</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
Expand Down
Binary file modified Zoomicon.Helpers.RTL/Zoomicon.Helpers.RTL.res
Binary file not shown.
4 changes: 2 additions & 2 deletions Zoomicon.Introspection/Zoomicon.Introspection.FMX.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1741843</TargetedPlatforms>
<TargetedPlatforms>693267</TargetedPlatforms>
<AppType>Package</AppType>
<ProjectName Condition="'$(ProjectName)'==''">Zoomicon.Introspection.FMX</ProjectName>
</PropertyGroup>
Expand Down Expand Up @@ -1095,7 +1095,7 @@
<Platform value="OSXARM64">True</Platform>
<Platform value="Win32">True</Platform>
<Platform value="Win64">True</Platform>
<Platform value="Win64x">True</Platform>
<Platform value="Win64x">False</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
Expand Down
Binary file modified Zoomicon.Introspection/Zoomicon.Introspection.FMX.res
Binary file not shown.
4 changes: 2 additions & 2 deletions Zoomicon.Manipulation/Zoomicon.Manipulation.FMX.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1741843</TargetedPlatforms>
<TargetedPlatforms>693267</TargetedPlatforms>
<AppType>Package</AppType>
<ProjectName Condition="'$(ProjectName)'==''">Zoomicon.Manipulation.FMX</ProjectName>
</PropertyGroup>
Expand Down Expand Up @@ -1109,7 +1109,7 @@
<Platform value="OSXARM64">True</Platform>
<Platform value="Win32">True</Platform>
<Platform value="Win64">True</Platform>
<Platform value="Win64x">True</Platform>
<Platform value="Win64x">False</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
Expand Down
Binary file modified Zoomicon.Manipulation/Zoomicon.Manipulation.FMX.res
Binary file not shown.
6 changes: 4 additions & 2 deletions Zoomicon.Media/Zoomicon.Media.FMX.dpk
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ package Zoomicon.Media.FMX;

requires
rtl,
Zoomicon.Generics,
bindengine,
fmx,
bindcomp,
bindcompfmx,
{$IFDEF WIN32} //IGNORE ANY WARNINGS (PRESS CANCEL AND THEN YES) BY DELPHI IDE TRYING TO ADD THESE TWO PACKAGES. KEEP THEM ONLY FOR WIN32 (FOR INSTALLING IN DELPHI IDE). ELSE IT WILL SAYS AT BUILD IT CAN'T FIND THOSE PACKAGES. WITHOUT THEM IT IMPLICITLY IMPORTS THE NEEDED UNITS ON BUILD
SVGImage32Package,
SVGIconImageListFMX;
SVGIconImageListFMX,
{$ENDIF}
Zoomicon.Generics;

contains
Zoomicon.Media.FMX.Models in 'Zoomicon.Media.FMX.Models.pas',
Expand Down
Loading

0 comments on commit ec54130

Please sign in to comment.