mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-18 21:09:07 +02:00
--- Merging r45410 into '.':
U compiler/scandir.pas A tests/webtbs/tw37095.pp A tests/webtbs/tw37095d A tests/webtbs/tw37095d/uw37095.pp --- Recording mergeinfo for merge of r45410 into '.': U . # revisions: 45410 r45410 | jonas | 2020-05-17 23:27:00 +0200 (Sun, 17 May 2020) | 2 lines Changed paths: M /trunk/compiler/scandir.pas A /trunk/tests/webtbs/tw37095.pp A /trunk/tests/webtbs/tw37095d A /trunk/tests/webtbs/tw37095d/uw37095.pp * fixed unitdir directive for relative paths in case the current module's path is not set, broken by r43312 (mantis #37095) git-svn-id: branches/fixes_3_2@45412 -
This commit is contained in:
parent
95217ad437
commit
921fb2f4ec
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -17629,6 +17629,8 @@ tests/webtbs/tw3695.pp svneol=native#text/plain
|
|||||||
tests/webtbs/tw3697.pp svneol=native#text/plain
|
tests/webtbs/tw3697.pp svneol=native#text/plain
|
||||||
tests/webtbs/tw3700.pp svneol=native#text/plain
|
tests/webtbs/tw3700.pp svneol=native#text/plain
|
||||||
tests/webtbs/tw3708.pp svneol=native#text/plain
|
tests/webtbs/tw3708.pp svneol=native#text/plain
|
||||||
|
tests/webtbs/tw37095.pp svneol=native#text/plain
|
||||||
|
tests/webtbs/tw37095d/uw37095.pp svneol=native#text/plain
|
||||||
tests/webtbs/tw3719.pp svneol=native#text/plain
|
tests/webtbs/tw3719.pp svneol=native#text/plain
|
||||||
tests/webtbs/tw3721.pp svneol=native#text/plain
|
tests/webtbs/tw3721.pp svneol=native#text/plain
|
||||||
tests/webtbs/tw3742.pp svneol=native#text/plain
|
tests/webtbs/tw3742.pp svneol=native#text/plain
|
||||||
|
@ -1486,15 +1486,19 @@ unit scandir;
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
procedure dir_unitpath;
|
procedure dir_unitpath;
|
||||||
|
var
|
||||||
|
unitpath: TPathStr;
|
||||||
begin
|
begin
|
||||||
if not current_module.in_global then
|
if not current_module.in_global then
|
||||||
Message(scan_w_switch_is_global)
|
Message(scan_w_switch_is_global)
|
||||||
else
|
else
|
||||||
with current_scanner,current_module,localunitsearchpath do
|
begin
|
||||||
begin
|
current_scanner.skipspace;
|
||||||
skipspace;
|
unitpath:=current_scanner.readcomment;
|
||||||
AddPath(path+source_info.DirSep+readcomment,false);
|
if current_module.path<>'' then
|
||||||
end;
|
unitpath:=current_module.path+source_info.DirSep+unitpath;
|
||||||
|
current_module.localunitsearchpath.AddPath(unitpath,false);
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure dir_varparacopyoutcheck;
|
procedure dir_varparacopyoutcheck;
|
||||||
|
10
tests/webtbs/tw37095.pp
Normal file
10
tests/webtbs/tw37095.pp
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{ %norun }
|
||||||
|
{ %recompile }
|
||||||
|
|
||||||
|
program test;
|
||||||
|
{$UNITPATH tw37095d}
|
||||||
|
uses uw37095;
|
||||||
|
begin
|
||||||
|
writeln('Say hello, unit!');
|
||||||
|
UnitHello;
|
||||||
|
end.
|
10
tests/webtbs/tw37095d/uw37095.pp
Normal file
10
tests/webtbs/tw37095d/uw37095.pp
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
unit uw37095;
|
||||||
|
interface
|
||||||
|
procedure UnitHello;
|
||||||
|
implementation
|
||||||
|
procedure UnitHello;
|
||||||
|
begin
|
||||||
|
writeln('"Hello, unit."');
|
||||||
|
end;
|
||||||
|
begin
|
||||||
|
end.
|
Loading…
Reference in New Issue
Block a user