paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-29 02:10:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: improved package system localization

Browse Source 
git-svn-id: trunk@28298 -
This commit is contained in:
maxim 2010-11-17 22:29:49 +00:00
parent 91609df4dc
commit 628a896c36
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/lazarusidestrconsts.pas
View File

@ -3676,6 +3676,14 @@ resourcestring
lisPkgMangUnableToCreateTargetDirectoryForLazarus = 'Unable to create '
+'target directory for lazarus:%s%s%s%s.%sThis directory is needed for '
+'the new changed lazarus IDE with your custom packages.';
lisPkgMangCompilingPackage = 'Compiling package %s';
lisPkgMangErrorUpdatingPoFilesFailedForPackage = 'Error: updating po files '
+'failed for package %s';
lisIDEInfoErrorRunningCompileAfterToolFailedForPackage = 'Error: running ''co'
+'mpile after'' tool failed for package %s';
lisIDEInfoCreatingMakefileForPackage = 'Creating Makefile for package %s';
lisIDEInfoWARNINGUnitNameInvalidPackage = 'WARNING: unit name invalid %s, '
+'package=%s';
// package system
lisPkgSysInvalidUnitname = 'Invalid Unitname: %s';

17
packager/packagesystem.pas
View File

@ -3221,7 +3221,7 @@ begin
PkgCompileTool:=TIDEExternalToolOptions.Create;
try
PkgCompileTool.Title:='Compiling package '+APackage.IDAsString;
PkgCompileTool.Title:=Format(lisPkgMangCompilingPackage, [APackage.IDAsString]);
PkgCompileTool.ScanOutputForFPCMessages:=true;
PkgCompileTool.ScanOutputForMakeMessages:=true;
PkgCompileTool.WorkingDirectory:=APackage.Directory;
@ -3254,7 +3254,9 @@ begin
if (APackage.POOutputDirectory<>'') then begin
Result:=ConvertPackageRSTFiles(APackage);
if Result<>mrOk then begin
IDEMessagesWindow.AddMsg('Error: updating po files failed for package '+APackage.IDAsString,APackage.Directory,-1);
IDEMessagesWindow.AddMsg(Format(
lisPkgMangErrorUpdatingPoFilesFailedForPackage, [APackage.IDAsString
]), APackage.Directory, -1);
DebugLn('TLazPackageGraph.CompilePackage ConvertPackageRSTFiles failed: ',APackage.IDAsString);
exit;
end;
@ -3265,7 +3267,9 @@ begin
Result:=APackage.CompilerOptions.ExecuteAfter.Execute(
APackage.Directory,'Executing command after');
if Result<>mrOk then begin
IDEMessagesWindow.AddMsg('Error: running ''compile after'' tool failed for package '+APackage.IDAsString,APackage.Directory,-1);
IDEMessagesWindow.AddMsg(Format(
lisIDEInfoErrorRunningCompileAfterToolFailedForPackage, [APackage.
IDAsString]), APackage.Directory, -1);
DebugLn(['TLazPackageGraph.CompilePackage ExecuteAfter failed: ',APackage.IDAsString]);
exit;
end;
@ -3582,7 +3586,8 @@ begin
// call fpcmake to create the Makefile
FPCMakeTool:=TIDEExternalToolOptions.Create;
try
FPCMakeTool.Title:='Creating Makefile for package '+APackage.IDAsString;
FPCMakeTool.Title:=Format(lisIDEInfoCreatingMakefileForPackage, [APackage.
IDAsString]);
FPCMakeTool.WorkingDirectory:=APackage.Directory;
FPCMakeTool.Filename:=FindFPCTool('fpcmake'+GetExecutableExt,
EnvironmentOptions.CompilerFilename);
@ -3842,8 +3847,8 @@ begin
' RegisterUnit('''+CurUnitName+''',@'+CurUnitName+'.Register);'+e;
end;
end else begin
AddMessage('WARNING: unit name invalid '+CurFile.Filename
+', package='+APackage.IDAsString,
AddMessage(Format(lisIDEInfoWARNINGUnitNameInvalidPackage, [CurFile.
Filename, APackage.IDAsString]),
APackage.Directory);
end;
end;