Skip to content

Commit 5413d23

Browse files
lmbelolmbelo
committed
Setting up boss
Former-commit-id: a25fc2c85aad8cb7d05a1ba63f0c0751ce93f4b4 [formerly 7477720e019dd037f0670988de07f04ab32fa700] [formerly b7e0930481b0b0490e612683bc13afcf6d1402e9 [formerly e22f47209423675c188a1b0e76b8c4300687354d]] Former-commit-id: 8bc943545e42d8c3fcd87c036e30055a48ea58d2 [formerly 792d4e90d1045f2fa719ca0b8ace24dc9492bc93] Former-commit-id: b6e7d245757d91059f64afe414710a17f599cca3 Former-commit-id: bc038ac
1 parent a21053c commit 5413d23

7 files changed

Lines changed: 40 additions & 23 deletions

‎boss-lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"https://github.com/embarcadero/python4delphi": {
66
"name": "python4delphi",
77
"version": "1.1.1",
8-
"hash": "4f08d794fab53bcf440fd520ae839b96",
8+
"hash": "f1c9b702959bfdfb016b5f6068b774eb",
99
"artifacts": {
1010
"dcp": [
1111
"Python.bpi",

‎boss.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"mainsrc": "./src",
77
"projects": [
88
"./packages/P4DTools.dproj",
9-
"./packages/P4DEnvironmentProject",
10-
"./packages/dclP4DEnvironmentProject",
9+
"./packages/P4DEnvironmentProject",
10+
"./packages/dclP4DEnvironmentProject",
1111
"./packages/P4DEnvironment.dproj",
12-
"./packages/dclP4DEnvironment.dproj"
12+
"./packages/dclP4DEnvironment.dproj"
1313
],
1414
"dependencies": {
1515
"https://github.com/embarcadero/python4delphi": "^1.1"

‎packages/P4DEnvironment.dproj‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
<CfgParent>Base</CfgParent>
2424
<Base>true</Base>
2525
</PropertyGroup>
26+
<PropertyGroup Condition="('$(Platform)'=='Linux64' and '$(Base)'=='true') or '$(Base_Linux64)'!=''">
27+
<Base_Linux64>true</Base_Linux64>
28+
<CfgParent>Base</CfgParent>
29+
<Base>true</Base>
30+
</PropertyGroup>
2631
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Base)'=='true') or '$(Base_OSX64)'!=''">
2732
<Base_OSX64>true</Base_OSX64>
2833
<CfgParent>Base</CfgParent>
@@ -77,6 +82,12 @@
7782
<Cfg_2>true</Cfg_2>
7883
<Base>true</Base>
7984
</PropertyGroup>
85+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
86+
<Cfg_2_Win32>true</Cfg_2_Win32>
87+
<CfgParent>Cfg_2</CfgParent>
88+
<Cfg_2>true</Cfg_2>
89+
<Base>true</Base>
90+
</PropertyGroup>
8091
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
8192
<Cfg_2_Win64>true</Cfg_2_Win64>
8293
<CfgParent>Cfg_2</CfgParent>
@@ -85,7 +96,6 @@
8596
</PropertyGroup>
8697
<PropertyGroup Condition="'$(Base)'!=''">
8798
<SanitizedProjectName>P4DEnvironment</SanitizedProjectName>
88-
<BRCC_OutputDir>..\resources</BRCC_OutputDir>
8999
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
90100
<DCC_DcuOutput>..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
91101
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
@@ -111,6 +121,9 @@
111121
<VerInfo_Build>1</VerInfo_Build>
112122
<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>
113123
</PropertyGroup>
124+
<PropertyGroup Condition="'$(Base_Linux64)'!=''">
125+
<Debugger_Launcher>/usr/bin/xterm -e &quot;%debuggee%&quot;</Debugger_Launcher>
126+
</PropertyGroup>
114127
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
115128
<BT_BuildType>Debug</BT_BuildType>
116129
<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>
@@ -123,7 +136,6 @@
123136
<BT_BuildType>Debug</BT_BuildType>
124137
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
125138
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
126-
<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>
127139
<VerInfo_Locale>1033</VerInfo_Locale>
128140
</PropertyGroup>
129141
<PropertyGroup Condition="'$(Base_Win64)'!=''">
@@ -167,6 +179,10 @@
167179
<VerInfo_Build>1</VerInfo_Build>
168180
<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>
169181
</PropertyGroup>
182+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
183+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
184+
<VerInfo_Locale>1033</VerInfo_Locale>
185+
</PropertyGroup>
170186
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
171187
<Debugger_HostApplication>C:\Program Files (x86)\Embarcadero\Studio\22.0\bin\bds.exe</Debugger_HostApplication>
172188
<Debugger_RunParams>C:\Users\lucas\OneDrive\Documents\Embarcadero\Studio\Projects\deployabletest\PyDeploy.dpr</Debugger_RunParams>

‎packages/P4DEnvironmentProject.dproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@
8888
<Cfg_2>true</Cfg_2>
8989
<Base>true</Base>
9090
</PropertyGroup>
91+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
92+
<Cfg_2_Win32>true</Cfg_2_Win32>
93+
<CfgParent>Cfg_2</CfgParent>
94+
<Cfg_2>true</Cfg_2>
95+
<Base>true</Base>
96+
</PropertyGroup>
9197
<PropertyGroup Condition="'$(Base)'!=''">
9298
<SanitizedProjectName>P4DEnvironmentProject</SanitizedProjectName>
9399
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
@@ -178,6 +184,9 @@
178184
<VerInfo_Build>1</VerInfo_Build>
179185
<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>
180186
</PropertyGroup>
187+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
188+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
189+
</PropertyGroup>
181190
<ItemGroup>
182191
<DelphiCompile Include="$(MainSource)">
183192
<MainSource>MainSource</MainSource>

‎packages/P4DTools.dproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
<BT_BuildType>Debug</BT_BuildType>
133133
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
134134
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
135-
<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>
136135
<VerInfo_Locale>1033</VerInfo_Locale>
137136
</PropertyGroup>
138137
<PropertyGroup Condition="'$(Base_Win64)'!=''">

‎packages/dclP4DEnvironment.dproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Base)'!=''">
4444
<SanitizedProjectName>dclP4DEnvironment</SanitizedProjectName>
45-
<BRCC_OutputDir>..\resources\</BRCC_OutputDir>
4645
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
4746
<DCC_DcuOutput>..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
4847
<DCC_Description>P4D AI&amp;ML - Python environments</DCC_Description>
@@ -92,12 +91,6 @@
9291
<DelphiCompile Include="$(MainSource)">
9392
<MainSource>MainSource</MainSource>
9493
</DelphiCompile>
95-
<DCCReference Include="rtl.dcp"/>
96-
<DCCReference Include="p4denvironment.dcp"/>
97-
<DCCReference Include="designide.dcp"/>
98-
<DCCReference Include="dclp4denvironmentproject.dcp"/>
99-
<DCCReference Include="..\src\PyEnvironment.Registration.pas"/>
100-
<DCCReference Include="..\src\PyEnvionment.Editors.pas"/>
10194
<RcItem Include="..\images\png\128x128\embbeded.png">
10295
<ResourceType>RCDATA</ResourceType>
10396
<ResourceId>TPYEMBEDDEDENVIRONMENT128_PNG</ResourceId>

‎packages/dclP4DEnvironmentProject.dproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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
<SanitizedProjectName>dclP4DEnvironmentProject</SanitizedProjectName>
3945
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
@@ -78,19 +84,13 @@
7884
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
7985
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
8086
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
88+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
89+
</PropertyGroup>
8190
<ItemGroup>
8291
<DelphiCompile Include="$(MainSource)">
8392
<MainSource>MainSource</MainSource>
8493
</DelphiCompile>
85-
<DCCReference Include="rtl.dcp"/>
86-
<DCCReference Include="designide.dcp"/>
87-
<DCCReference Include="P4DEnvironmentProject.dcp"/>
88-
<DCCReference Include="..\src\Project\IDE\PyEnvironment.Project.IDE.Helper.pas"/>
89-
<DCCReference Include="..\src\Project\IDE\PyEnvironment.Project.IDE.ManagerMenu.pas"/>
90-
<DCCReference Include="..\src\Project\IDE\PyEnvironment.Project.IDE.Menu.pas"/>
91-
<DCCReference Include="..\src\Project\IDE\PyEnvironment.Project.IDE.Deploy.pas"/>
92-
<DCCReference Include="..\src\Project\IDE\PyEnvironment.Project.IDE.Registration.pas"/>
93-
<DCCReference Include="..\src\Project\IDE\PyEnvironment.Project.IDE.Types.pas"/>
9494
<BuildConfiguration Include="Base">
9595
<Key>Base</Key>
9696
</BuildConfiguration>

0 commit comments

Comments
 (0)