Skip to content
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

Added Delphi 10 Sydney(10.4.0, 10.4.1) support #27

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added Delphi 10 Sydney(10.4.0, 10.4.1) support #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2653ee0
Added Delphi 10 Sydney(10.4.0, 10.4.1) support
juliomar Oct 26, 2020
7179fbc
Merge branch 'RRUZ:master' into master
juliomar Jan 20, 2022
a9e345b
Updated for 11 Alexandria and added elevation
jimmckeeth Aug 3, 2022
5d47209
Update README.md
jimmckeeth Aug 3, 2022
5735939
Merge pull request #1 from jimmckeeth/master
juliomar Aug 4, 2022
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@
*.drc
*.dcu
/*.identcache
*.rsm
16 changes: 15 additions & 1 deletion Build_x64Debug.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
@echo off
set dll=%CD%\Win64\Debug\DelphiDevShellTools.dll
if exist %dll% (
echo Unregistering
powershell -Command "start-process cmd \"/c regsvr32 %dll% /u \" -Verb RunAs"
del %dll%
pause
)
if exist %dll% (
echo DLL was locked by explorer so restarting explorer.
taskkill /F /IM explorer.exe
del %dll%
start explorer.exe
)
BRCC32 VersionInfo.rc
call "C:\Program Files (x86)\Embarcadero\Studio\20.0\bin\rsvars.bat"
call "C:\Program Files (x86)\Embarcadero\Studio\22.0\bin\rsvars.bat"
msbuild.exe "DelphiDevShellTools.dproj" /target:Clean;Build /p:Platform=Win64 /p:config=debug
set BUILD_STATUS=%ERRORLEVEL%
if %BUILD_STATUS%==0 GOTO Updater
Expand Down
16 changes: 15 additions & 1 deletion Build_x64Release.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
@echo off
set dll=%CD%\Win64\Release\DelphiDevShellTools.dll
if exist %dll% (
echo Unregistering
powershell -Command "start-process cmd \"/c regsvr32 %dll% /u \" -Verb RunAs"
del %dll%
pause
)
if exist %dll% (
echo DLL was locked by explorer so restarting explorer.
taskkill /F /IM explorer.exe
del %dll%
start explorer.exe
)
BRCC32 VersionInfo.rc
call "C:\Program Files (x86)\Embarcadero\Studio\20.0\bin\rsvars.bat"
call "C:\Program Files (x86)\Embarcadero\Studio\22.0\bin\rsvars.bat"
msbuild.exe "DelphiDevShellTools.dproj" /target:clean;build /p:Platform=Win64 /p:config=release
pause
16 changes: 15 additions & 1 deletion Build_x86Debug.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
@echo off
set dll=%CD%\Win32\Debug\DelphiDevShellTools.dll
if exist %dll% (
echo Unregistering
powershell -Command "start-process cmd \"/c regsvr32 %dll% /u \" -Verb RunAs"
del %dll%
pause
)
if exist %dll% (
echo DLL was locked by explorer so restarting explorer.
taskkill /F /IM explorer.exe
del %dll%
start explorer.exe
)
BRCC32 VersionInfo.rc
call "C:\Program Files (x86)\Embarcadero\Studio\20.0\bin\rsvars.bat"
call "C:\Program Files (x86)\Embarcadero\Studio\22.0\bin\rsvars.bat"
msbuild.exe "DelphiDevShellTools.dproj" /target:Clean;Build /p:Platform=Win32 /p:config=debug
pause
16 changes: 15 additions & 1 deletion Build_x86Release.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
@echo off
set dll=%CD%\Win32\Release\DelphiDevShellTools.dll
if exist %dll% (
echo Unregistering
powershell -Command "start-process cmd \"/c regsvr32 %dll% /u \" -Verb RunAs"
del %dll%
pause
)
if exist %dll% (
echo DLL was locked by explorer so restarting explorer.
taskkill /F /IM explorer.exe
del %dll%
start explorer.exe
)
BRCC32 VersionInfo.rc
call "C:\Program Files (x86)\Embarcadero\Studio\20.0\bin\rsvars.bat"
call "C:\Program Files (x86)\Embarcadero\Studio\22.0\bin\rsvars.bat"
msbuild.exe "DelphiDevShellTools.dproj" /target:clean;build /p:Platform=Win32 /p:config=release
pause
522 changes: 62 additions & 460 deletions DelphiDevShellTools.dproj
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions DelphiVersions.db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
<ROW Version="9" Name="RAD Studio XE"/>
<ROW Version="10" Name="RAD Studio XE2"/>
<ROW Version="11" Name="RAD Studio XE3"/>
<ROW Version="12" Name="RAD Studio XE4"/>
<ROW Version="13" Name="RAD Studio XE5"/>
<ROW Version="14" Name="RAD Studio XE6"/>
<ROW Version="15" Name="RAD Studio XE7"/>
<ROW Version="16" Name="RAD Studio XE8"/>
<ROW Version="17" Name="RAD Studio 10 Seattle"/>
<ROW Version="18" Name="RAD Studio 10 Berlin"/>
<ROW Version="19" Name="RAD Studio 10 Tokyo"/>
<ROW Version="20" Name="RAD Studio 10 Rio"/>
<ROW Version="12" Name="RAD Studio XE4"/>
<ROW Version="13" Name="RAD Studio XE5"/>
<ROW Version="14" Name="RAD Studio XE6"/>
<ROW Version="15" Name="RAD Studio XE7"/>
<ROW Version="16" Name="RAD Studio XE8"/>
<ROW Version="17" Name="RAD Studio 10 Seattle"/>
<ROW Version="18" Name="RAD Studio 10.1 Berlin"/>
<ROW Version="19" Name="RAD Studio 10.2 Tokyo"/>
<ROW Version="20" Name="RAD Studio 10.3 Rio"/>
<ROW Version="21" Name="RAD Studio 10.4 Sydney"/>
<ROW Version="22" Name="RAD Studio 11 Alexandria"/>
</ROWDATA>
</DATAPACKET>
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Supports Delphi 5, 6, 7, 2005, BDS/Turbo 2006
* RAD Studio 2007, 2009, 2010
* RAD Studio XE-XE8
* RAD Studio 10 Seattle, [RAD Studio 10.1 Berlin](https://www.embarcadero.com/es/app-development-tools-store/rad-studio)
* RAD Studio 10 Seattle to [11.1 Alexandria](https://www.embarcadero.com/products/rad-studio/whats-new-in-11-alexandria)
* Appmethod
* [Lazarus 1.6](http://www.lazarus-ide.org/)
* Works in Windows 10/8/7/XP. (x86 and x64 versions)
Expand Down
Binary file modified VersionInfo.RES
View file
Open in desktop
Binary file not shown.
10 changes: 9 additions & 1 deletion Win32/Debug/register.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
regsvr32 "DelphiDevShellTools.dll"
@echo off
set dll=%CD%\DelphiDevShellTools.dll

if exist %dll% (
powershell -Command "start-process cmd \"/c regsvr32 %dll%\" -Verb RunAs"
) else (
echo "DelphiDevShellTools.dll not found. Run Build first."
Pause
)
4 changes: 3 additions & 1 deletion Win32/Debug/unregister.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
regsvr32 "DelphiDevShellTools.dll" /U
@echo off
set dll=%CD%\DelphiDevShellTools.dll
powershell -Command "start-process cmd \"/c regsvr32 /U %dll%\" -Verb RunAs"
10 changes: 9 additions & 1 deletion Win32/Release/register.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
regsvr32 "DelphiDevShellTools.dll"
@echo off
set dll=%CD%\DelphiDevShellTools.dll

if exist %dll% (
powershell -Command "start-process cmd \"/c regsvr32 %dll%\" -Verb RunAs"
) else (
echo "DelphiDevShellTools.dll not found. Run Build first."
Pause
)
4 changes: 3 additions & 1 deletion Win32/Release/unregister.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
regsvr32 "DelphiDevShellTools.dll" /U
@echo off
set dll=%CD%\DelphiDevShellTools.dll
powershell -Command "start-process cmd \"/c regsvr32 /U %dll%\" -Verb RunAs"
10 changes: 9 additions & 1 deletion Win64/Debug/register.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
regsvr32 "DelphiDevShellTools.dll"
@echo off
set dll=%CD%\DelphiDevShellTools.dll

if exist %dll% (
powershell -Command "start-process cmd \"/c regsvr32 %dll%\" -Verb RunAs"
) else (
echo "DelphiDevShellTools.dll not found. Run Build first."
Pause
)
4 changes: 3 additions & 1 deletion Win64/Debug/unregister.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
regsvr32 "DelphiDevShellTools.dll" /U
@echo off
set dll=%CD%\DelphiDevShellTools.dll
powershell -Command "start-process cmd \"/c regsvr32 /U %dll%\" -Verb RunAs"
10 changes: 9 additions & 1 deletion Win64/Release/register.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
regsvr32 "DelphiDevShellTools.dll"
@echo off
set dll=%CD%\DelphiDevShellTools.dll

if exist %dll% (
powershell -Command "start-process cmd \"/c regsvr32 %dll%\" -Verb RunAs"
) else (
echo "DelphiDevShellTools.dll not found. Run Build first."
Pause
)
4 changes: 3 additions & 1 deletion Win64/Release/unregister.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
regsvr32 "DelphiDevShellTools.dll" /U
@echo off
set dll=%CD%\DelphiDevShellTools.dll
powershell -Command "start-process cmd \"/c regsvr32 /U %dll%\" -Verb RunAs"
32 changes: 23 additions & 9 deletions units/uDelphiVersions.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ interface
Delphi10Seattle,
Delphi10Berlin,
Delphi10Tokyo,
Delphi10Rio
Delphi10Rio,
Delphi10Sydney,
Delphi11Alexandria
);

SetDelphiVersions= TArray<TDelphiVersions>;
Expand Down Expand Up @@ -198,9 +200,11 @@ TPAClientProfileList=class
'RAD Studio XE7',
'RAD Studio XE8',
'RAD Studio 10 Seattle',
'RAD Studio 10 Berlin',
'RAD Studio 10 Tokyo',
'RAD Studio 10 Rio'
'RAD Studio 10.1 Berlin',
'RAD Studio 10.2 Tokyo',
'RAD Studio 10.3 Rio',
'RAD Studio 10.4 Sydney',
'RAD Studio 11 Alexandria'
);

DelphiRegPaths: array[TDelphiVersions] of string = (
Expand All @@ -226,8 +230,10 @@ TPAClientProfileList=class
'\Software\Embarcadero\BDS\16.0',
'\Software\Embarcadero\BDS\17.0',
'\Software\Embarcadero\BDS\18.0',
'\Software\Embarcadero\BDS\19.0',
'\Software\Embarcadero\BDS\20.0'
'\Software\Embarcadero\BDS\19.0',
'\Software\Embarcadero\BDS\20.0',
'\Software\Embarcadero\BDS\21.0',
'\Software\Embarcadero\BDS\22.0'
);

PAClientProfilesPaths: array[TDelphiVersions] of string = (
Expand All @@ -253,8 +259,10 @@ TPAClientProfileList=class
'\Embarcadero\BDS\16.0',
'\Embarcadero\BDS\17.0',
'\Embarcadero\BDS\18.0',
'\Embarcadero\BDS\19.0',
'\Embarcadero\BDS\20.0'
'\Embarcadero\BDS\19.0',
'\Embarcadero\BDS\20.0',
'\Embarcadero\BDS\21.0',
'\Embarcadero\BDS\22.0'
);

function GetListInstalledDelphiVersions: TInstalledDelphiVerions;
Expand Down Expand Up @@ -473,7 +481,13 @@ function GetDelphiVersions(const ProjectFile: string): SetDelphiVersions;
if not VarIsClear(Node) then
begin
sVersion := Node.Text;
if MatchText(sVersion,['18.5', '18.6']) then
if MatchText(sVersion,['20.0', '20.1']) then
Exit(TArray<TDelphiVersions>.Create(Delphi11Alexandria))
else
if MatchText(sVersion,['19.0', '19.1']) then
Exit(TArray<TDelphiVersions>.Create(Delphi10Sydney))
else
if MatchText(sVersion,['18.5', '18.8']) then
Exit(TArray<TDelphiVersions>.Create(Delphi10Rio))
else
if MatchText(sVersion,['18.3', '18.4']) then
Expand Down