lazbuild: added defaults to WriteUsage

git-svn-id: trunk@16500 -

components/lazreport/samples/stringgrid/project1.lpi

@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="6"/>
     <General>
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ActiveEditorIndexAtStart Value="2"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -35,27 +35,46 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="2">
+    <Units Count="4">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="project1"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="60"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
         <ComponentName Value="Form1"/>
         <IsPartOfProject Value="True"/>
+        <ResourceBaseClass Value="Form"/>
         <ResourceFilename Value="unit1.lrs"/>
         <UnitName Value="Unit1"/>
-        <CursorPos X="33" Y="66"/>
+        <CursorPos X="10" Y="73"/>
         <TopLine Value="58"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="60"/>
         <Loaded Value="True"/>
       </Unit1>
+      <Unit2>
+        <Filename Value="../../source/lr_class.pas"/>
+        <UnitName Value="LR_Class"/>
+        <CursorPos X="10" Y="9613"/>
+        <TopLine Value="9605"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="29"/>
+        <Loaded Value="True"/>
+      </Unit2>
+      <Unit3>
+        <Filename Value="../../../../ide/lazconf.pp"/>
+        <UnitName Value="LazConf"/>
+        <CursorPos X="35" Y="204"/>
+        <TopLine Value="197"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="29"/>
+        <Loaded Value="True"/>
+      </Unit3>
     </Units>
-    <JumpHistory Count="2" HistoryIndex="1">
+    <JumpHistory Count="5" HistoryIndex="4">
       <Position1>
         <Filename Value="unit1.pas"/>
         <Caret Line="43" Column="47" TopLine="42"/>
@@ -64,14 +83,22 @@
         <Filename Value="unit1.pas"/>
         <Caret Line="39" Column="57" TopLine="17"/>
       </Position2>
+      <Position3>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="70" Column="22" TopLine="58"/>
+      </Position3>
+      <Position4>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="73" Column="10" TopLine="58"/>
+      </Position4>
+      <Position5>
+        <Filename Value="../../../../ide/lazconf.pp"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position5>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <PathDelim Value="\"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Linking>
       <Options>
         <Win32>

components/lazreport/source/lr_class.pas

@@ -9613,13 +9613,13 @@ begin
   rc.Right := XML.GetValue(Path+'Margins/Right/Value', 0); // TODO chk
   rc.Bottom := XML.GetValue(Path+'Margins/Bottom/Value', 0); // TODO chk
   Margins.AsRect := rc;
-  RestoreProperty('Orientation',XML.GetValue(Path+'Orientation/Value','poPortrait'));
+  RestoreProperty('Orientation',XML.GetValue(Path+'Orientation/Value',''));
 
   UseMargins := XML.GetValue(Path+'UseMargins/Value', True); // TODO chk
   PrintToPrevPage := XML.GetValue(Path+'PrintToPrevPage/Value', True); // TODO chk
   ColCount := XML.GetValue(Path+'ColCount/Value', 1); // TODO chk
   ColGap := XML.GetValue(Path+'ColGap/Value', 0);
-  RestoreProperty('LayoutOrder',XML.GetValue(Path+'LayoutOrder/Value','loColumns'));
+  RestoreProperty('LayoutOrder',XML.GetValue(Path+'LayoutOrder/Value',''));
   ChangePaper(pgSize, Width, Height, Orientation);
 end;
 

ide/lazarusidestrconsts.pas

@@ -3835,6 +3835,22 @@ resourcestring
   lisAddFilesOfDirectory = 'Add files of directory';
   lisUnableToCreateLinkWithTarget = 'Unable to create link %s%s%s with '
     +'target %s%s%s';
+  lisBuildAllFilesOfProjectPackageIDE =
+    'build all files of project/package/IDE';
+  lisApplyBuildFlagsBToDependenciesToo = 'apply build flags (-B) to '
+    +'dependencies too';
+  lisDoNotCompileDependencies = 'do not compile dependencies';
+  lisBuildIDEWithPackages = 'build IDE with packages';
+  lisShowVersionAndExit = 'show version and exit';
+  lisOverrideTheProjectOperatingSystemEGWin32LinuxDefau = '%soverride the '
+    +'project operating system. e.g. win32 linux. default: %s';
+  lisOverrideTheProjectWidgetsetEGGtkGtk2QtWin32CarbonD = '%soverride the '
+    +'project widgetset. e.g. gtk gtk2 qt win32 carbon. default: %s';
+  lisOverrideTheProjectCpuEGI386X86_64PowerpcPowerpc_64 = '%soverride the '
+    +'project cpu. e.g. i386 x86_64 powerpc powerpc_64 etc. default: %s';
+  lisOverrideTheDefaultCompilerEGPpc386Ppcx64PpcppcEtcD = '%soverride the '
+    +'default compiler. e.g. ppc386 ppcx64 ppcppc etc. default is stored in '
+    +'environmentoptions.xml';
 
 implementation
 

ide/lazbuild.lpr

@@ -30,7 +30,7 @@ program lazbuild;
 
 uses
   Classes, SysUtils, CustApp, LCLProc, Dialogs, Forms, Controls, FileUtil,
-  Process, AsyncProcess,
+  InterfaceBase, Process, AsyncProcess,
   // codetools
   CodeToolManager, DefineTemplates, Laz_XMLCfg,
   // IDEIntf
@@ -1106,15 +1106,15 @@ begin
   writeln('');
   writeln('lazbuild [options] <project or package-filename>');
   writeln('');
-  writeln('Options:');
+  writeln(lisEdtExtToolParameters);
   writeln('');
   writeln('--help or -?              ', listhisHelpMessage);
   writeln('');
-  writeln('-B or --build-all         ','build all files of project/package');
-  writeln('-r or --recursive         ','apply build flags (-B) to dependencies too');
-  writeln('-d or --skip-dependencies ','do not compile dependencies');
-  writeln('--build-ide=<options>     ','build IDE with packages');
-  writeln('-v or --version           ','show version and exit');
+  writeln('-B or --build-all         ', lisBuildAllFilesOfProjectPackageIDE);
+  writeln('-r or --recursive         ', lisApplyBuildFlagsBToDependenciesToo);
+  writeln('-d or --skip-dependencies ', lisDoNotCompileDependencies);
+  writeln('--build-ide=<options>     ', lisBuildIDEWithPackages);
+  writeln('-v or --version           ', lisShowVersionAndExit);
   writeln('');
   writeln(PrimaryConfPathOptLong,'<path>');
   writeln('or ',PrimaryConfPathOptShort,'<path>');
@@ -1128,20 +1128,27 @@ begin
   writeln('');
   writeln('--operating-system=<operating-system>');
   writeln('or --os=<operating-system>');
-  writeln(BreakString(space+'override the project operating system. e.g. win32 linux.',
+  writeln(BreakString(Format(
+    lisOverrideTheProjectOperatingSystemEGWin32LinuxDefau, [space,
+    LazConf.GetDefaultTargetOS]),
                       75, 22));
   writeln('');
   writeln('--widgetset=<widgetset>');
   writeln('or --ws=<widgetset>');
-  writeln(BreakString(space+'override the project widgetset. e.g. gtk gtk2 qt win32 carbon.',
+  writeln(BreakString(Format(
+    lisOverrideTheProjectWidgetsetEGGtkGtk2QtWin32CarbonD, [space,
+    LCLPlatformDirNames[LazConf.GetDefaultLCLWidgetType]]) ,
                       75, 22));
   writeln('');
   writeln('--cpu=<cpu>');
-  writeln(BreakString(space+'override the project cpu. e.g. i386 x86_64 powerpc powerpc_64 etc.',
+  writeln(BreakString(Format(
+    lisOverrideTheProjectCpuEGI386X86_64PowerpcPowerpc_64, [space,
+    LazConf.GetDefaultTargetCPU]),
                       75, 22));
   writeln('');
   writeln('--compiler=<ppcXXX>');
-  writeln(BreakString(space+'override the default compiler. e.g. ppc386 ppcx64 ppcppc etc.',
+  writeln(BreakString(Format(
+    lisOverrideTheDefaultCompilerEGPpc386Ppcx64PpcppcEtcD, [space]),
                       75, 22));
   writeln('');
   writeln(LanguageOpt);

ide/lazconf.pp

@@ -203,7 +203,7 @@ begin
     Result:= lpWin32;
     {$ENDIF}
     {$IFDEF darwin}{$DEFINE WidgetSetDefined}
-    Result:= lpCarbon;;
+    Result:= lpCarbon;
     {$ENDIF}
     {$IFNDEF WidgetSetDefined}
     Result:= lpGtk;