Skip to content

Commit 342f6a4

Browse files
gcarrenogcarreno
authored
Merge pull request #46 from corneliusdavid/main
Added batch scripts for Win32/Win64 compilation
2 parents f10418b + 781d405 commit 342f6a4

File tree

7 files changed

+156
-10
lines changed

7 files changed

+156
-10
lines changed

‎entries/dcornelius/src/BuildDCorneliusWin32.cmd‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@echo off
2+
echo Build 1BRC Entry for DCornelius - Delphi 12 Athens, Win32, Release mode.
3+
echo Assumes Delphi 12 is in the path and can find the compiler for Win32 (dcc32.exe).
4+
pause
5+
6+
REM RSVars is a batch supplied with Delphi and sets environment variables used in the compilation
7+
call RSVars
8+
9+
REM -$L- : no debug symbols
10+
REM -$Y- : no symbol reference info
11+
REM -B : build all units
12+
REM -Q : quiet compile
13+
REM -TX : set extension
14+
REM -D : define compiler symbol
15+
REM -E : output folder
16+
REM -CC : console target
17+
REM -U : unit folders
18+
dcc32.exe -$L- -$Y- --no-config -B -Q -TX.exe -DRELEASE -E..\..\..\bin -CC -U"%BDS%\lib\win32\release" dcornelius.dpr

‎entries/dcornelius/src/BuildDCorneliusWin64.cmd‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@echo off
2+
echo Build 1BRC Entry for DCornelius - Delphi 12 Athens, Win64, Release mode.
3+
echo Assumes Delphi 12 is in the path and can find the compiler for Win64 (dcc64.exe).
4+
pause
5+
6+
REM RSVars is a batch supplied with Delphi and sets environment variables used in the compilation
7+
call RSVars
8+
9+
REM -$L- : no debug symbols
10+
REM -$Y- : no symbol reference info
11+
REM -B : build all units
12+
REM -Q : quiet compile
13+
REM -TX : set extension
14+
REM -D : define compiler symbol
15+
REM -E : output folder
16+
REM -CC : console target
17+
REM -U : unit folders
18+
dcc64.exe -$L- -$Y- --no-config -B -Q -TX.exe -DRELEASE -E..\..\..\bin -CC -U"%BDS%\lib\Win64\release" dcornelius.dpr

‎entries/dcornelius/src/dcornelius.dproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,12 @@
9999
<Base>true</Base>
100100
</PropertyGroup>
101101
<PropertyGroup Condition="'$(Base)'!=''">
102-
<DCC_DcuOutput>.\$(Platform)</DCC_DcuOutput>
103102
<DCC_ExeOutput>..\..\..\bin</DCC_ExeOutput>
104103
<DCC_E>false</DCC_E>
105104
<DCC_N>false</DCC_N>
106105
<DCC_S>false</DCC_S>
107106
<DCC_F>false</DCC_F>
108107
<DCC_K>false</DCC_K>
109-
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
110108
<SanitizedProjectName>dcornelius</SanitizedProjectName>
111109
</PropertyGroup>
112110
<PropertyGroup Condition="'$(Base_Android)'!=''">
@@ -193,7 +191,6 @@
193191
</PropertyGroup>
194192
<PropertyGroup Condition="'$(Base_Win32)'!=''">
195193
<DCC_UsePackage>FireDACIBDriver;vclwinx;DataSnapServer;fmx;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;DBXMSSQLDriver;FireDACCommonODBC;emsclient;appanalytics;IndyProtocols;vclx;Skia.Package.RTL;dbxcds;vcledge;FmxTeeUI;DBXFirebirdDriver;FireDACSqliteDriver;DbxClientDriver;NexusDB475si290;soapmidas;TeeUI;dbexpress;ccKeyGen_R;PowerPDFDR;inet;NexusDB475sp290;vcltouch;FireDACDBXDriver;fmxdae;CustomIPTransport;FireDACMSSQLDriver;LockBox3DR;NexusDB475sscr290;RDOpenAI;NexusDB475lg290;NexusDB475psd290;fmxinfopower;IndySystem;sbridge290;NexusDB475iv290;NexusDB475ll290;NexusDB475scr290;vclFireDAC;NexusDB475mr290;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;DOSCommandDR;NexusDB475th290;NexusDB475ch290;bindcompdbx;rtl;FireDACMySQLDriver;NexusDB475pt290;DBXSqliteDriver;DBXSybaseASEDriver;vclimg;DataSnapFireDAC;inetdbxpress;FireDAC;NexusDB475st290;xmlrtl;dsnap;FireDACDb2Driver;DBXOracleDriver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;DatasnapConnectorsFreePascal;SVGIconImageList;NexusDB475tn290;emshosting;NexusDB475tw290;NexusDB475pv290;FireDACCommonDriver;RadiantShapesFmx_Design;IndyIPClient;NexusDB475sll290;bindcompvclwinx;emsedge;bindcompfmx;indy10sbridge290;inetdb;NexusDB475sq290;GR32_R;FireDACASADriver;Tee;SVGIconImageListFMX;vclactnband;fmxFireDAC;FireDACInfxDriver;NexusDB475sd290;DBXMySQLDriver;VclSmp;DataSnapCommon;NexusDB475re290;fmxase;DBXOdbcDriver;dbrtl;FireDACOracleDriver;Skia.Package.FMX;TeeDB;FireDACMSAccDriver;ccVault_R;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;PngComponentsD;NexusDB475tc290;RadiantShapesFmx;FireDACTDataDriver;Skia.Package.VCL;vcldb;NexusDB475rb290;NexusDB475ts290;SynEditDR;bindcomp;IndyCore;RESTBackendComponents;NexusDB475se290;ccLib_R;NexusDB475db290;FireDACADSDriver;RaizeComponentsVclDb;MobilePermissions;RESTComponents;IndyIPServer;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;NexusDB475tm290;DBXDb2Driver;emsclientfiredac;FireDACPgDriver;FireDACDSDriver;tethering;NexusDB475rp290;bindcompvcl;CloudService;DBXSybaseASADriver;BigNumbers;NexusDB475psi290;FMXTee;NexusDB475rc290;NexusDB475rd290;soaprtl;NexusDB475sr290;RaizeComponentsVcl;soapserver;$(DCC_UsePackage)</DCC_UsePackage>
196-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
197194
<BT_BuildType>Debug</BT_BuildType>
198195
<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>
199196
<VerInfo_Locale>1033</VerInfo_Locale>
@@ -208,7 +205,6 @@
208205
<DCC_ConsoleTarget>true</DCC_ConsoleTarget>
209206
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
210207
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
211-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
212208
<BT_BuildType>Debug</BT_BuildType>
213209
<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>
214210
<VerInfo_Locale>1033</VerInfo_Locale>

‎entries/dcornelius/src/uChallengeCommon.pas‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ TWeatherCity = class
2929
// a global class to provide standard open/close and other functions
3030
TChallengeCommon = class
3131
private
32-
FWeatherDataFile: TextFile;
3332
FInputFilename: string;
3433
public
3534
constructor Create(const NewInputFilename: string);

‎entries/dcornelius/src/uChallengeWithDictionary.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ procedure ChallengeWithDictionary;
1616
implementation
1717

1818
uses
19-
System.Classes, System.SysUtils, Generics.Collections, System.StrUtils,
19+
System.Classes, System.SysUtils, System.Generics.Collections, System.StrUtils,
2020
uChallengeCommon;
2121

2222
type

‎generator/Delphi/src/generator.deployproj‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Condition="Exists('$(BDS)\bin\CodeGear.Deployment.targets')" Project="$(BDS)\bin\CodeGear.Deployment.targets"/>
3+
<ProjectExtensions>
4+
<ProjectFileVersion>12</ProjectFileVersion>
5+
</ProjectExtensions>
6+
<PropertyGroup>
7+
<DeviceId Condition="'$(Platform)'=='Android'"/>
8+
<DeviceId Condition="'$(Platform)'=='Android64'"/>
9+
<DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
10+
<DeviceId Condition="'$(Platform)'=='iOSSimARM64'"/>
11+
</PropertyGroup>
12+
<ItemGroup Condition="'$(Platform)'=='OSX64'">
13+
<DeployFile Include="OSX64\Debug\generator" Condition="'$(Config)'=='Debug'">
14+
<RemoteDir>generator.app\Contents\MacOS\</RemoteDir>
15+
<RemoteName>generator</RemoteName>
16+
<DeployClass>ProjectOutput</DeployClass>
17+
<Operation>1</Operation>
18+
<LocalCommand/>
19+
<RemoteCommand/>
20+
<Overwrite>True</Overwrite>
21+
<Required>True</Required>
22+
</DeployFile>
23+
<DeployFile Include="OSX64\Debug\generator.info.plist" Condition="'$(Config)'=='Debug'">
24+
<RemoteDir>generator.app\Contents\</RemoteDir>
25+
<RemoteName>Info.plist</RemoteName>
26+
<DeployClass>ProjectOSXInfoPList</DeployClass>
27+
<Operation>1</Operation>
28+
<LocalCommand/>
29+
<RemoteCommand/>
30+
<Overwrite>True</Overwrite>
31+
</DeployFile>
32+
<DeployFile Include="OSX64\Debug\generator.dSYM" Condition="'$(Config)'=='Debug'">
33+
<RemoteDir>generator.app\..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF\</RemoteDir>
34+
<RemoteName>generator</RemoteName>
35+
<DeployClass>ProjectOSXDebug</DeployClass>
36+
<Operation>1</Operation>
37+
<LocalCommand/>
38+
<RemoteCommand/>
39+
<Overwrite>True</Overwrite>
40+
</DeployFile>
41+
<DeployFile Include="OSX64\Debug\generator.entitlements" Condition="'$(Config)'=='Debug'">
42+
<RemoteDir>generator.app\..\</RemoteDir>
43+
<RemoteName>generator.entitlements</RemoteName>
44+
<DeployClass>ProjectOSXEntitlements</DeployClass>
45+
<Operation>1</Operation>
46+
<LocalCommand/>
47+
<RemoteCommand/>
48+
<Overwrite>True</Overwrite>
49+
</DeployFile>
50+
</ItemGroup>
51+
<ItemGroup Condition="'$(Platform)'=='Win32'">
52+
<DeployFile Include="Win32\Debug\generator.exe" Condition="'$(Config)'=='Debug'">
53+
<RemoteDir>generator\</RemoteDir>
54+
<RemoteName>generator.exe</RemoteName>
55+
<DeployClass>ProjectOutput</DeployClass>
56+
<Operation>0</Operation>
57+
<LocalCommand/>
58+
<RemoteCommand/>
59+
<Overwrite>True</Overwrite>
60+
<Required>True</Required>
61+
</DeployFile>
62+
</ItemGroup>
63+
<ItemGroup Condition="'$(Platform)'=='Android64'"/>
64+
<ItemGroup Condition="'$(Platform)'=='Android'"/>
65+
<ItemGroup Condition="'$(Platform)'=='OSXARM64'"/>
66+
<ItemGroup Condition="'$(Platform)'=='Win64'"/>
67+
<ItemGroup Condition="'$(Platform)'=='iOSDevice64'"/>
68+
<ItemGroup Condition="'$(Platform)'=='iOSSimARM64'"/>
69+
<ItemGroup Condition="'$(Platform)'=='Linux64'">
70+
<DeployFile Include="Linux64\Debug\generator" Condition="'$(Config)'=='Debug'">
71+
<RemoteDir>generator\</RemoteDir>
72+
<RemoteName>generator</RemoteName>
73+
<DeployClass>ProjectOutput</DeployClass>
74+
<Operation>1</Operation>
75+
<LocalCommand/>
76+
<RemoteCommand/>
77+
<Overwrite>True</Overwrite>
78+
<Required>True</Required>
79+
</DeployFile>
80+
</ItemGroup>
81+
</Project>

‎generator/Delphi/src/generator.dproj‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
<Cfg_1>true</Cfg_1>
7070
<Base>true</Base>
7171
</PropertyGroup>
72+
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSX64)'!=''">
73+
<Cfg_1_OSX64>true</Cfg_1_OSX64>
74+
<CfgParent>Cfg_1</CfgParent>
75+
<Cfg_1>true</Cfg_1>
76+
<Base>true</Base>
77+
</PropertyGroup>
7278
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
7379
<Cfg_1_Win32>true</Cfg_1_Win32>
7480
<CfgParent>Cfg_1</CfgParent>
@@ -231,6 +237,12 @@
231237
<Manifest_File>(None)</Manifest_File>
232238
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
233239
</PropertyGroup>
240+
<PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
241+
<Debugger_Launcher>/usr/X11/bin/xterm -e &quot;%debuggee%&quot;</Debugger_Launcher>
242+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
243+
<Manifest_File>(None)</Manifest_File>
244+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
245+
</PropertyGroup>
234246
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
235247
<DCC_RemoteDebug>false</DCC_RemoteDebug>
236248
<DCC_UnitSearchPath>C:\Users\onemo\Desktop\exemplos Delphi_Lazarus\1brc-ObjectPascal\generator\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
@@ -279,6 +291,11 @@
279291
<Source Name="MainSource">generator.dpr</Source>
280292
</Source>
281293
<Excluded_Packages>
294+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\DOSCommandDD290.bpl">TurboPack DOSCommand Designtime Package for Delphi</Excluded_Packages>
295+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\LockBox3VCLDD290.bpl">TurboPack LockBox 3 VCL designtime package</Excluded_Packages>
296+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\LockBox3FMXDD290.bpl">TurboPack LockBox 3 FMX designtime package</Excluded_Packages>
297+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\PowerPDFDD290.bpl">PowerPDF Design-time package</Excluded_Packages>
298+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\SynEditDD290.bpl">TurboPack SynEdit Delphi designtime package</Excluded_Packages>
282299
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
283300
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
284301
</Excluded_Packages>
@@ -299,14 +316,31 @@
299316
<Overwrite>true</Overwrite>
300317
</Platform>
301318
</DeployFile>
302-
<DeployFile LocalName="..\Common\version.inc" Configuration="Debug" Class="ProjectFile">
319+
<DeployFile LocalName="Linux64\Debug\generator" Configuration="Debug" Class="ProjectOutput">
303320
<Platform Name="Linux64">
304-
<RemoteDir>.\</RemoteDir>
321+
<RemoteName>generator</RemoteName>
305322
<Overwrite>true</Overwrite>
306323
</Platform>
307324
</DeployFile>
308-
<DeployFile LocalName="Linux64\Debug\generator" Configuration="Debug" Class="ProjectOutput">
309-
<Platform Name="Linux64">
325+
<DeployFile LocalName="OSX64\Debug\generator.dSYM" Configuration="Debug" Class="ProjectOSXDebug">
326+
<Platform Name="OSX64">
327+
<RemoteName>generator</RemoteName>
328+
<Overwrite>true</Overwrite>
329+
</Platform>
330+
</DeployFile>
331+
<DeployFile LocalName="OSX64\Debug\generator.entitlements" Configuration="Debug" Class="ProjectOSXEntitlements">
332+
<Platform Name="OSX64">
333+
<Overwrite>true</Overwrite>
334+
</Platform>
335+
</DeployFile>
336+
<DeployFile LocalName="OSX64\Debug\generator.info.plist" Configuration="Debug" Class="ProjectOSXInfoPList">
337+
<Platform Name="OSX64">
338+
<RemoteName>Info.plist</RemoteName>
339+
<Overwrite>true</Overwrite>
340+
</Platform>
341+
</DeployFile>
342+
<DeployFile LocalName="OSX64\Debug\generator" Configuration="Debug" Class="ProjectOutput">
343+
<Platform Name="OSX64">
310344
<RemoteName>generator</RemoteName>
311345
<Overwrite>true</Overwrite>
312346
</Platform>

0 commit comments

Comments
 (0)