Skip to content

Added batch scripts for Win32/Win64 compilation #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 23, 2024
Merged

Added batch scripts for Win32/Win64 compilation #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
281ac99
refactor: Remove unused variable
corneliusdavid Mar 22, 2024
0dbda93
chore: Modify project settings and expand unit name to work easier wi…
corneliusdavid Mar 23, 2024
72b6d4a
chore: Add batch scripts for easy command-line compiling of Win32 and…
corneliusdavid Mar 23, 2024
781d405
Merge branch 'gcarreno:main' into main
corneliusdavid Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions entries/dcornelius/src/BuildDCorneliusWin32.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@echo off
echo Build 1BRC Entry for DCornelius - Delphi 12 Athens, Win32, Release mode.
echo Assumes Delphi 12 is in the path and can find the compiler for Win32 (dcc32.exe).
pause

REM RSVars is a batch supplied with Delphi and sets environment variables used in the compilation
call RSVars

REM -$L- : no debug symbols
REM -$Y- : no symbol reference info
REM -B : build all units
REM -Q : quiet compile
REM -TX : set extension
REM -D : define compiler symbol
REM -E : output folder
REM -CC : console target
REM -U : unit folders
dcc32.exe -$L- -$Y- --no-config -B -Q -TX.exe -DRELEASE -E..\..\..\bin -CC -U"%BDS%\lib\win32\release" dcornelius.dpr
18 changes: 18 additions & 0 deletions entries/dcornelius/src/BuildDCorneliusWin64.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@echo off
echo Build 1BRC Entry for DCornelius - Delphi 12 Athens, Win64, Release mode.
echo Assumes Delphi 12 is in the path and can find the compiler for Win64 (dcc64.exe).
pause

REM RSVars is a batch supplied with Delphi and sets environment variables used in the compilation
call RSVars

REM -$L- : no debug symbols
REM -$Y- : no symbol reference info
REM -B : build all units
REM -Q : quiet compile
REM -TX : set extension
REM -D : define compiler symbol
REM -E : output folder
REM -CC : console target
REM -U : unit folders
dcc64.exe -$L- -$Y- --no-config -B -Q -TX.exe -DRELEASE -E..\..\..\bin -CC -U"%BDS%\lib\Win64\release" dcornelius.dpr
4 changes: 0 additions & 4 deletions entries/dcornelius/src/dcornelius.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,12 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<DCC_DcuOutput>.\$(Platform)</DCC_DcuOutput>
<DCC_ExeOutput>..\..\..\bin</DCC_ExeOutput>
<DCC_E>false</DCC_E>
<DCC_N>false</DCC_N>
<DCC_S>false</DCC_S>
<DCC_F>false</DCC_F>
<DCC_K>false</DCC_K>
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
<SanitizedProjectName>dcornelius</SanitizedProjectName>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Android)'!=''">
Expand Down Expand Up @@ -193,7 +191,6 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<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>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<BT_BuildType>Debug</BT_BuildType>
<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>
<VerInfo_Locale>1033</VerInfo_Locale>
Expand All @@ -208,7 +205,6 @@
<DCC_ConsoleTarget>true</DCC_ConsoleTarget>
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
<BT_BuildType>Debug</BT_BuildType>
<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>
<VerInfo_Locale>1033</VerInfo_Locale>
Expand Down
1 change: 0 additions & 1 deletion entries/dcornelius/src/uChallengeCommon.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ TWeatherCity = class
// a global class to provide standard open/close and other functions
TChallengeCommon = class
private
FWeatherDataFile: TextFile;
FInputFilename: string;
public
constructor Create(const NewInputFilename: string);
Expand Down
2 changes: 1 addition & 1 deletion entries/dcornelius/src/uChallengeWithDictionary.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ procedure ChallengeWithDictionary;
implementation

uses
System.Classes, System.SysUtils, Generics.Collections, System.StrUtils,
System.Classes, System.SysUtils, System.Generics.Collections, System.StrUtils,
uChallengeCommon;

type
Expand Down
81 changes: 81 additions & 0 deletions generator/Delphi/src/generator.deployproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Condition="Exists('$(BDS)\bin\CodeGear.Deployment.targets')" Project="$(BDS)\bin\CodeGear.Deployment.targets"/>
<ProjectExtensions>
<ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions>
<PropertyGroup>
<DeviceId Condition="'$(Platform)'=='Android'"/>
<DeviceId Condition="'$(Platform)'=='Android64'"/>
<DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
<DeviceId Condition="'$(Platform)'=='iOSSimARM64'"/>
</PropertyGroup>
<ItemGroup Condition="'$(Platform)'=='OSX64'">
<DeployFile Include="OSX64\Debug\generator" Condition="'$(Config)'=='Debug'">
<RemoteDir>generator.app\Contents\MacOS\</RemoteDir>
<RemoteName>generator</RemoteName>
<DeployClass>ProjectOutput</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
<Required>True</Required>
</DeployFile>
<DeployFile Include="OSX64\Debug\generator.info.plist" Condition="'$(Config)'=='Debug'">
<RemoteDir>generator.app\Contents\</RemoteDir>
<RemoteName>Info.plist</RemoteName>
<DeployClass>ProjectOSXInfoPList</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
</DeployFile>
<DeployFile Include="OSX64\Debug\generator.dSYM" Condition="'$(Config)'=='Debug'">
<RemoteDir>generator.app\..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF\</RemoteDir>
<RemoteName>generator</RemoteName>
<DeployClass>ProjectOSXDebug</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
</DeployFile>
<DeployFile Include="OSX64\Debug\generator.entitlements" Condition="'$(Config)'=='Debug'">
<RemoteDir>generator.app\..\</RemoteDir>
<RemoteName>generator.entitlements</RemoteName>
<DeployClass>ProjectOSXEntitlements</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
</DeployFile>
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='Win32'">
<DeployFile Include="Win32\Debug\generator.exe" Condition="'$(Config)'=='Debug'">
<RemoteDir>generator\</RemoteDir>
<RemoteName>generator.exe</RemoteName>
<DeployClass>ProjectOutput</DeployClass>
<Operation>0</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
<Required>True</Required>
</DeployFile>
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='Android64'"/>
<ItemGroup Condition="'$(Platform)'=='Android'"/>
<ItemGroup Condition="'$(Platform)'=='OSXARM64'"/>
<ItemGroup Condition="'$(Platform)'=='Win64'"/>
<ItemGroup Condition="'$(Platform)'=='iOSDevice64'"/>
<ItemGroup Condition="'$(Platform)'=='iOSSimARM64'"/>
<ItemGroup Condition="'$(Platform)'=='Linux64'">
<DeployFile Include="Linux64\Debug\generator" Condition="'$(Config)'=='Debug'">
<RemoteDir>generator\</RemoteDir>
<RemoteName>generator</RemoteName>
<DeployClass>ProjectOutput</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
<Required>True</Required>
</DeployFile>
</ItemGroup>
</Project>
42 changes: 38 additions & 4 deletions generator/Delphi/src/generator.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
<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)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
Expand Down Expand Up @@ -231,6 +237,12 @@
<Manifest_File>(None)</Manifest_File>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
<Debugger_Launcher>/usr/X11/bin/xterm -e &quot;%debuggee%&quot;</Debugger_Launcher>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<Manifest_File>(None)</Manifest_File>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_RemoteDebug>false</DCC_RemoteDebug>
<DCC_UnitSearchPath>C:\Users\onemo\Desktop\exemplos Delphi_Lazarus\1brc-ObjectPascal\generator\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
Expand Down Expand Up @@ -279,6 +291,11 @@
<Source Name="MainSource">generator.dpr</Source>
</Source>
<Excluded_Packages>
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\DOSCommandDD290.bpl">TurboPack DOSCommand Designtime Package for Delphi</Excluded_Packages>
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\LockBox3VCLDD290.bpl">TurboPack LockBox 3 VCL designtime package</Excluded_Packages>
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\LockBox3FMXDD290.bpl">TurboPack LockBox 3 FMX designtime package</Excluded_Packages>
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\PowerPDFDD290.bpl">PowerPDF Design-time package</Excluded_Packages>
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\SynEditDD290.bpl">TurboPack SynEdit Delphi designtime package</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
Expand All @@ -299,14 +316,31 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="..\Common\version.inc" Configuration="Debug" Class="ProjectFile">
<DeployFile LocalName="Linux64\Debug\generator" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Linux64">
<RemoteDir>.\</RemoteDir>
<RemoteName>generator</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="Linux64\Debug\generator" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Linux64">
<DeployFile LocalName="OSX64\Debug\generator.dSYM" Configuration="Debug" Class="ProjectOSXDebug">
<Platform Name="OSX64">
<RemoteName>generator</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="OSX64\Debug\generator.entitlements" Configuration="Debug" Class="ProjectOSXEntitlements">
<Platform Name="OSX64">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="OSX64\Debug\generator.info.plist" Configuration="Debug" Class="ProjectOSXInfoPList">
<Platform Name="OSX64">
<RemoteName>Info.plist</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="OSX64\Debug\generator" Configuration="Debug" Class="ProjectOutput">
<Platform Name="OSX64">
<RemoteName>generator</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
Expand Down