mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-13 02:19:10 +02:00
MG: changes for new compiler 20011216
git-svn-id: trunk@536 -
This commit is contained in:
parent
9a99f03e56
commit
e2a57d3b7b
@ -340,7 +340,7 @@ var i, CurExtStart, CurExtEnd, ExtStart, ExtLen: integer;
|
||||
begin
|
||||
ExtStart:=length(ExpandedFilename);
|
||||
while (ExtStart>0) and (ExpandedFilename[ExtStart]<>'.')
|
||||
and (ExpandedFilename[ExtStart]<>OSDirSeparator) do
|
||||
and (ExpandedFilename[ExtStart]<>PathDelim) do
|
||||
dec(ExtStart);
|
||||
if (ExtStart<1) or (ExpandedFilename[ExtStart]<>'.') then begin
|
||||
Result:=false;
|
||||
|
@ -246,8 +246,8 @@ function FilenameIsMatching(const Mask, Filename: string;
|
||||
check if Filename matches Mask
|
||||
Filename matches exactly or is a file/directory in a subdirectory of mask
|
||||
Mask can contain the wildcards * and ?
|
||||
The wildcards will _not_ match OSDirSeparator
|
||||
If you need the asterisk, the question mark or the OSDirSeparator as character
|
||||
The wildcards will _not_ match PathDelim
|
||||
If you need the asterisk, the question mark or the PathDelim as character
|
||||
just put the SpecialChar character in front of it.
|
||||
|
||||
Examples:
|
||||
@ -273,10 +273,10 @@ begin
|
||||
repeat
|
||||
// find start of directories
|
||||
while (DirStartMask<=length(Mask))
|
||||
and (Mask[DirStartMask]=OSDirSeparator) do
|
||||
and (Mask[DirStartMask]=PathDelim) do
|
||||
inc(DirStartMask);
|
||||
while (DirStartFile<=length(Filename))
|
||||
and (Filename[DirStartFile]=OSDirSeparator) do
|
||||
and (Filename[DirStartFile]=PathDelim) do
|
||||
inc(DirStartFile);
|
||||
// find ends of directories
|
||||
DirEndMask:=DirStartMask;
|
||||
@ -284,7 +284,7 @@ begin
|
||||
while (DirEndMask<=length(Mask)) do begin
|
||||
if Mask[DirEndMask]=SpecialChar then
|
||||
inc(DirEndMask,2)
|
||||
else if (Mask[DirEndMask]=OSDirSeparator) then
|
||||
else if (Mask[DirEndMask]=PathDelim) then
|
||||
break
|
||||
else
|
||||
inc(DirEndMask);
|
||||
@ -292,7 +292,7 @@ begin
|
||||
while (DirEndFile<=length(Filename)) do begin
|
||||
if Filename[DirEndFile]=SpecialChar then
|
||||
inc(DirEndFile,2)
|
||||
else if (Filename[DirEndFile]=OSDirSeparator) then
|
||||
else if (Filename[DirEndFile]=PathDelim) then
|
||||
break
|
||||
else
|
||||
inc(DirEndFile);
|
||||
@ -340,12 +340,12 @@ begin
|
||||
DirStartFile:=DirEndFile+1;
|
||||
until (DirStartFile>length(Filename)) or (DirStartMask>length(Mask));
|
||||
while (DirStartMask<=length(Mask))
|
||||
and (Mask[DirStartMask]=OSDirSeparator) do
|
||||
and (Mask[DirStartMask]=PathDelim) do
|
||||
inc(DirStartMask);
|
||||
Result:=(DirStartMask>length(Mask));
|
||||
if MatchExactly then begin
|
||||
while (DirStartFile<=length(Filename))
|
||||
and (Filename[DirStartFile]=OSDirSeparator) do
|
||||
and (Filename[DirStartFile]=PathDelim) do
|
||||
inc(DirStartFile);
|
||||
Result:=(Result and (DirStartFile>length(Filename)));
|
||||
end;
|
||||
@ -700,8 +700,8 @@ var ExpPath: string;
|
||||
begin
|
||||
//writeln('[TDefineTree.GetDefinesForDirectory] "',Path,'"');
|
||||
ExpPath:=Path;
|
||||
if (ExpPath<>'') and (ExpPath[length(ExpPath)]<>OSDirSeparator) then
|
||||
ExpPath:=ExpPath+OSDirSeparator;
|
||||
if (ExpPath<>'') and (ExpPath[length(ExpPath)]<>PathDelim) then
|
||||
ExpPath:=ExpPath+PathDelim;
|
||||
DirDef:=FindDirectoryInCache(ExpPath);
|
||||
if DirDef<>nil then begin
|
||||
Result:=DirDef.Values;
|
||||
@ -922,9 +922,9 @@ var
|
||||
if CurPath='' then
|
||||
SubPath:=ReadValue(DefTempl.Value)
|
||||
else
|
||||
SubPath:=CurPath+OSDirSeparator+ReadValue(DefTempl.Value);
|
||||
SubPath:=CurPath+PathDelim+ReadValue(DefTempl.Value);
|
||||
{$else}
|
||||
SubPath:=CurPath+OSDirSeparator+ReadValue(DefTempl.Value);
|
||||
SubPath:=CurPath+PathDelim+ReadValue(DefTempl.Value);
|
||||
{$endif}
|
||||
// test if ExpandedDirectory is part of SubPath
|
||||
if FilenameIsMatching(SubPath,ExpandedDirectory,false) then
|
||||
@ -1127,13 +1127,10 @@ begin
|
||||
while FileExists(BogusFilename+IntToStr(i)) do inc(i);
|
||||
CmdLine:=CmdLine+BogusFilename;
|
||||
|
||||
TheProcess:=TProcess.Create(CmdLine,[poUsePipes,poNoConsole
|
||||
,poStdErrToOutput]);
|
||||
|
||||
{TheProcess := TProcess.Create(nil);
|
||||
TheProcess := TProcess.Create(nil);
|
||||
TheProcess.CommandLine := CmdLine;
|
||||
TheProcess.Options:= [poUsePipes, poNoConsole, poStdErrToOutPut];
|
||||
TheProcess.ShowWindow := swoNone;}
|
||||
TheProcess.ShowWindow := swoNone;
|
||||
try
|
||||
TheProcess.Execute;
|
||||
OutputLine:='';
|
||||
@ -1165,13 +1162,10 @@ begin
|
||||
// ask for target operating system -> ask compiler with switch -iTO
|
||||
CmdLine:=PPC386Path+' -iTO';
|
||||
|
||||
TheProcess:=TProcess.Create(CmdLine,[poUsePipes,poNoConsole
|
||||
,poStdErrToOutput]);
|
||||
|
||||
{TheProcess := TProcess.Create(nil);
|
||||
TheProcess := TProcess.Create(nil);
|
||||
TheProcess.CommandLine := CmdLine;
|
||||
TheProcess.Options:= [poUsePipes, poNoConsole, poStdErrToOutPut];
|
||||
TheProcess.ShowWindow := swoNone;}
|
||||
TheProcess.ShowWindow := swoNone;
|
||||
try
|
||||
TheProcess.Execute;
|
||||
if TheProcess.Output<>nil then
|
||||
@ -1207,14 +1201,10 @@ begin
|
||||
end;
|
||||
|
||||
// ask for target processor -> ask compiler with switch -iTP
|
||||
|
||||
TheProcess:=TProcess.Create(PPC386Path+' -iTP',[poUsePipes,poNoConsole
|
||||
,poStdErrToOutput]);
|
||||
|
||||
{TheProcess := TProcess.Create(nil);
|
||||
TheProcess := TProcess.Create(nil);
|
||||
TheProcess.CommandLine := PPC386Path+' -iTP';
|
||||
TheProcess.Options:= [poUsePipes, poNoConsole, poStdErrToOutPut];
|
||||
TheProcess.ShowWindow := swoNone;}
|
||||
TheProcess.ShowWindow := swoNone;
|
||||
try
|
||||
TheProcess.Execute;
|
||||
if TheProcess.Output<>nil then
|
||||
@ -1313,11 +1303,11 @@ var DefTempl, MainDir,
|
||||
length(AFilename)-length(FPCSrcDir));
|
||||
DirStart:=1;
|
||||
while (DirStart<=length(Result)) do begin
|
||||
while (DirStart<=length(Result)) and (Result[DirStart]=OSDirSeparator)
|
||||
while (DirStart<=length(Result)) and (Result[DirStart]=PathDelim)
|
||||
do
|
||||
inc(DirStart);
|
||||
DirEnd:=DirStart;
|
||||
while (DirEnd<=length(Result)) and (Result[DirEnd]<>OSDirSeparator) do
|
||||
while (DirEnd<=length(Result)) and (Result[DirEnd]<>PathDelim) do
|
||||
inc(DirEnd);
|
||||
if DirEnd>length(Result) then break;
|
||||
if DirEnd>DirStart then begin
|
||||
@ -1375,8 +1365,8 @@ var DefTempl, MainDir,
|
||||
begin
|
||||
// writeln('%%%Browse ',ADirPath);
|
||||
if ADirPath='' then exit;
|
||||
if not (ADirPath[length(ADirPath)]=OSDirSeparator) then
|
||||
ADirPath:=ADirPath+OSDirSeparator;
|
||||
if not (ADirPath[length(ADirPath)]=PathDelim) then
|
||||
ADirPath:=ADirPath+PathDelim;
|
||||
if FindFirst(ADirPath+'*.*',faAnyFile,FileInfo)=0 then begin
|
||||
repeat
|
||||
AFilename:=FileInfo.Name;
|
||||
@ -1503,7 +1493,7 @@ var DefTempl, MainDir,
|
||||
begin
|
||||
Result:=nil;
|
||||
if FPCSrcDir='' then exit;
|
||||
DS:=OSDirSeparator;
|
||||
DS:=PathDelim;
|
||||
Dir:=FPCSrcDir;
|
||||
if Dir[length(Dir)]<>DS then Dir:=Dir+DS;
|
||||
TargetOS:='$('+ExternalMacroStart+'TargetOS)';
|
||||
@ -1575,7 +1565,7 @@ end;
|
||||
|
||||
function TDefinePool.CreateLazarusSrcTemplate(
|
||||
const LazarusSrcDir, WidgetType: string): TDefineTemplate;
|
||||
const ds: char = OSDirSeparator;
|
||||
const ds: char = PathDelim;
|
||||
var MainDir, DirTempl, SubDirTempl: TDefineTemplate;
|
||||
TargetOS, SrcPath: string;
|
||||
begin
|
||||
@ -1693,9 +1683,9 @@ begin
|
||||
'',ProjectDir,da_Directory);
|
||||
DirTempl.AddChild(TDefineTemplate.Create('LCL','adds lcl to SrcPath',
|
||||
ExternalMacroStart+'SrcPath',
|
||||
LazarusSrcDir+OSDirSeparator+'lcl;'
|
||||
+LazarusSrcDir+OSDirSeparator+'lcl'+OSDirSeparator+'interfaces'
|
||||
+OSDirSeparator+WidgetType
|
||||
LazarusSrcDir+PathDelim+'lcl;'
|
||||
+LazarusSrcDir+PathDelim+'lcl'+PathDelim+'interfaces'
|
||||
+PathDelim+WidgetType
|
||||
+';$('+ExternalMacroStart+'SrcPath)'
|
||||
,da_DefineAll));
|
||||
Result:=TDefineTemplate.Create(StdDefTemplLCLProject,
|
||||
|
@ -133,7 +133,7 @@ function DirectoryExists(DirectoryName: string): boolean;
|
||||
var sr: TSearchRec;
|
||||
begin
|
||||
if (DirectoryName<>'')
|
||||
and (DirectoryName[length(DirectoryName)]=OSDirSeparator) then
|
||||
and (DirectoryName[length(DirectoryName)]=PathDelim) then
|
||||
DirectoryName:=copy(DirectoryName,1,length(DirectoryName)-1);
|
||||
if FindFirst(DirectoryName,faAnyFile,sr)=0 then
|
||||
Result:=((sr.Attr and faDirectory)>0)
|
||||
@ -149,7 +149,7 @@ begin
|
||||
DoDirSeparators(DirectoryName);
|
||||
i:=1;
|
||||
while i<=length(DirectoryName) do begin
|
||||
if DirectoryName[i]=OSDirSeparator then begin
|
||||
if DirectoryName[i]=PathDelim then begin
|
||||
Dir:=copy(DirectoryName,1,i-1);
|
||||
if not DirectoryExists(Dir) then begin
|
||||
Result:=CreateDir(Dir);
|
||||
|
@ -179,8 +179,8 @@ writeln('TFindDeclarationTool.FindUnitSource.LoadFile ',ExpandedFilename);
|
||||
var APath: string;
|
||||
begin
|
||||
APath:=ADir;
|
||||
if (APath<>'') and (APath[length(APath)]<>OSDirSeparator) then
|
||||
APath:=APath+OSDirSeparator;
|
||||
if (APath<>'') and (APath[length(APath)]<>PathDelim) then
|
||||
APath:=APath+PathDelim;
|
||||
{$IFNDEF win32}
|
||||
if LoadFile(ADir+lowercase(AnUnitName)+'.pp',Result) then exit;
|
||||
if LoadFile(ADir+lowercase(AnUnitName)+'.pas',Result) then exit;
|
||||
@ -194,18 +194,14 @@ writeln('TFindDeclarationTool.FindUnitSource.LoadFile ',ExpandedFilename);
|
||||
var PathStart, PathEnd: integer;
|
||||
ADir: string;
|
||||
begin
|
||||
writeln('--------------------------------------');
|
||||
writeln(APath,' ',TheUnitName);
|
||||
writeln('--------------------------------------');
|
||||
PathStart:=1;
|
||||
while PathStart<=length(APath) do begin
|
||||
PathEnd:=PathStart;
|
||||
while (PathEnd<=length(APath)) and (APath[PathEnd]<>';') do inc(PathEnd);
|
||||
if PathEnd>PathStart then begin
|
||||
ADir:=copy(APath,PathStart,PathEnd-PathStart);
|
||||
if (ADir<>'') and (ADir[length(ADir)]<>OSDirSeparator) then
|
||||
ADir:=ADir+OSDirSeparator;
|
||||
writeln('B ',ADir);
|
||||
if (ADir<>'') and (ADir[length(ADir)]<>PathDelim) then
|
||||
ADir:=ADir+PathDelim;
|
||||
Result:=SearchUnitFileInDir(ADir,TheUnitName);
|
||||
if Result<>nil then exit;
|
||||
end;
|
||||
@ -224,8 +220,8 @@ writeln('B ',ADir);
|
||||
while (PathEnd<=length(APath)) and (APath[PathEnd]<>';') do inc(PathEnd);
|
||||
if PathEnd>PathStart then begin
|
||||
ADir:=copy(APath,PathStart,PathEnd-PathStart);
|
||||
if (ADir<>'') and (ADir[length(ADir)]<>OSDirSeparator) then
|
||||
ADir:=ADir+OSDirSeparator;
|
||||
if (ADir<>'') and (ADir[length(ADir)]<>PathDelim) then
|
||||
ADir:=ADir+PathDelim;
|
||||
if LoadFile(ADir+RelativeFilename,Result) then exit;
|
||||
end;
|
||||
PathStart:=PathEnd+1;
|
||||
|
@ -1224,8 +1224,8 @@ var
|
||||
begin
|
||||
Result:=false;
|
||||
if APath='' then exit;
|
||||
if APath[length(APath)]<>OSDirSeparator then
|
||||
ExpFilename:=APath+OSDirSeparator+AFilename
|
||||
if APath[length(APath)]<>PathDelim then
|
||||
ExpFilename:=APath+PathDelim+AFilename
|
||||
else
|
||||
ExpFilename:=APath+AFilename;
|
||||
if not FilenameIsAbsolute(ExpFilename) then
|
||||
|
@ -626,9 +626,9 @@ begin
|
||||
SourceChangeCache.MainScanner:=Scanner;
|
||||
if KeepPath then begin
|
||||
FileNameStart:=FileEnd;
|
||||
while (FileNameStart>FileStart) and (Src[FileNameStart]<>OSDirSeparator) do
|
||||
while (FileNameStart>FileStart) and (Src[FileNameStart]<>PathDelim) do
|
||||
dec(FileNameStart);
|
||||
if Src[FileNameStart]=OSDirSeparator then
|
||||
if Src[FileNameStart]=PathDelim then
|
||||
FileStart:=FileNameStart+1;
|
||||
end;
|
||||
if not SourceChangeCache.Replace(gtNone,GtNone,FileStart,FileEnd,
|
||||
|
@ -50,8 +50,6 @@ var
|
||||
implementation
|
||||
|
||||
constructor TBreakPointsdlg.Create(AOwner : TComponent);
|
||||
var
|
||||
LI : TListItem;
|
||||
Begin
|
||||
inherited;
|
||||
if LazarusResources.Find(Classname)=nil then
|
||||
|
@ -206,13 +206,10 @@ begin
|
||||
|
||||
try
|
||||
|
||||
TheProcess:=TProcess.Create(CmdLine,[poUsePipes,poNoConsole
|
||||
,poStdErrToOutput]);
|
||||
|
||||
{TheProcess := TProcess.Create(nil);
|
||||
TheProcess := TProcess.Create(nil);
|
||||
TheProcess.CommandLine := CmdLine;
|
||||
TheProcess.Options:= [poUsePipes, poNoConsole, poStdErrToOutPut];
|
||||
TheProcess.ShowWindow := swoNone;}
|
||||
TheProcess.ShowWindow := swoNone;
|
||||
Result:=mrOk;
|
||||
try
|
||||
TheProcess.CurrentDirectory:=ProjectDir;
|
||||
@ -329,6 +326,9 @@ end.
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.25 2001/12/16 22:24:54 lazarus
|
||||
MG: changes for new compiler 20011216
|
||||
|
||||
Revision 1.24 2001/12/10 08:19:52 lazarus
|
||||
MG: added hint for unset compiler path
|
||||
|
||||
|
@ -238,14 +238,11 @@ begin
|
||||
writeln('[TExternalToolList.Run] ',CmdLine);
|
||||
try
|
||||
CheckIfFileIsExecutable(Filename);
|
||||
TheProcess:=TProcess.Create(CmdLine,[poRunSuspended,
|
||||
poUsePipes, poNoConsole]);
|
||||
TheProcess.CurrentDirectory:=WorkingDir;
|
||||
{TheProcess := TProcess.Create(nil);
|
||||
TheProcess := TProcess.Create(nil);
|
||||
TheProcess.CommandLine := Filename+' '+Params;
|
||||
TheProcess.Options:= [poRunSuspended, poUsePipes, poNoConsole];
|
||||
TheProcess.Options:= [poUsePipes, poNoConsole];
|
||||
TheProcess.ShowWindow := swoNone;
|
||||
TheProcess.CurrentDirectory := WorkingDir;}
|
||||
TheProcess.CurrentDirectory := WorkingDir;
|
||||
TheProcess.Execute;
|
||||
except
|
||||
on e: Exception do
|
||||
|
@ -176,7 +176,7 @@ function DirectoryExists(DirectoryName: string): boolean;
|
||||
var sr: TSearchRec;
|
||||
begin
|
||||
if (DirectoryName<>'')
|
||||
and (DirectoryName[length(DirectoryName)]=OSDirSeparator) then
|
||||
and (DirectoryName[length(DirectoryName)]=PathDelim) then
|
||||
DirectoryName:=copy(DirectoryName,1,length(DirectoryName)-1);
|
||||
if FindFirst(DirectoryName,faAnyFile,sr)=0 then
|
||||
Result:=((sr.Attr and faDirectory)>0)
|
||||
@ -192,7 +192,7 @@ begin
|
||||
DoDirSeparators(DirectoryName);
|
||||
i:=1;
|
||||
while i<=length(DirectoryName) do begin
|
||||
if DirectoryName[i]=OSDirSeparator then begin
|
||||
if DirectoryName[i]=PathDelim then begin
|
||||
Dir:=copy(DirectoryName,1,i-1);
|
||||
if not DirectoryExists(Dir) then begin
|
||||
Result:=CreateDir(Dir);
|
||||
|
@ -59,8 +59,8 @@ var
|
||||
PrimaryFilename, SecondaryFilename: string;
|
||||
SrcFS, DestFS: TFileStream;
|
||||
begin
|
||||
PrimaryFilename:=GetPrimaryConfigPath+OSDirSeparator+AFilename;
|
||||
SecondaryFilename:=GetSecondaryConfigPath+OSDirSeparator+AFilename;
|
||||
PrimaryFilename:=GetPrimaryConfigPath+PathDelim+AFilename;
|
||||
SecondaryFilename:=GetSecondaryConfigPath+PathDelim+AFilename;
|
||||
if not FileExists(PrimaryFilename) then begin
|
||||
try
|
||||
SrcFS:=TFileStream.Create(SecondaryFilename,fmOpenRead);
|
||||
@ -97,6 +97,9 @@ initialization
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 2001/12/16 22:24:55 lazarus
|
||||
MG: changes for new compiler 20011216
|
||||
|
||||
Revision 1.3 2001/12/10 08:44:23 lazarus
|
||||
MG: added search for compiler, if not set
|
||||
|
||||
|
@ -61,8 +61,8 @@ var
|
||||
PrimaryFilename, SecondaryFilename: string;
|
||||
SrcFS, DestFS: TFileStream;
|
||||
begin
|
||||
PrimaryFilename:=GetPrimaryConfigPath+OSDirSeparator+AFilename;
|
||||
SecondaryFilename:=GetSecondaryConfigPath+OSDirSeparator+AFilename;
|
||||
PrimaryFilename:=GetPrimaryConfigPath+PathDelim+AFilename;
|
||||
SecondaryFilename:=GetSecondaryConfigPath+PathDelim+AFilename;
|
||||
if not FileExists(PrimaryFilename) then begin
|
||||
try
|
||||
SrcFS:=TFileStream.Create(SecondaryFilename,fmOpenRead);
|
||||
@ -97,6 +97,9 @@ initialization
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.5 2001/12/16 22:24:55 lazarus
|
||||
MG: changes for new compiler 20011216
|
||||
|
||||
Revision 1.4 2001/12/10 08:44:23 lazarus
|
||||
MG: added search for compiler, if not set
|
||||
|
||||
|
@ -53,8 +53,8 @@ var
|
||||
PrimaryFilename, SecondaryFilename: string;
|
||||
SrcFS, DestFS: TFileStream;
|
||||
begin
|
||||
PrimaryFilename:=GetPrimaryConfigPath+OSDirSeparator+AFilename;
|
||||
SecondaryFilename:=GetSecondaryConfigPath+OSDirSeparator+AFilename;
|
||||
PrimaryFilename:=GetPrimaryConfigPath+PathDelim+AFilename;
|
||||
SecondaryFilename:=GetSecondaryConfigPath+PathDelim+AFilename;
|
||||
if not FileExists(PrimaryFilename) then begin
|
||||
try
|
||||
SrcFS:=TFileStream.Create(SecondaryFilename,fmOpenRead);
|
||||
@ -90,6 +90,9 @@ initialization
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 2001/12/16 22:24:55 lazarus
|
||||
MG: changes for new compiler 20011216
|
||||
|
||||
Revision 1.3 2001/12/10 08:44:23 lazarus
|
||||
MG: added search for compiler, if not set
|
||||
|
||||
|
45
ide/main.pp
45
ide/main.pp
@ -3097,8 +3097,8 @@ var ActiveSrcEdit: TSourceEditor;
|
||||
CurPath:=copy(TempPath,1,p-1);
|
||||
Delete(TempPath,1,p);
|
||||
if CurPath='' then continue;
|
||||
if CurPath[length(CurPath)]<>OSDirSeparator then
|
||||
CurPath:=CurPath+OSDirSeparator;
|
||||
if CurPath[length(CurPath)]<>PathDelim then
|
||||
CurPath:=CurPath+PathDelim;
|
||||
for c:=0 to 2 do begin
|
||||
case c of
|
||||
0: TempFile:=FName;
|
||||
@ -3157,8 +3157,8 @@ begin
|
||||
SPath:=SPath+';'+ExtractFilePath(Project.ProjectFile);
|
||||
if EnvironmentOptions.LazarusDirectory<>'' then
|
||||
SPath:=SPath
|
||||
+';'+EnvironmentOptions.LazarusDirectory+OSDirSeparator+'lcl'
|
||||
+';'+EnvironmentOptions.LazarusDirectory+OSDirSeparator+'designer';
|
||||
+';'+EnvironmentOptions.LazarusDirectory+PathDelim+'lcl'
|
||||
+';'+EnvironmentOptions.LazarusDirectory+PathDelim+'designer';
|
||||
if FindPasFile(FName,SPath) then begin
|
||||
result:=mrOk;
|
||||
EnvironmentOptions.LastOpenDialogDir:=ExtractFilePath(FName);
|
||||
@ -3205,10 +3205,10 @@ writeln('TMainIDE.DoNewProject A');
|
||||
begin
|
||||
// create a first form unit
|
||||
Project.CompilerOptions.OtherUnitFiles:=
|
||||
'$(LazarusDir)'+OSDirSeparator+'lcl'+OSDirSeparator+'units'
|
||||
'$(LazarusDir)'+PathDelim+'lcl'+PathDelim+'units'
|
||||
+';'+
|
||||
'$(LazarusDir)'+OSDirSeparator+'lcl'+OSDirSeparator+'units'
|
||||
+OSDirSeparator
|
||||
'$(LazarusDir)'+PathDelim+'lcl'+PathDelim+'units'
|
||||
+PathDelim
|
||||
+CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'LCLWidgetType'];
|
||||
DoNewEditorUnit(nuForm,'');
|
||||
end;
|
||||
@ -3640,10 +3640,10 @@ writeln('[TMainIDE.DoCreateProjectForProgram] A ',ProgramBuf.Filename);
|
||||
Project.CompilerOptions.CompilerPath:='$(CompPath)';
|
||||
if NewProjectType=ptApplication then begin
|
||||
Project.CompilerOptions.OtherUnitFiles:=
|
||||
'$(LazarusDir)'+OSDirSeparator+'lcl'+OSDirSeparator+'units'
|
||||
'$(LazarusDir)'+PathDelim+'lcl'+PathDelim+'units'
|
||||
+';'+
|
||||
'$(LazarusDir)'+OSDirSeparator+'lcl'+OSDirSeparator+'units'
|
||||
+OSDirSeparator
|
||||
'$(LazarusDir)'+PathDelim+'lcl'+PathDelim+'units'
|
||||
+PathDelim
|
||||
+CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'LCLWidgetType'];
|
||||
end;
|
||||
|
||||
@ -3864,13 +3864,10 @@ writeln('[TMainIDE.DoRunProject] A');
|
||||
try
|
||||
writeln(' EXECUTING "',ProgramFilename,'"');
|
||||
CheckIfFileIsExecutable(ProgramFilename);
|
||||
TheProcess:=TProcess.Create(ProgramFilename,
|
||||
[poRunSuspended,poUsePipes,poNoConsole]);
|
||||
|
||||
{TheProcess := TProcess.Create(nil);
|
||||
TheProcess := TProcess.Create(nil);
|
||||
TheProcess.CommandLine := ProgramFilename;
|
||||
TheProcess.Options:= [poRunSuspended, poUsePipes, poNoConsole];
|
||||
TheProcess.ShowWindow := swoNone;}
|
||||
TheProcess.Options:= [poUsePipes, poNoConsole];
|
||||
TheProcess.ShowWindow := swoNone;
|
||||
TheProcess.Execute;
|
||||
except
|
||||
on e: Exception do begin
|
||||
@ -4284,7 +4281,7 @@ begin
|
||||
BackupFilename:=FileNameOnly+FileExt;
|
||||
end;
|
||||
if BackupInfo.SubDirectory<>'' then
|
||||
BackupFilename:=SubDir+OSDirSeparator+BackupFilename
|
||||
BackupFilename:=SubDir+PathDelim+BackupFilename
|
||||
else
|
||||
BackupFilename:=FilePath+BackupFilename;
|
||||
// remove old backup file
|
||||
@ -4305,7 +4302,7 @@ begin
|
||||
end else begin
|
||||
// backup with counter
|
||||
if BackupInfo.SubDirectory<>'' then
|
||||
BackupFilename:=SubDir+OSDirSeparator+FileNameOnly+FileExt+';'
|
||||
BackupFilename:=SubDir+PathDelim+FileNameOnly+FileExt+';'
|
||||
else
|
||||
BackupFilename:=Filename+';';
|
||||
if BackupInfo.MaxCounter<=0 then begin
|
||||
@ -4532,8 +4529,8 @@ function TMainIDE.DoJumpToCompilerMessage(Index:integer;
|
||||
if PathEnd>PathStart then begin
|
||||
Result:=ExpandFileName(copy(SearchPath,PathStart,PathEnd-PathStart));
|
||||
if Result<>'' then begin
|
||||
if Result[length(Result)]<>OSDirSeparator then
|
||||
Result:=Result+OSDirSeparator;
|
||||
if Result[length(Result)]<>PathDelim then
|
||||
Result:=Result+PathDelim;
|
||||
Result:=Result+AFileName;
|
||||
if FileExists(Result) then exit;
|
||||
end;
|
||||
@ -4668,8 +4665,8 @@ begin
|
||||
if AnUnitInfo=nil then exit;
|
||||
TestDir:=EnvironmentOptions.TestBuildDirectory;
|
||||
if (TestDir='') then exit;
|
||||
if TestDir[length(TestDir)]<>OSDirSeparator then
|
||||
TestDir:=TestDir+OSDirSeparator;
|
||||
if TestDir[length(TestDir)]<>PathDelim then
|
||||
TestDir:=TestDir+PathDelim;
|
||||
Result:=ExtractFilename(AnUnitInfo.Filename);
|
||||
if Result='' then exit;
|
||||
Result:=TestDir+Result;
|
||||
@ -5381,8 +5378,8 @@ end.
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.184 2001/12/16 12:55:57 lazarus
|
||||
MG: fixed project codetool variable
|
||||
Revision 1.185 2001/12/16 22:24:54 lazarus
|
||||
MG: changes for new compiler 20011216
|
||||
|
||||
Revision 1.183 2001/12/16 11:20:26 lazarus
|
||||
MG: find declaration for uses sections
|
||||
|
@ -1072,8 +1072,8 @@ begin
|
||||
inc(EndPos);
|
||||
CurPath:=copy(SearchPaths,Startpos,EndPos-StartPos);
|
||||
if CurPath<>'' then begin
|
||||
if CurPath[length(CurPath)]<>OSDirSeparator then
|
||||
CurPath:=CurPath+OSDirSeparator;
|
||||
if CurPath[length(CurPath)]<>PathDelim then
|
||||
CurPath:=CurPath+PathDelim;
|
||||
Result:=CurPath+Filename;
|
||||
if FileExists(Result) then exit;
|
||||
end;
|
||||
@ -1269,6 +1269,9 @@ end.
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.46 2001/12/16 22:24:54 lazarus
|
||||
MG: changes for new compiler 20011216
|
||||
|
||||
Revision 1.45 2001/12/13 23:09:58 lazarus
|
||||
MG: enhanced code caching, fixed CursorToCleanPos and beautify statement
|
||||
|
||||
|
@ -380,8 +380,6 @@ var
|
||||
QueueItem, OldQueueItem: PLazQueueItem; // currently only used by LM_DESTROY
|
||||
MsgPtr : PMsg; // currently only used by LM_DESTROY
|
||||
Count : Integer; //Used in TListView LM_LV_CHANGEITEM
|
||||
titles : PPgchar;
|
||||
Title1 : Pchar;
|
||||
begin
|
||||
Result := 0; //default value just in case nothing sets it
|
||||
|
||||
@ -3616,6 +3614,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.90 2001/12/16 22:24:55 lazarus
|
||||
MG: changes for new compiler 20011216
|
||||
|
||||
Revision 1.89 2001/12/14 19:51:48 lazarus
|
||||
More changes to TListView
|
||||
Shane
|
||||
|
Loading…
Reference in New Issue
Block a user