Skip to content

Improve support for relative paths #39

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve support for relative paths #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 27 additions & 4 deletions Classes/Chet.HeaderTranslator.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ TVarDeclInfo = record
constructor Create(const AProject: TProject);
destructor Destroy; override;

function GetExpandedHeaderFileDirectory: String;
function GetExpandedTargetPasFile: String;

{ Runs the header translator. }
procedure Run;

Expand Down Expand Up @@ -352,6 +355,26 @@ constructor THeaderTranslator.Create(const AProject: TProject);
SetupSymbolsToIgnore;
end;

function THeaderTranslator.GetExpandedHeaderFileDirectory: String;
begin
if TPath.IsRelativePath(FProject.HeaderFileDirectory) then
Result := TPath.Combine(TPath.GetDirectoryName(FProject.ProjectFilename), FProject.HeaderFileDirectory)
else
Result := FProject.HeaderFileDirectory;

Result := ExpandUNCFileName(IncludeTrailingPathDelimiter(Result));
end;

function THeaderTranslator.GetExpandedTargetPasFile: String;
begin
if TPath.IsRelativePath(FProject.TargetPasFile) then
Result := TPath.Combine(TPath.GetDirectoryName(FProject.ProjectFilename), FProject.TargetPasFile)
else
Result := FProject.TargetPasFile;

Result := ExpandUNCFileName(Result);
end;

procedure THeaderTranslator.CreateCombinedHeaderFile;
var
Option: TSearchOption;
Expand All @@ -365,7 +388,7 @@ procedure THeaderTranslator.CreateCombinedHeaderFile;
else
Option := TSearchOption.soTopDirectoryOnly;

HeaderPath := IncludeTrailingPathDelimiter(FProject.HeaderFileDirectory);
HeaderPath := GetExpandedHeaderFileDirectory;
IgnoredFiles := FProject.IgnoredFiles.Split([','], '"', '"', TStringSplitOptions.ExcludeEmpty);

if (Length(IgnoredFiles) = 0) then
Expand All @@ -386,7 +409,7 @@ procedure THeaderTranslator.CreateCombinedHeaderFile;
end);

if (Length(HeaderFiles) = 0) then
raise EHeaderTranslatorError.CreateFmt('No C header files found in directory "%s".', [FProject.HeaderFileDirectory]);
raise EHeaderTranslatorError.CreateFmt('No C header files found in directory "%s".', [GetExpandedHeaderFileDirectory]);

Writer := TStreamWriter.Create(FCombinedHeaderFilename);
try
Expand Down Expand Up @@ -738,7 +761,7 @@ function THeaderTranslator.ParseCombinedHeaderFile: Boolean;
Args := Args + ['-fparse-all-comments'];
end;

Args := Args + ['-I' + FProject.HeaderFileDirectory];
Args := Args + ['-I' + GetExpandedHeaderFileDirectory];

FTranslationUnit := FIndex.ParseTranslationUnit(FCombinedHeaderFilename,
Args, [], Options);
Expand Down Expand Up @@ -846,7 +869,7 @@ procedure THeaderTranslator.Run;
AnalyzeTypes;

FCommentWriter := nil;
FWriter := TSourceWriter.Create(FProject.TargetPasFile);
FWriter := TSourceWriter.Create(GetExpandedTargetPasFile);
try
CreateCommentWriter;
FWriter.WriteLn('unit %s;', [TPath.GetFileNameWithoutExtension(FProject.TargetPasFile)]);
Expand Down
85 changes: 43 additions & 42 deletions Forms/Form.Main.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,58 +304,59 @@ procedure TFormMain.ActionRunTranslatorExecute(Sender: TObject);
P: TPlatform;
PlatformCount: Integer;
begin
if (FProject.HeaderFileDirectory <> '') and (not TDirectory.Exists(FProject.HeaderFileDirectory)) then
begin
ConfigError('Header file directory does not exist', EditHeaderFileDirectory);
Exit;
end;
Translator := THeaderTranslator.Create(FProject);
try
if not TDirectory.Exists(Translator.GetExpandedHeaderFileDirectory) then
begin
ConfigError('Header file directory does not exist', EditHeaderFileDirectory);
Exit;
end;

if (FProject.TargetPasFile = '') then
begin
ConfigError('Target Pascal file not provided', EditPasFile);
Exit;
end;
if (FProject.TargetPasFile = '') then
begin
ConfigError('Target Pascal file not provided', EditPasFile);
Exit;
end;

Directory := TPath.GetDirectoryName(FProject.TargetPasFile);
if (Directory <> '') and (not TDirectory.Exists(Directory)) then
begin
ConfigError('Directory for target Pascal file does not exist', EditPasFile);
Exit;
end;
Directory := TPath.GetDirectoryName(Translator.GetExpandedTargetPasFile);
if not TDirectory.Exists(Directory) then
begin
ConfigError('Directory for target Pascal file does not exist', EditPasFile);
Exit;
end;

if (FProject.LibraryConstant = '') then
begin
ConfigError('Library constant not specified', EditLibConstant);
Exit;
end;
if (FProject.LibraryConstant = '') then
begin
ConfigError('Library constant not specified', EditLibConstant);
Exit;
end;

PlatformCount := 0;
for PT := Low(TPlatformType) to High(TPlatformType) do
begin
P := FProject.Platforms[PT];
if (P.Enabled) then
PlatformCount := 0;
for PT := Low(TPlatformType) to High(TPlatformType) do
begin
if (P.LibraryName = '') then
P := FProject.Platforms[PT];
if (P.Enabled) then
begin
ConfigError('Library name for platform not specified', FPlatformLibraryName[PT]);
Exit;
if (P.LibraryName = '') then
begin
ConfigError('Library name for platform not specified', FPlatformLibraryName[PT]);
Exit;
end;
Inc(PlatformCount);
end;
Inc(PlatformCount);
end;
end;

if (PlatformCount = 0) then
begin
ConfigError('At least 1 platform must be enabled', CheckBoxWin32);
Exit;
end;
if (PlatformCount = 0) then
begin
ConfigError('At least 1 platform must be enabled', CheckBoxWin32);
Exit;
end;

CardPanel.ActiveCard := CardTranslate;
ButtonGroupCategories.ItemIndex := CardTranslate.CardIndex;
MemoMessages.Clear;
Application.ProcessMessages; // Ugh

CardPanel.ActiveCard := CardTranslate;
ButtonGroupCategories.ItemIndex := CardTranslate.CardIndex;
MemoMessages.Clear;
Application.ProcessMessages; // Ugh
Translator := THeaderTranslator.Create(FProject);
try
Translator.OnMessage := HandleTranslatorMessage;
Translator.Run;
TFilePostProcessor.Execute(FProject, ScriptMemo.Lines);
Expand Down