Packager: localized PkgDir, PkgSrcPath, PkgUnitPath, PkgIncPath macros description and changed their case to be camelcase like other ones.

While at this, fixed several typos in macros names: PkgUnitAth -> PkgUnitPath; PrimaryConfiPath -> PrimaryConfigPath; SecondaryConfiPath -> SecondaryConfigPath

git-svn-id: trunk@30665 -
This commit is contained in:
maxim 2011-05-10 23:34:34 +00:00
parent 2beddc12e2
commit 23c5c73b68
5 changed files with 24 additions and 15 deletions

View File

@ -326,7 +326,7 @@ begin
lisPathOfTheMakeUtility, @MacroFuncMake, []));
GlobalMacroList.Add(TTransferMacro.Create('IDEBuildOptions','',
lisIDEBuildOptions, @MacroFuncIDEBuildOptions, []));
GlobalMacroList.Add(TTransferMacro.Create('PrimaryConfiPath','',
GlobalMacroList.Add(TTransferMacro.Create('PrimaryConfigPath','',
lisPrimaryConfigPath, @MacroFuncPrimaryConfigPath, []));
GlobalMacroList.Add(TTransferMacro.Create('SecondaryConfigPath','',
lisSecondaryConfigPath, @MacroFuncSecondaryConfigPath, []));

View File

@ -833,9 +833,9 @@ begin
Handled:=true;
if CompareText(MacroName,'ENV')=0 then
s:=GetEnvironmentVariableUTF8(MacroName)
else if CompareText(MacroName,'PrimaryConfiPath')=0 then
else if CompareText(MacroName,'PrimaryConfigPath')=0 then
s:=GetPrimaryConfigPath
else if CompareText(MacroName,'SecondaryConfiPath')=0 then
else if CompareText(MacroName,'SecondaryConfigPath')=0 then
s:=GetSecondaryConfigPath
else if CompareText(MacroName,'FPCVer')=0 then begin
if FPCVer<>'' then

View File

@ -143,6 +143,15 @@ resourcestring
lisProjectMacroUnitPath = 'macro ProjectUnitPath';
lisConfigDirectory = 'Lazarus config directory';
lisPkgMacroPackageDirectoryParameterIsPackageID = 'Package directory. '
+'Parameter is package ID';
lisPkgMacroPackageSourceSearchPathParameterIsPackageID = 'Package source '
+'search path. Parameter is package ID';
lisPkgMacroPackageUnitSearchPathParameterIsPackageID = 'Package unit search '
+'path. Parameter is package ID';
lisPkgMacroPackageIncludeFilesSearchPathParameterIsPackageID = 'Package '
+'include files search path. Parameter is package ID';
// main bar menu
lisMenuFile = '&File';
lisMenuEdit = '&Edit';

View File

@ -654,16 +654,16 @@ begin
FItems:=TFPList.Create;
FLazarusBasePackages:=TFPList.Create;
if GlobalMacroList<>nil then begin
GlobalMacroList.Add(TTransferMacro.Create('PKGDIR','',
'package directory. parameter is package id.',@MacroFunctionPkgDir,[]));
GlobalMacroList.Add(TTransferMacro.Create('PKGSRCPATH','',
'package source search path. parameter is package id.',
GlobalMacroList.Add(TTransferMacro.Create('PkgDir','',
lisPkgMacroPackageDirectoryParameterIsPackageID, @MacroFunctionPkgDir, []));
GlobalMacroList.Add(TTransferMacro.Create('PkgSrcPath','',
lisPkgMacroPackageSourceSearchPathParameterIsPackageID,
@MacroFunctionPkgSrcPath,[]));
GlobalMacroList.Add(TTransferMacro.Create('PKGUNITATH','',
'package unit search path. parameter is package id.',
GlobalMacroList.Add(TTransferMacro.Create('PkgUnitPath','',
lisPkgMacroPackageUnitSearchPathParameterIsPackageID,
@MacroFunctionPkgUnitPath,[]));
GlobalMacroList.Add(TTransferMacro.Create('PKGINCPATH','',
'package include files search path. parameter is package id.',
GlobalMacroList.Add(TTransferMacro.Create('PkgIncPath','',
lisPkgMacroPackageIncludeFilesSearchPathParameterIsPackageID,
@MacroFunctionPkgIncPath,[]));
end;
end;

View File

@ -1525,13 +1525,13 @@ begin
// package macros
CodeToolBoss.DefineTree.MacroFunctions.AddExtended(
'PKGDIR',nil,@PackageGraph.MacroFunctionCTPkgDir);
'PkgDir',nil,@PackageGraph.MacroFunctionCTPkgDir);
CodeToolBoss.DefineTree.MacroFunctions.AddExtended(
'PKGSRCPATH',nil,@PackageGraph.MacroFunctionCTPkgSrcPath);
'PkgSrcPath',nil,@PackageGraph.MacroFunctionCTPkgSrcPath);
CodeToolBoss.DefineTree.MacroFunctions.AddExtended(
'PKGUNITPATH',nil,@PackageGraph.MacroFunctionCTPkgUnitPath);
'PkgUnitPath',nil,@PackageGraph.MacroFunctionCTPkgUnitPath);
CodeToolBoss.DefineTree.MacroFunctions.AddExtended(
'PKGINCPATH',nil,@PackageGraph.MacroFunctionCTPkgIncPath);
'PkgIncPath',nil,@PackageGraph.MacroFunctionCTPkgIncPath);
LazPackageDescriptors:=TLazPackageDescriptors.Create;
LazPackageDescriptors.AddDefaultPackageDescriptors;