paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 12:19:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

For now revert the FixPath usage from "is a directory" to "is a path" as at least on Windows it doesn't work as intended. I'll need time to check this correctly (which I don't have today and tomorrow).

Browse Source 
packages/fpmkunit/src/fpmkunit.pp:
  * change all FixPath(..., True) to FixPath(..., False) except those that replaced IncludeTrailingPathDelimiter
packages/fppkg/src/fpmkunitsrc.inc:
  * regenerate

git-svn-id: trunk@23804 -
This commit is contained in:
svenbarth 2013-03-12 14:15:12 +00:00
parent db357320d7
commit 9a26fc6994
2 changed files with 8095 additions and 7951 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/fpmkunit/src/fpmkunit.pp
View File

@ -2862,12 +2862,12 @@ end;
Function TPackage.GetUnitsOutputDir(ACPU:TCPU; AOS : TOS):String;
begin
result:=FixPath(Dictionary.Substitute(FUnitsOutputDir,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]), True);
result:=FixPath(Dictionary.Substitute(FUnitsOutputDir,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]), False);
end;
function TPackage.GetUnitConfigOutputDir(ACPU: TCPU; AOS: TOS): String;
begin
result:=FixPath(Dictionary.Substitute('units'+PathDelim+'$(target)'+PathDelim,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]), True);
result:=FixPath(Dictionary.Substitute('units'+PathDelim+'$(target)'+PathDelim,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]), False);
end;
procedure TPackage.InheritPackageVariantsFromDependency(ADependencyPackage: TPackage);
@ -2911,7 +2911,7 @@ end;
function TPackage.GetPackageUnitInstallDir(ACPU: TCPU; AOS: TOS): String;
begin
result:=FixPath(Dictionary.Substitute(FPackageUnitInstallDir,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]), True);
result:=FixPath(Dictionary.Substitute(FPackageUnitInstallDir,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]), False);
end;
procedure TPackage.SetPackageUnitInstallDir(AValue: string);
@ -3492,7 +3492,7 @@ end;
function TCustomDefaults.GetUnitInstallDir: String;
begin
result := FixPath(GlobalDictionary.ReplaceStrings(FUnitInstallDir), True);
result := FixPath(GlobalDictionary.ReplaceStrings(FUnitInstallDir), False);
end;
@ -3888,7 +3888,7 @@ begin
// Use the same algorithm as the compiler, see options.pas
{$ifdef Unix}
BD:=FixPath(GetEnvironmentVariable('FPCDIR'), True);
BD:=FixPath(GetEnvironmentVariable('FPCDIR'), False);
if BD='' then
begin
BD:='/usr/local/lib/fpc/'+FCompilerVersion;
@ -3897,7 +3897,7 @@ begin
BD:='/usr/lib/fpc/'+FCompilerVersion;
end;
{$else unix}
BD:=FixPath(GetEnvironmentVariable('FPCDIR'), True);
BD:=FixPath(GetEnvironmentVariable('FPCDIR'), False);
if BD='' then
begin
BD:=ExtractFilePath(FCompiler)+'..';

16034
packages/fppkg/src/fpmkunitsrc.inc
View File

File diff suppressed because it is too large Load Diff