paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 13:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Do not use a prefix on non-unices within archives (zipinstall)

Browse Source 
* Resolved more problems with case-sensitive TStrings on some targets (go32v2)

git-svn-id: trunk@28933 -
This commit is contained in:
joost 2014-10-26 17:35:56 +00:00
parent 1c6bc92ce4
commit cda66fd328
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2257,7 +2257,7 @@ begin
end; end;
end; end;
if AIsDir and (Result <> '') then if AIsDir and (Result <> '') then
Result := IncludeTrailingPathDelimiter(Result);; Result := IncludeTrailingPathDelimiter(Result);
end; end;
function IsRelativePath(const APath: String): boolean; function IsRelativePath(const APath: String): boolean;
@ -3968,7 +3968,7 @@ begin
FNoFPCCfg:=False; FNoFPCCfg:=False;
FCPU:=cpuNone; FCPU:=cpuNone;
FOS:=osNone; FOS:=osNone;
FUnitInstallDir:='$(BaseInstallDir)units/$(target)/$(packagename)'; FUnitInstallDir:='$(baseinstalldir)units/$(target)/$(packagename)';
FBuildMode:=bmOneByOne; FBuildMode:=bmOneByOne;
FThreadsAmount:=-1; FThreadsAmount:=-1;
end; end;
@ -4237,7 +4237,7 @@ begin
FPackageVariants := TFPList.Create; FPackageVariants := TFPList.Create;
GlobalDictionary:=DictionaryClass.Create(Nil); GlobalDictionary:=DictionaryClass.Create(Nil);
AnalyzeOptions; AnalyzeOptions;
GlobalDictionary.AddVariable('BaseInstallDir',Defaults.BaseInstallDir); GlobalDictionary.AddVariable('baseinstalldir',Defaults.BaseInstallDir);
GlobalDictionary.AddVariable('bininstalldir',Defaults.BinInstallDir); GlobalDictionary.AddVariable('bininstalldir',Defaults.BinInstallDir);
GlobalDictionary.AddVariable('Target',Defaults.Target); GlobalDictionary.AddVariable('Target',Defaults.Target);
GlobalDictionary.AddVariable('BuildString',Defaults.BuildString); GlobalDictionary.AddVariable('BuildString',Defaults.BuildString);
@ -7103,7 +7103,10 @@ begin
If Assigned(BeforeInstall) then If Assigned(BeforeInstall) then
BeforeInstall(Self); BeforeInstall(Self);
Defaults.IntSetBaseInstallDir('lib/fpc/' + Defaults.FCompilerVersion+ '/'); if Defaults.UnixPaths then
Defaults.IntSetBaseInstallDir('lib/fpc/' + Defaults.FCompilerVersion+ '/')
else
Defaults.IntSetBaseInstallDir('');
try try
For I:=0 to Packages.Count-1 do For I:=0 to Packages.Count-1 do