paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 01:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

added some fpc src paths and changed auto create project for program a Yes/No question

Browse Source 
git-svn-id: trunk@6246 -
This commit is contained in:
mattias 2004-11-15 12:25:00 +00:00
parent 95d4e404bd
commit 2e189ec448
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/codetools/codetoolsstrconsts.pas
View File

@ -183,6 +183,7 @@ ResourceString
ctsIncludeDirectoriesPlusDirs = 'include directories: %s'; ctsIncludeDirectoriesPlusDirs = 'include directories: %s';
ctsPackageDirectories = 'Package directories'; ctsPackageDirectories = 'Package directories';
ctsUtilsDirectories = 'Utils directories'; ctsUtilsDirectories = 'Utils directories';
ctsInstallerDirectories = 'Installer directories';
ctsDefsForLazarusSources = 'Definitions for the Lazarus Sources'; ctsDefsForLazarusSources = 'Definitions for the Lazarus Sources';
ctsAddsDirToSourcePath = 'adds %s to SrcPath'; ctsAddsDirToSourcePath = 'adds %s to SrcPath';
ctsSetsIncPathTo = 'sets IncPath to %s'; ctsSetsIncPathTo = 'sets IncPath to %s';

14
components/codetools/definetemplates.pas
View File

@ -3194,6 +3194,7 @@ var
FCLDBDir: TDefineTemplate; FCLDBDir: TDefineTemplate;
FCLDBInterbaseDir: TDefineTemplate; FCLDBInterbaseDir: TDefineTemplate;
SrcPathMacro: String; SrcPathMacro: String;
InstallerDir: TDefineTemplate;
begin begin
{$IFDEF VerboseFPCSrcScan} {$IFDEF VerboseFPCSrcScan}
DebugLn('CreateFPCSrcTemplate ',FPCSrcDir,': length(UnitSearchPath)=',DbgS(length(UnitSearchPath)),' Valid=',DbgS(UnitLinkListValid),' PPUExt=',PPUExt); DebugLn('CreateFPCSrcTemplate ',FPCSrcDir,': length(UnitSearchPath)=',DbgS(length(UnitSearchPath)),' Valid=',DbgS(UnitLinkListValid),' PPUExt=',PPUExt);
@ -3243,8 +3244,11 @@ begin
// compiler // compiler
CompilerDir:=TDefineTemplate.Create('Compiler',ctsCompiler,'','compiler', CompilerDir:=TDefineTemplate.Create('Compiler',ctsCompiler,'','compiler',
da_Directory); da_Directory);
MainDir.AddChild(CompilerDir);
AddProcessorTypeDefine(CompilerDir); AddProcessorTypeDefine(CompilerDir);
CompilerDir.AddChild(TDefineTemplate.Create('SrcPath','SrcPath addition',
ExternalMacroStart+'SrcPath',
SrcPathMacro+';'+Dir+TargetProcessor,da_Define));
MainDir.AddChild(CompilerDir);
// rtl // rtl
RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory); RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory);
@ -3345,6 +3349,14 @@ begin
Format(ctsAddsDirToSourcePath,['..']),ExternalMacroStart+'SrcPath', Format(ctsAddsDirToSourcePath,['..']),ExternalMacroStart+'SrcPath',
'..;'+ExternalMacroStart+'SrcPath',da_DefineRecurse)); '..;'+ExternalMacroStart+'SrcPath',da_DefineRecurse));
// packages
InstallerDir:=TDefineTemplate.Create('Installer',ctsInstallerDirectories,'',
'installer',da_Directory);
InstallerDir.AddChild(TDefineTemplate.Create('SrcPath','SrcPath addition',
ExternalMacroStart+'SrcPath',
SrcPathMacro+';'+Dir+'ide;'+Dir+'fv',da_Define));
MainDir.AddChild(InstallerDir);
// clean up // clean up
if UnitTree<>nil then begin if UnitTree<>nil then begin
UnitTree.FreeAndClear; UnitTree.FreeAndClear;

2
ide/lazarusidestrconsts.pas
View File

@ -334,7 +334,7 @@ resourcestring
lisProjectInfoFileDetected = 'Project info file detected'; lisProjectInfoFileDetected = 'Project info file detected';
lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file %s%s%s%sseems to ' lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file %s%s%s%sseems to '
+'be a program. Close current project and create a new lazarus project ' +'be a program. Close current project and create a new lazarus project '
+'for this program?%sCancel will load the file as normal source.'; +'for this program?%s"No" will load the file as normal source.';
lisProgramDetected = 'Program detected'; lisProgramDetected = 'Program detected';
lisUnableToConvertTextFormDataOfFileIntoBinaryStream = 'Unable to convert ' lisUnableToConvertTextFormDataOfFileIntoBinaryStream = 'Unable to convert '
+'text form data of file %s%s%s%s%sinto binary stream. (%s)'; +'text form data of file %s%s%s%s%sinto binary stream. (%s)';

5
ide/main.pp
View File

@ -3809,7 +3809,7 @@ begin
AFilename, '"', #13, #13]); AFilename, '"', #13, #13]);
ACaption:=lisProgramDetected; ACaption:=lisProgramDetected;
if MessageDlg(ACaption, AText, mtConfirmation, if MessageDlg(ACaption, AText, mtConfirmation,
[mbOk, mbCancel], 0)=mrOk then [mbYes, mbNo], 0)=mrYes then
begin begin
Result:=DoCreateProjectForProgram(PreReadBuf); Result:=DoCreateProjectForProgram(PreReadBuf);
Handled:=true; Handled:=true;
@ -10968,6 +10968,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.790 2004/11/15 12:25:00 mattias
added some fpc src paths and changed auto create project for program a Yes/No question
Revision 1.789 2004/11/06 19:49:11 mattias Revision 1.789 2004/11/06 19:49:11 mattias
renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5 renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5