diff --git a/components/edbimage/packages/delphi11/VCLSer.dproj b/components/edbimage/packages/delphi11/VCLSer.dproj index d6cf6744..9e3fb9b7 100644 --- a/components/edbimage/packages/delphi11/VCLSer.dproj +++ b/components/edbimage/packages/delphi11/VCLSer.dproj @@ -35,10 +35,10 @@ ..\..\build $(BDSCOMMONDIR)\Bpl $(BDSCOMMONDIR)\Dcp - ..\..\..\compilerdetection - ..\..\..\compilerdetection - ..\..\..\compilerdetection - ..\..\..\compilerdetection + ..\..\..\compilerdetection;..\..\resources + ..\..\..\compilerdetection;..\..\resources + ..\..\..\compilerdetection;..\..\resources + ..\..\..\compilerdetection;..\..\resources Delphi.Personality diff --git a/components/edbimage/source/uSerREG.pas b/components/edbimage/source/uSerREG.pas index 6f7be76c..1998a8c7 100644 --- a/components/edbimage/source/uSerREG.pas +++ b/components/edbimage/source/uSerREG.pas @@ -2,7 +2,7 @@ unit UserReg; interface -{$R ..\..\resources\CompsSer.dcr} +{$R CompsSer.dcr} {$I compilers.inc} procedure Register; diff --git a/components/heidisql/packages/delphi11/HeidiComponents.dproj b/components/heidisql/packages/delphi11/HeidiComponents.dproj index c8957deb..2a6b43c3 100644 --- a/components/heidisql/packages/delphi11/HeidiComponents.dproj +++ b/components/heidisql/packages/delphi11/HeidiComponents.dproj @@ -16,20 +16,20 @@ ..\..\build ..\..\build RELEASE - ..\..\..\zeosdbo\build - ..\..\..\zeosdbo\build - ..\..\..\zeosdbo\build - ..\..\..\zeosdbo\build + ..\..\..\zeosdbo\build;..\..\..\..\source + ..\..\..\zeosdbo\build;..\..\..\..\source + ..\..\..\zeosdbo\build;..\..\..\..\source + ..\..\..\zeosdbo\build;..\..\..\..\source 7.0 ..\..\build ..\..\build ..\..\build - ..\..\..\zeosdbo\build - ..\..\..\zeosdbo\build - ..\..\..\zeosdbo\build - ..\..\..\zeosdbo\build + ..\..\..\zeosdbo\build;..\..\..\..\source + ..\..\..\zeosdbo\build;..\..\..\..\source + ..\..\..\zeosdbo\build;..\..\..\..\source + ..\..\..\zeosdbo\build;..\..\..\..\source Delphi.Personality @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/components/heidisql/source/heidicomp.pas b/components/heidisql/source/heidicomp.pas index 88e616a8..f3786337 100644 --- a/components/heidisql/source/heidicomp.pas +++ b/components/heidisql/source/heidicomp.pas @@ -7,7 +7,7 @@ uses ComCtrls, CommCtrl, StdCtrls, ExtCtrls, Graphics, ZDataset; -{$I ../../../source/const.inc} +{$I const.inc} type TSortListView = class(TListView) diff --git a/components/synedit/Packages/delphi10/SynEdit_D10.bdsproj b/components/synedit/Packages/delphi10/SynEdit_D10.bdsproj index f78e7470..05e4e0de 100644 --- a/components/synedit/Packages/delphi10/SynEdit_D10.bdsproj +++ b/components/synedit/Packages/delphi10/SynEdit_D10.bdsproj @@ -123,7 +123,7 @@ ..\..\build - ..\..\build + ..\..\build;..\..\..\compilerdetection ..\..\Source diff --git a/components/synedit/Packages/delphi10/SynEdit_R2006.bdsproj b/components/synedit/Packages/delphi10/SynEdit_R2006.bdsproj index 59ebc20b..fd486873 100644 --- a/components/synedit/Packages/delphi10/SynEdit_R2006.bdsproj +++ b/components/synedit/Packages/delphi10/SynEdit_R2006.bdsproj @@ -123,7 +123,7 @@ ..\..\build - ..\..\resources + ..\..\resources;..\..\..\compilerdetection ..\..\Source diff --git a/components/synedit/Packages/delphi11/SynEditD.dproj b/components/synedit/Packages/delphi11/SynEditD.dproj index ad85473d..870a54b9 100644 --- a/components/synedit/Packages/delphi11/SynEditD.dproj +++ b/components/synedit/Packages/delphi11/SynEditD.dproj @@ -16,10 +16,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\build - ..\..\build - ..\..\build - ..\..\build + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection RELEASE @@ -28,10 +28,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\build - ..\..\build - ..\..\build - ..\..\build + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection Delphi.Personality @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/components/synedit/Packages/delphi11/SynEditR.dproj b/components/synedit/Packages/delphi11/SynEditR.dproj index 83ff07fe..ddb3d0d2 100644 --- a/components/synedit/Packages/delphi11/SynEditR.dproj +++ b/components/synedit/Packages/delphi11/SynEditR.dproj @@ -16,10 +16,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\resources - ..\..\resources - ..\..\resources - ..\..\resources + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection RELEASE @@ -28,10 +28,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\resources - ..\..\resources - ..\..\resources - ..\..\resources + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection + ..\..\resources;..\..\..\compilerdetection Delphi.Personality @@ -154,4 +154,4 @@ - \ No newline at end of file + diff --git a/components/synedit/Source/SynEdit.inc b/components/synedit/Source/SynEdit.inc index a9095e21..7928aa9a 100644 --- a/components/synedit/Source/SynEdit.inc +++ b/components/synedit/Source/SynEdit.inc @@ -1,4 +1,4 @@ -{$I ../../compilerdetection/Compilers.inc} +{$I Compilers.inc} (******************************************************************************) (* SynEdit Include File. This file was adapted from Brad Stowers' DFS.INC *) diff --git a/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj b/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj index 189d8278..6d302fa8 100644 --- a/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj +++ b/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj @@ -123,7 +123,7 @@ ..\..\build $(BDSPROJECTSDIR)\bpl $(BDSPROJECTSDIR)\bpl - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\build + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\build;..\..\..\compilerdetection diff --git a/components/zeosdbo/src/Zeos.inc b/components/zeosdbo/src/Zeos.inc index 9e398087..576a7111 100644 --- a/components/zeosdbo/src/Zeos.inc +++ b/components/zeosdbo/src/Zeos.inc @@ -1,4 +1,4 @@ -{$I ../../../compilerdetection/compilers.inc} +{$I compilers.inc} // Compilation directives for Delphi4 diff --git a/extra/build_super.cmd b/extra/build_super.cmd new file mode 100644 index 00000000..ed2f8b01 --- /dev/null +++ b/extra/build_super.cmd @@ -0,0 +1,93 @@ +@echo off + +REM ============================================= +REM +REM Set compiler_dir and package_dir appropriately. +REM Example: +REM set compiler_dir=C:\path\to\delphi\bin\directory\ +REM set package_dir=delphi11 +REM + +set compiler_dir= +set package_dir= + +REM ============================================= + + +IF "%compiler_dir%" == "" GOTO usage +IF "%package_dir%" == "" GOTO usage +GOTO start + +:usage +ECHO Please modify path and version settings in build_super.cmd. +ECHO. +GOTO end + +:start +set compiler=%compiler_dir%dcc32.exe +set start_dir=%CD% +set base_dir=%start_dir%\..\ + +rem Switch to base directory +cd %base_dir% + +rem Delete old binaries +del /S *.dcu + +set params=-aWinTypes=Windows;WinProcs=Windows;DbiProcs=BDE;DbiTypes=BDE;DbiErrs=BDE +set params=%params% -B +set params=%params% -u"%compiler_dir%..\lib;%compiler_dir%..\lib\Obj;%base_dir%components\zeosdbo\build;%base_dir%components\virtualtreeview\build;%base_dir%components\synedit\build;%base_dir%components\smdbgrid\build;%base_dir%components\heidisql\build;%base_dir%components\edbimage\build;" +set params=%params% -i"%base_dir%components\compilerdetection;%base_dir%source" +set params=%params% -LE"%ALLUSERSPROFILE%\Dokumente\RAD Studio\5.0\Bpl" +set params=%params% -LN"%ALLUSERSPROFILE%\Dokumente\RAD Studio\5.0\Dcp" +set params=%params% -r"%base_dir%source;%base_dir%components\smdbgrid\Resources;%base_dir%components\synedit\resources;%base_dir%components\synedit\Source;%base_dir%components\virtualtreeview\Resources;%base_dir%components\edbimage\resources" + + +rem Build EDBImage +cd %base_dir%components\edbimage\packages\%package_dir%\ +%compiler% -N0"..\..\build" %params% VCLSer.dpk +%compiler% -N0"..\..\build" %params% DCLSer.dpk + + +rem Build SMDBGrid +cd %base_dir%components\smdbgrid\packages\%package_dir%\ +%compiler% -N0"..\..\build" %params% SMDBGridComponents.dpk + + +rem Build SynEdit +cd %base_dir%components\synedit\packages\%package_dir%\ +rem -Q = Quiet compile +rem This is a workaround for avoiding error D21153 +rem see here: http://qc.borland.com/wc/qcmain.aspx?d=44731 +%compiler% -N0"..\..\build" -Q %params% SynEditR.dpk +%compiler% -N0"..\..\build" -Q %params% SynEditD.dpk + + +rem Build ZeosDBO +cd %base_dir%components\zeosdbo\packages\%package_dir%\ +%compiler% -N0"..\..\build" -Q %params% ZCore.dpk +%compiler% -N0"..\..\build" -Q %params% ZPlain.dpk +%compiler% -N0"..\..\build" -Q %params% ZParseSql.dpk +%compiler% -N0"..\..\build" -Q %params% ZDbc.dpk +%compiler% -N0"..\..\build" -Q %params% ZComponent.dpk +%compiler% -N0"..\..\build" -Q %params% ZComponentDesign.dpk + + +rem Build HeidiComponents +cd %base_dir%components\heidisql\packages\%package_dir%\ +%compiler% -N0"..\..\build" %params% HeidiComponents.dpk + + +rem Build VirtualTreeView +cd %base_dir%components\virtualtreeview\packages\%package_dir%\ +%compiler% -N0"..\..\build" %params% VirtualTreesR.dpk + + +rem Build main executable +cd %base_dir%\packages\%package_dir%\ +%compiler% -N0"..\..\build" -e"%base_dir%out" %params% heidisql.dpr + +cd %start_dir% + + +:end