Skip to content

Commit dd7e44a

Browse files
lmbelolmbelo
committed
Including .res files to the gitignore
Former-commit-id: 264e18ba734f41b1cf349e233d19da302b0a0c32 [formerly 8a6e639dd433bba37900e9aa2ebbcc50bbc9f48f] [formerly c538b7be3d9b5ddeba32af7ba7fc89d81c2a7c11 [formerly 5142a093b544871bd1c48e2b4c37a22f08813e13]] Former-commit-id: 1429625ff156185b5f2742b34f9024df614ff0d0 [formerly 566c198c8e5302ae18ea72e71430349c3f162cd0] Former-commit-id: 354fb2d1a23d848fbff6cb3d0a0b1dd8f8485ddc Former-commit-id: 2587170
1 parent 4cd0c50 commit dd7e44a

6 files changed

+106
-815
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Resource files are binaries containing manifest, project icon and version info.
55
# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files.
6-
#*.res
6+
*.res
77
#
88
# Type library file (binary). In old Delphi versions it should be stored.
99
# Since Delphi 2009 it is produced from .ridl file and can safely be ignored.

‎packages/P4DEnvironment.dproj

+16-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>None</FrameworkType>
77
<MainSource>P4DEnvironment.dpk</MainSource>
8-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
8+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{08C84E96-1508-43E8-87F7-A4B2F8AF2205}</ProjectGuid>
1010
<ProjectVersion>19.4</ProjectVersion>
1111
<TargetedPlatforms>168083</TargetedPlatforms>
@@ -71,6 +71,12 @@
7171
<CfgParent>Base</CfgParent>
7272
<Base>true</Base>
7373
</PropertyGroup>
74+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
75+
<Cfg_2_Win64>true</Cfg_2_Win64>
76+
<CfgParent>Cfg_2</CfgParent>
77+
<Cfg_2>true</Cfg_2>
78+
<Base>true</Base>
79+
</PropertyGroup>
7480
<PropertyGroup Condition="'$(Base)'!=''">
7581
<SanitizedProjectName>P4DEnvironment</SanitizedProjectName>
7682
<BRCC_OutputDir>..\resources</BRCC_OutputDir>
@@ -138,6 +144,8 @@
138144
</PropertyGroup>
139145
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
140146
<DCC_RemoteDebug>false</DCC_RemoteDebug>
147+
<Debugger_HostApplication>C:\Program Files (x86)\Embarcadero\Studio\22.0\bin\bds.exe</Debugger_HostApplication>
148+
<Debugger_RunParams>C:\Users\lucas\OneDrive\Documents\Embarcadero\Studio\Projects\deployabletest\PyDeploy.dpr</Debugger_RunParams>
141149
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
142150
<VerInfo_Locale>1033</VerInfo_Locale>
143151
</PropertyGroup>
@@ -147,13 +155,20 @@
147155
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
148156
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
149157
</PropertyGroup>
158+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
159+
<Debugger_HostApplication>C:\Program Files (x86)\Embarcadero\Studio\22.0\bin\bds.exe</Debugger_HostApplication>
160+
<Debugger_RunParams>C:\Users\lucas\OneDrive\Documents\Embarcadero\Studio\Projects\deployabletest\PyDeploy.dpr</Debugger_RunParams>
161+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
162+
<VerInfo_Locale>1033</VerInfo_Locale>
163+
</PropertyGroup>
150164
<ItemGroup>
151165
<DelphiCompile Include="$(MainSource)">
152166
<MainSource>MainSource</MainSource>
153167
</DelphiCompile>
154168
<DCCReference Include="rtl.dcp"/>
155169
<DCCReference Include="python.dcp"/>
156170
<DCCReference Include="p4dtools.dcp"/>
171+
<DCCReference Include="p4denvironmentproject.dcp"/>
157172
<DCCReference Include="..\src\PyEnvironment.pas"/>
158173
<DCCReference Include="..\src\PyEnvironment.Notification.pas"/>
159174
<DCCReference Include="..\src\PyEnvironment.Distribution.pas"/>

‎packages/P4DEnvironmentProject.dproj

+54-8
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,47 @@
22
<PropertyGroup>
33
<Base>True</Base>
44
<AppType>Package</AppType>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
5+
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>None</FrameworkType>
77
<MainSource>P4DEnvironmentProject.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{D7D611D7-E03F-4578-8243-2338F9455A17}</ProjectGuid>
1010
<ProjectVersion>19.4</ProjectVersion>
11-
<TargetedPlatforms>1</TargetedPlatforms>
11+
<TargetedPlatforms>168083</TargetedPlatforms>
1212
</PropertyGroup>
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>
26+
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Base)'=='true') or '$(Base_OSX64)'!=''">
27+
<Base_OSX64>true</Base_OSX64>
28+
<CfgParent>Base</CfgParent>
29+
<Base>true</Base>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="('$(Platform)'=='OSXARM64' and '$(Base)'=='true') or '$(Base_OSXARM64)'!=''">
32+
<Base_OSXARM64>true</Base_OSXARM64>
33+
<CfgParent>Base</CfgParent>
34+
<Base>true</Base>
35+
</PropertyGroup>
1636
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
1737
<Base_Win32>true</Base_Win32>
1838
<CfgParent>Base</CfgParent>
1939
<Base>true</Base>
2040
</PropertyGroup>
41+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
42+
<Base_Win64>true</Base_Win64>
43+
<CfgParent>Base</CfgParent>
44+
<Base>true</Base>
45+
</PropertyGroup>
2146
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
2247
<Cfg_1>true</Cfg_1>
2348
<CfgParent>Base</CfgParent>
@@ -47,13 +72,34 @@
4772
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
4873
<VerInfo_Locale>1033</VerInfo_Locale>
4974
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Base_Android)'!=''">
76+
<BT_BuildType>Debug</BT_BuildType>
77+
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Base_Android64)'!=''">
80+
<BT_BuildType>Debug</BT_BuildType>
81+
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
82+
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
84+
<BT_BuildType>Debug</BT_BuildType>
85+
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers</VerInfo_Keys>
86+
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
88+
<BT_BuildType>Debug</BT_BuildType>
89+
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers</VerInfo_Keys>
90+
</PropertyGroup>
5091
<PropertyGroup Condition="'$(Base_Win32)'!=''">
5192
<BT_BuildType>Debug</BT_BuildType>
5293
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
5394
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
5495
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
5596
<VerInfo_Locale>1033</VerInfo_Locale>
5697
</PropertyGroup>
98+
<PropertyGroup Condition="'$(Base_Win64)'!=''">
99+
<BT_BuildType>Debug</BT_BuildType>
100+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
101+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
102+
</PropertyGroup>
57103
<PropertyGroup Condition="'$(Cfg_1)'!=''">
58104
<DCC_DebugDCUs>true</DCC_DebugDCUs>
59105
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
@@ -104,13 +150,13 @@
104150
<Excluded_Packages/>
105151
</Delphi.Personality>
106152
<Platforms>
107-
<Platform value="Android">False</Platform>
108-
<Platform value="Android64">False</Platform>
109-
<Platform value="Linux64">False</Platform>
110-
<Platform value="OSX64">False</Platform>
111-
<Platform value="OSXARM64">False</Platform>
153+
<Platform value="Android">True</Platform>
154+
<Platform value="Android64">True</Platform>
155+
<Platform value="Linux64">True</Platform>
156+
<Platform value="OSX64">True</Platform>
157+
<Platform value="OSXARM64">True</Platform>
112158
<Platform value="Win32">True</Platform>
113-
<Platform value="Win64">False</Platform>
159+
<Platform value="Win64">True</Platform>
114160
<Platform value="iOSDevice64">False</Platform>
115161
</Platforms>
116162
</BorlandProject>

‎packages/P4DTools.dproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>None</FrameworkType>
77
<MainSource>P4DTools.dpk</MainSource>
8-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
8+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{ACD248FC-DD28-4E84-9959-B3E7F13EF694}</ProjectGuid>
1010
<ProjectVersion>19.4</ProjectVersion>
1111
<TargetedPlatforms>168083</TargetedPlatforms>

‎packages/dclP4DEnvironment.dproj

+3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@
9494
</DelphiCompile>
9595
<DCCReference Include="rtl.dcp"/>
9696
<DCCReference Include="p4denvironment.dcp"/>
97+
<DCCReference Include="designide.dcp"/>
98+
<DCCReference Include="dclp4denvironmentproject.dcp"/>
9799
<DCCReference Include="..\src\PyEnvironment.Registration.pas"/>
100+
<DCCReference Include="..\src\PyEnvionment.Editors.pas"/>
98101
<RcItem Include="..\images\png\128x128\embbeded.png">
99102
<ResourceType>RCDATA</ResourceType>
100103
<ResourceId>TPYEMBEDDEDENVIRONMENT128_PNG</ResourceId>

0 commit comments

Comments
 (0)