mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-23 05:19:31 +02:00
IDE: Allow adding a package dependency with dotted name to a project. Issue #30467.
git-svn-id: trunk@52833 -
This commit is contained in:
parent
3eb143d1bc
commit
fcc2649c3b
@ -184,14 +184,8 @@ begin
|
||||
exit;
|
||||
end;
|
||||
|
||||
// check packagename
|
||||
if not IsValidIdent(NewPkgName) then begin
|
||||
IDEMessageDialog(lisProjAddInvalidPackagename,
|
||||
Format(lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag,
|
||||
[NewPkgName, LineEnding]),
|
||||
mtError,[mbCancel]);
|
||||
exit;
|
||||
end;
|
||||
// package name is checked earlier
|
||||
Assert(IsValidPkgName(NewPkgName), 'CheckAddingDependency: ' + NewPkgName + ' is not valid.');
|
||||
|
||||
// check if package is already required
|
||||
if LazProject.FindDependencyByName(NewPkgName)<>nil then begin
|
||||
|
@ -3857,9 +3857,6 @@ resourcestring
|
||||
lisProjAddInvalidMinMaxVersion = 'Invalid Min-Max version';
|
||||
lisProjAddTheMaximumVersionIsLowerThanTheMinimimVersion = 'The Maximum '
|
||||
+'Version is lower than the Minimim Version.';
|
||||
lisProjAddInvalidPackagename = 'Invalid packagename';
|
||||
lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag = 'The package '
|
||||
+'name "%s" is invalid.%sPlase choose an existing package.';
|
||||
lisProjAddDependencyAlreadyExists = 'Dependency already exists';
|
||||
lisVersionMismatch = 'Version mismatch';
|
||||
lisUnableToAddTheDependencyBecauseThePackageHasAlread = 'Unable to add the '
|
||||
@ -4363,8 +4360,6 @@ resourcestring
|
||||
+'%sIt is a bad idea to share files between projects and packages.';
|
||||
lisA2PTheMaximumVersionIsLowerThanTheMinimimVersion = 'The Maximum Version '
|
||||
+'is lower than the Minimim Version.';
|
||||
lisA2PThePackageNameIsInvalidPleaseChooseAnExisting = 'The package name "%s" '
|
||||
+'is invalid.%sPlease choose an existing package.';
|
||||
lisA2PThePackageHasAlreadyADependencyForThe = 'The package already has a '
|
||||
+'dependency on the package "%s".';
|
||||
lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting = 'No package found '
|
||||
|
@ -381,14 +381,8 @@ begin
|
||||
exit(mrCancel);
|
||||
end;
|
||||
|
||||
// check packagename
|
||||
if not IsValidPkgName(NewPkgName) then begin
|
||||
if not Quiet then
|
||||
IDEMessageDialog(lisProjAddInvalidPackagename,
|
||||
Format(lisA2PThePackageNameIsInvalidPleaseChooseAnExisting,[NewPkgName,LineEnding]),
|
||||
mtError,[mbCancel]);
|
||||
exit(mrCancel);
|
||||
end;
|
||||
// package name is checked earlier
|
||||
Assert(IsValidPkgName(NewPkgName), 'CheckAddingDependency: ' + NewPkgName + ' is not valid.');
|
||||
|
||||
// check if package is already required
|
||||
if (CompareText(NewPkgName,LazPackage.Name)=0)
|
||||
|
Loading…
Reference in New Issue
Block a user