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

startlazarus: fixed compilation and implemented to follow symlink of start path

Browse Source 
git-svn-id: trunk@16464 -
This commit is contained in:
mattias 2008-09-07 11:54:10 +00:00
parent eb25228c64
commit 5de3e5bda1
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/idecmdline.pas
View File

@ -50,7 +50,7 @@ function GetCommandLineParameters(aCmdLineParams : TStrings;
function IsHelpRequested (index : Integer = 1) : Boolean;
function ParamIsOption(ParamIndex : integer; const Option : string) : boolean;
function ParamIsOptionPlusValue(ParamIndex : integer;
const Option : string; var AValue : string) : boolean;
const Option : string; out AValue : string) : boolean;
procedure SetParamOptions(var SkipAutoLoadingLastProject,
StartedByStartLazarus,
@ -137,7 +137,7 @@ begin
end;
function ParamIsOptionPlusValue(ParamIndex : integer;
const Option : string; var AValue : string) : boolean;
const Option : string; out AValue : string) : boolean;
var
p : String;
begin

6
ide/lazarusmanager.pas
View File

@ -241,10 +241,14 @@ var
DefaultExe: String;
CustomExe: String;
MsgResult: TModalResult;
StartPath: String;
begin
WaitForLazarus;
try
DefaultDir:=ExtractFilePath(ExpandFileNameUTF8(ParamStrUTF8(0)));
StartPath:=ExpandFileNameUTF8(ParamStrUTF8(0));
if FileIsSymlink(StartPath) then
StartPath:=ReadAllLinks(StartPath,true);
DefaultDir:=ExtractFilePath(StartPath);
if DirectoryExistsUTF8(DefaultDir) then
DefaultDir:=ReadAllLinks(DefaultDir,true);
except

25
ide/startlazarus.lpi
View File

@ -1,17 +1,16 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
<PathDelim Value="\"/>
<PathDelim Value="/"/>
<Version Value="6"/>
<General>
<SessionStorage Value="InIDEConfig"/>
<MainUnit Value="0"/>
<IconPath Value=".\"/>
<IconPath Value="./"/>
<TargetFileExt Value=".exe"/>
</General>
<PublishOptions>
<Version Value="2"/>
<DestinationDirectory Value="$(TestDir)\publishedproject\"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions>
@ -19,7 +18,7 @@
<local>
<FormatVersion Value="1"/>
<CommandLineParams Value="--nsc"/>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<RequiredPackages Count="4">
@ -54,18 +53,20 @@
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
<PathDelim Value="\"/>
<Version Value="8"/>
<Target>
<Filename Value="C:\lazarus\source\lazarus\startlazarus.exe"/>
<Filename Value="../startlazarus$(ExeExt)"/>
</Target>
<SearchPaths>
<OtherUnitFiles Value="$(LazarusDir)\packager\units\$(TargetCPU)-$(TargetOS)\"/>
<SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
<IncludeFiles Value="include/$(TargetOS)/;include/$(SrcOS)/"/>
<OtherUnitFiles Value="../designer/;../packager/;../components/codetools/units/$(TargetCPU)-$(TargetOS)/"/>
<UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
<Parsing>
<SyntaxOptions>
<CStyleOperator Value="False"/>
</SyntaxOptions>
</Parsing>
<Linking>
<Options>
<Win32>