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

* Fixed the user-repository path on Windows

Browse Source 
git-svn-id: trunk@41197 -
This commit is contained in:
joost 2019-02-03 20:08:21 +00:00
parent 1d7ff66602
commit 5341f6fc7a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/fpcmkcfg/fpcmkcfg.pp
View File

@ -166,6 +166,14 @@ begin
result := '#DEFINE NEEDCROSSBINUTILS'; result := '#DEFINE NEEDCROSSBINUTILS';
end; end;
function GetDefaultUserPathSuffix: string;
begin
if not (StringToOS(BuildOSTarget) in AllWindowsOSes) then
Result := 'lib/fpc/{CompilerVersion}'
else
Result := '';
end;
function GetDefaultGCCDir: string; function GetDefaultGCCDir: string;
var var
@ -276,6 +284,7 @@ begin
TemplateParser.Values['COMPILERCONFIGDIR'] := GetDefaultCompilerConfigDir; TemplateParser.Values['COMPILERCONFIGDIR'] := GetDefaultCompilerConfigDir;
TemplateParser.Values['NEEDCROSSBINUTILSIFDEF'] := GetDefaultNeedCrossBinutilsIfdef; TemplateParser.Values['NEEDCROSSBINUTILSIFDEF'] := GetDefaultNeedCrossBinutilsIfdef;
TemplateParser.Values['GCCLIBPATH'] := GetDefaultGCCDIR; TemplateParser.Values['GCCLIBPATH'] := GetDefaultGCCDIR;
TemplateParser.Values['USERPATHSUFFIX'] := GetDefaultUserPathSuffix;
Cfg:=TStringList.Create; Cfg:=TStringList.Create;
Cfg.Text:=StrPas(Addr(DefaultConfig[0][1])); Cfg.Text:=StrPas(Addr(DefaultConfig[0][1]));

4
utils/fpcmkcfg/fppkg.cfg
View File

@ -18,10 +18,10 @@ Path=%GlobalPath%
Prefix=%GlobalPrefix% Prefix=%GlobalPrefix%
[IncludeFiles] [IncludeFiles]
FileMask=%CompilerConfigDir%/conf.d/*.conf FileMask=%CompilerConfigDir%conf.d/*.conf
[Repository] [Repository]
Name=user Name=user
Description=User-installed packages Description=User-installed packages
Path={LocalRepository}lib/fpc/{CompilerVersion}/ Path={LocalRepository}%UserPathSuffix%
Prefix={LocalRepository} Prefix={LocalRepository}

4
utils/fpcmkcfg/fppkg.inc
View File

@ -24,11 +24,11 @@ const fppkg : array[0..2,1..240] of char=(
'Prefix=%GlobalP','refix%'#010+ 'Prefix=%GlobalP','refix%'#010+
#010+ #010+
'[IncludeFiles]'#010+ '[IncludeFiles]'#010+
'FileMask=%CompilerConfigDir%/conf.d/*.conf'#010+ 'FileMask=%CompilerConfigDir%conf.d/*.conf'#010+
#010+ #010+
'[Repository]'#010+ '[Repository]'#010+
'Name=user'#010+ 'Name=user'#010+
'Description=User-installed packages'#010+ 'Description=User-installed packages'#010+
'Path={LocalRepository}lib/fpc/{CompilerVersion}/'#010+ 'Path={LocalRepository}%UserPathSuffix%'#010+
'Prefix={LocalRepository}'#010 'Prefix={LocalRepository}'#010
); );