paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-19 21:28:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

added USESVN2REVISIONINC=0 if lazarus directory readonly

Browse Source 
git-svn-id: trunk@17182 -
This commit is contained in:
mattias 2008-11-01 22:34:06 +00:00
parent 47fba96134
commit 6b8e6f225b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ide/buildlazdialog.pas
View File

@ -260,7 +260,7 @@ function BuildLazarus(Options: TBuildLazarusOptions;
function CreateBuildLazarusOptions(Options: TBuildLazarusOptions; function CreateBuildLazarusOptions(Options: TBuildLazarusOptions;
ItemIndex: integer; Macros: TTransferMacroList; ItemIndex: integer; Macros: TTransferMacroList;
const PackageOptions: string; Flags: TBuildLazarusFlags; const PackageOptions: string; Flags: TBuildLazarusFlags;
var ExtraOptions: string): TModalResult; var ExtraOptions: string; out DisableSvn2RevisionInc: boolean): TModalResult;
function SaveIDEMakeOptions(Options: TBuildLazarusOptions; function SaveIDEMakeOptions(Options: TBuildLazarusOptions;
Macros: TTransferMacroList; Macros: TTransferMacroList;
const PackageOptions: string; Flags: TBuildLazarusFlags): TModalResult; const PackageOptions: string; Flags: TBuildLazarusFlags): TModalResult;
@ -328,6 +328,7 @@ var
i: Integer; i: Integer;
CurItem: TBuildLazarusItem; CurItem: TBuildLazarusItem;
ExtraOptions, LinkerAddition: String; ExtraOptions, LinkerAddition: String;
DisableSvn2RevisionInc: boolean;
CurMakeMode: TMakeMode; CurMakeMode: TMakeMode;
{$IFDEF win32} {$IFDEF win32}
@ -420,9 +421,7 @@ begin
// even if that build node is disabled in configure build lazarus dialog // even if that build node is disabled in configure build lazarus dialog
else if (blfOnlyIDE in Flags) then else if (blfOnlyIDE in Flags) then
CurMakeMode := mmBuild; CurMakeMode := mmBuild;
end; end;
if CurMakeMode=mmNone then continue; if CurMakeMode=mmNone then continue;
@ -436,7 +435,7 @@ begin
// append extra options // append extra options
ExtraOptions:=''; ExtraOptions:='';
Result:=CreateBuildLazarusOptions(Options,i,Macros,PackageOptions,Flags, Result:=CreateBuildLazarusOptions(Options,i,Macros,PackageOptions,Flags,
ExtraOptions); ExtraOptions,DisableSvn2RevisionInc);
if Result<>mrOk then exit; if Result<>mrOk then exit;
// add Linker options for wigdet set // add Linker options for wigdet set
@ -449,6 +448,8 @@ begin
if ExtraOptions<>'' then if ExtraOptions<>'' then
Tool.EnvironmentOverrides.Values['OPT'] := ExtraOptions; Tool.EnvironmentOverrides.Values['OPT'] := ExtraOptions;
if DisableSvn2RevisionInc then
Tool.EnvironmentOverrides.Values['USESVN2REVISIONINC'] := '0';
// add -w option to print leaving/entering messages // add -w option to print leaving/entering messages
Tool.CmdLineParams:=Tool.CmdLineParams+' -w'; Tool.CmdLineParams:=Tool.CmdLineParams+' -w';
// append target OS // append target OS
@ -470,7 +471,7 @@ end;
function CreateBuildLazarusOptions(Options: TBuildLazarusOptions; function CreateBuildLazarusOptions(Options: TBuildLazarusOptions;
ItemIndex: integer; Macros: TTransferMacroList; ItemIndex: integer; Macros: TTransferMacroList;
const PackageOptions: string; Flags: TBuildLazarusFlags; const PackageOptions: string; Flags: TBuildLazarusFlags;
var ExtraOptions: string): TModalResult; var ExtraOptions: string; out DisableSvn2RevisionInc: boolean): TModalResult;
function RemoveProfilerOption(const ExtraOptions: string): string; function RemoveProfilerOption(const ExtraOptions: string): string;
var var
@ -521,6 +522,8 @@ var
begin begin
Result:=mrOk; Result:=mrOk;
CurItem:=Options.Items[ItemIndex]; CurItem:=Options.Items[ItemIndex];
DisableSvn2RevisionInc:=false;
// create extra options // create extra options
ExtraOptions:=Options.ExtraOptions; ExtraOptions:=Options.ExtraOptions;
@ -632,6 +635,7 @@ begin
if not DirectoryIsWritableCached(NewTargetDirectory) then begin if not DirectoryIsWritableCached(NewTargetDirectory) then begin
// Case 3. the lazarus directory is not writable // Case 3. the lazarus directory is not writable
// create directory <primary config dir>/bin/ // create directory <primary config dir>/bin/
DisableSvn2RevisionInc:=true;
NewTargetDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'bin'; NewTargetDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'bin';
NewUnitDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'units' NewUnitDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'units'
+PathDelim+NewTargetCPU+'-'+NewTargetOS; +PathDelim+NewTargetCPU+'-'+NewTargetOS;
@ -770,11 +774,12 @@ var
Filename: String; Filename: String;
fs: TFileStream; fs: TFileStream;
OptionsAsText: String; OptionsAsText: String;
DisableSvn2RevisionInc: boolean;
begin begin
ExtraOptions:=''; ExtraOptions:='';
Result:=CreateBuildLazarusOptions(Options,Options.IndexOf(Options.ItemIDE), Result:=CreateBuildLazarusOptions(Options,Options.IndexOf(Options.ItemIDE),
Macros,PackageOptions,Flags, Macros,PackageOptions,Flags,
ExtraOptions); ExtraOptions,DisableSvn2RevisionInc);
if Result<>mrOk then exit; if Result<>mrOk then exit;
Filename:=GetMakeIDEConfigFilename; Filename:=GetMakeIDEConfigFilename;
try try