paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 11:49:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix use of exeext from wrong unit

Browse Source 
git-svn-id: trunk@26750 -
This commit is contained in:
michael 2014-02-11 14:43:35 +00:00
parent 42db0408cc
commit ff985ba97d
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/fppkg/src/pkgfphttp.pp
View File

@ -23,6 +23,7 @@ begin
With TFPHTTPClient.Create(Nil) do With TFPHTTPClient.Create(Nil) do
try try
Get(URL,Dest); Get(URL,Dest);
Dest.Position:=0;
finally finally
Free; Free;
end; end;

29
packages/fppkg/src/pkgoptions.pp
View File

@ -16,7 +16,8 @@ unit pkgoptions;
interface interface
uses Classes, Sysutils, Inifiles, fprepos, fpTemplate, pkgglobals, fpmkunit; // pkgglobals must be AFTER fpmkunit
uses Classes, Sysutils, Inifiles, fprepos, fpTemplate, fpmkunit, pkgglobals;
Const Const
UnitConfigFileName = 'fpunits.cfg'; UnitConfigFileName = 'fpunits.cfg';
@ -339,9 +340,9 @@ begin
FLocalRepository:=AValue; FLocalRepository:=AValue;
UpdateLocalRepositoryOption; UpdateLocalRepositoryOption;
end; end;
4 : FBuildDir:=FixPath(AValue, True); 4 : FBuildDir:=fpmkunit.FixPath(AValue, True);
5 : FArchivesDir:=FixPath(AValue, True); 5 : FArchivesDir:=fpmkunit.FixPath(AValue, True);
6 : FCompilerConfigDir:=FixPath(AValue, True); 6 : FCompilerConfigDir:=fpmkunit.FixPath(AValue, True);
8 : FDefaultCompilerConfig:=AValue; 8 : FDefaultCompilerConfig:=AValue;
9 : FFPMakeCompilerConfig:=AValue; 9 : FFPMakeCompilerConfig:=AValue;
10 : FDownloader:=AValue; 10 : FDownloader:=AValue;
@ -459,9 +460,9 @@ begin
FRemoteRepository:=ReadString(SDefaults,KeyRemoteRepository,FRemoteRepository); FRemoteRepository:=ReadString(SDefaults,KeyRemoteRepository,FRemoteRepository);
FLocalRepository:=ReadString(SDefaults,KeyLocalRepository,FLocalRepository); FLocalRepository:=ReadString(SDefaults,KeyLocalRepository,FLocalRepository);
UpdateLocalRepositoryOption; UpdateLocalRepositoryOption;
FBuildDir:=FixPath(ReadString(SDefaults,KeyBuildDir,FBuildDir), True); FBuildDir:=fpmkunit.FixPath(ReadString(SDefaults,KeyBuildDir,FBuildDir), True);
FArchivesDir:=FixPath(ReadString(SDefaults,KeyArchivesDir,FArchivesDir), True); FArchivesDir:=fpmkunit.FixPath(ReadString(SDefaults,KeyArchivesDir,FArchivesDir), True);
FCompilerConfigDir:=FixPath(ReadString(SDefaults,KeyCompilerConfigDir,FCompilerConfigDir), True); FCompilerConfigDir:=fpmkunit.FixPath(ReadString(SDefaults,KeyCompilerConfigDir,FCompilerConfigDir), True);
FDefaultCompilerConfig:=ReadString(SDefaults,KeyCompilerConfig,FDefaultCompilerConfig); FDefaultCompilerConfig:=ReadString(SDefaults,KeyCompilerConfig,FDefaultCompilerConfig);
FFPMakeCompilerConfig:=ReadString(SDefaults,KeyFPMakeCompilerConfig,FFPMakeCompilerConfig); FFPMakeCompilerConfig:=ReadString(SDefaults,KeyFPMakeCompilerConfig,FFPMakeCompilerConfig);
FDownloader:=ReadString(SDefaults,KeyDownloader,FDownloader); FDownloader:=ReadString(SDefaults,KeyDownloader,FDownloader);
@ -552,8 +553,8 @@ begin
3 : Result:=FCompilerVersion; 3 : Result:=FCompilerVersion;
4 : Result:=FOptionParser.ParseString(FGlobalInstallDir); 4 : Result:=FOptionParser.ParseString(FGlobalInstallDir);
5 : Result:=FOptionParser.ParseString(FLocalInstallDir); 5 : Result:=FOptionParser.ParseString(FLocalInstallDir);
6 : Result:=FixPath(FOptionParser.ParseString(FGlobalPrefix), True); 6 : Result:=fpmkunit.FixPath(FOptionParser.ParseString(FGlobalPrefix), True);
7 : Result:=FixPath(FOptionParser.ParseString(FLocalPrefix), True); 7 : Result:=fpmkunit.FixPath(FOptionParser.ParseString(FLocalPrefix), True);
else else
Error('Unknown option'); Error('Unknown option');
end; end;
@ -581,8 +582,8 @@ begin
FCompilerVersion:=AValue; FCompilerVersion:=AValue;
FOptionParser.Values['CompilerVersion'] := FCompilerVersion; FOptionParser.Values['CompilerVersion'] := FCompilerVersion;
end; end;
4 : FGlobalInstallDir:=FixPath(AValue, True); 4 : FGlobalInstallDir:=fpmkunit.FixPath(AValue, True);
5 : FLocalInstallDir:=FixPath(AValue, True); 5 : FLocalInstallDir:=fpmkunit.FixPath(AValue, True);
6 : begin 6 : begin
FGlobalPrefix:=AValue; FGlobalPrefix:=AValue;
FOptionParser.Values['GlobalPrefix'] := GlobalPrefix; FOptionParser.Values['GlobalPrefix'] := GlobalPrefix;
@ -714,7 +715,7 @@ begin
log(llDebug,SLogDetectedPrefix,['local',FLocalPrefix]); log(llDebug,SLogDetectedPrefix,['local',FLocalPrefix]);
end; end;
fpcdir:=FixPath(GetEnvironmentVariable('FPCDIR'), True); fpcdir:=fpmkunit.FixPath(GetEnvironmentVariable('FPCDIR'), True);
if fpcdir<>'' then if fpcdir<>'' then
begin begin
{$ifndef Unix} {$ifndef Unix}
@ -745,8 +746,8 @@ begin
end; end;
GlobalPrefix:=ReadString(SDefaults,KeyGlobalPrefix,FGlobalPrefix); GlobalPrefix:=ReadString(SDefaults,KeyGlobalPrefix,FGlobalPrefix);
LocalPrefix:=ReadString(SDefaults,KeyLocalPrefix,FLocalPrefix); LocalPrefix:=ReadString(SDefaults,KeyLocalPrefix,FLocalPrefix);
FGlobalInstallDir:=FixPath(ReadString(SDefaults,KeyGlobalInstallDir,FGlobalInstallDir), True); FGlobalInstallDir:=fpmkunit.FixPath(ReadString(SDefaults,KeyGlobalInstallDir,FGlobalInstallDir), True);
FLocalInstallDir:=FixPath(ReadString(SDefaults,KeyLocalInstallDir,FLocalInstallDir), True); FLocalInstallDir:=fpmkunit.FixPath(ReadString(SDefaults,KeyLocalInstallDir,FLocalInstallDir), True);
FCompiler:=ReadString(SDefaults,KeyCompiler,FCompiler); FCompiler:=ReadString(SDefaults,KeyCompiler,FCompiler);
FCompilerOS:=StringToOS(ReadString(SDefaults,KeyCompilerOS,OSToString(CompilerOS))); FCompilerOS:=StringToOS(ReadString(SDefaults,KeyCompilerOS,OSToString(CompilerOS)));
FCompilerCPU:=StringToCPU(ReadString(SDefaults,KeyCompilerCPU,CPUtoString(CompilerCPU))); FCompilerCPU:=StringToCPU(ReadString(SDefaults,KeyCompilerCPU,CPUtoString(CompilerCPU)));