Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: project-jedi/jcl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Torbins/jcl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Jul 24, 2023

  1. Fix Favorite Folders expert in new versions of RAD Studio

    @Torbins
    Torbins committed Jul 24, 2023
    Copy the full SHA
    ca94e0c View commit details

Commits on Jan 18, 2024

  1. Merge branch 'project-jedi:master' into master

    @Torbins
    Torbins authored Jan 18, 2024
    Copy the full SHA
    0ff96d5 View commit details

Commits on Apr 1, 2024

  1. Merge branch 'project-jedi:master' into master

    @Torbins
    Torbins authored Apr 1, 2024
    Copy the full SHA
    c05cbbc View commit details

  2. Take target file name from project settings instead of guessing

    Mykola Petrivskyi committed Apr 1, 2024
    Copy the full SHA
    dfadd51 View commit details
2 changes: 1 addition & 1 deletion jcl/experts/common/JclOtaResources.pas
View file
Original file line number Diff line number Diff line change
@@ -266,7 +266,7 @@ interface
RsEMapFileNotFound = 'Map file "%s" for project "%s" not found.' +
'No conversions of debug information were made';
RsConvertedMapToJdbg = 'Converted MAP file "%s" (%d bytes) to .jdbg (%d bytes)';
RsInsertedJdbg = 'Converted MAP file "%s" (%d bytes) and inserted debug information (%d bytes) into the binary';
RsInsertedJdbg = 'Converted MAP file "%s" (%d bytes) and inserted debug information (%d bytes) into the binary "%s"';
RsDeletedMapFile = 'Deleted %s file "%s"';
RsEFailedToDeleteMapFile = 'Failed to delete %s file "%s"';
RsEMapConversion = 'Failed to convert MAP file "%s"';
14 changes: 14 additions & 0 deletions jcl/experts/common/JclOtaUtils.pas
View file
Original file line number Diff line number Diff line change
@@ -202,6 +202,7 @@ TJclOTAExpertBase = class(TInterfacedObject, IJclOTAOptionsCallback)
var ExecutableFileName: TFileName): Boolean;
function GetDrcFileName(const Project: IOTAProject): TFileName;
function GetMapFileName(const Project: IOTAProject): TFileName;
function GetTargetFileName(const Project: IOTAProject): TFileName;
function GetOutputDirectory(const Project: IOTAProject): string;
function IsInstalledPackage(const Project: IOTAProject): Boolean;
function IsPackage(const Project: IOTAProject): Boolean;
@@ -1177,6 +1178,19 @@ function TJclOTAExpertBase.GetDrcFileName(const Project: IOTAProject): TFileName
Result := ChangeFileExt(Project.FileName, CompilerExtensionDRC);
end;

function TJclOTAExpertBase.GetTargetFileName(const Project: IOTAProject): TFileName;
begin
if not Assigned(Project) then
raise EJclExpertException.CreateRes(@RsENoActiveProject);
if not Assigned(Project.ProjectOptions) then
raise EJclExpertException.CreateRes(@RsENoProjectOptions);
{$IFDEF BDS2_UP}
Result := Project.ProjectOptions.TargetName;
{$ELSE ~BDS2_UP}
Result := '';
{$ENDIF ~BDS2_UP}
end;

function TJclOTAExpertBase.GetMapFileName(const Project: IOTAProject): TFileName;
var
ProjectFileName: TFileName;
8 changes: 6 additions & 2 deletions jcl/experts/debug/converter/JclDebugIdeImpl.pas
View file
Original file line number Diff line number Diff line change
@@ -360,15 +360,19 @@ procedure TJclDebugExtension.AfterCompile(const Project: IOTAProject; Succeeded:
// insertion of JEDI Debug Information into the binary
if Succ and (deInsertJdbg in EnabledActions) then
begin
Succ := FindExecutableName(MapFileName, OutputDirectory, ExecutableFileName);
ExecutableFileName := GetTargetFileName(Project);
Succ := ExecutableFileName <> '';
if not Succ then
Succ := FindExecutableName(MapFileName, OutputDirectory, ExecutableFileName);
if Succ then
begin
Succ := InsertDebugDataIntoExecutableFile(ExecutableFileName, MapFileName,
LinkerBugUnit, MapFileSize, JclDebugDataSize, LineNumberErrors);
if Succ then
begin
if not FQuiet then
OutputToolMessage(Format(LoadResString(@RsInsertedJdbg), [MapFileName, MapFileSize, JclDebugDataSize]));
OutputToolMessage(Format(LoadResString(@RsInsertedJdbg),
[MapFileName, MapFileSize, JclDebugDataSize, ExecutableFileName]));
end
else
OutputToolMessage(Format(LoadResString(@RsEMapInsertion), [MapFileName]));
3 changes: 3 additions & 0 deletions jcl/source/vcl/JclOpenDialogFavorites.pas
View file
Original file line number Diff line number Diff line change
@@ -346,6 +346,8 @@ procedure TJclOpenDialogFavoritesHook.FileDialogCreate(
//CheckOSError(FileDialogCustomize.EndVisualGroup);
CheckOSError(FileDialogCustomize.MakeProminent(CTRLID_COMBOBOX));
CheckOSError(AFileDialog.Advise(Self, Unused));

DoShow;
end;

procedure TJclOpenDialogFavoritesHook.FileDialogCleanCombobox(
@@ -422,6 +424,7 @@ function TJclOpenDialogFavoritesHook.OnControlActivating(

function TJclOpenDialogFavoritesHook.OnFileOk(const pfd: IFileDialog): HResult;
begin
DoClose;
Result := S_OK;
end;