examples: fixed compilation

git-svn-id: trunk@16357 -

examples/codepageconverter/lazconverter.lpi

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
-    <Version Value="5"/>
+    <PathDelim Value="/"/>
+    <Version Value="6"/>
     <General>
       <Flags>
         <SaveClosedFiles Value="False"/>
@@ -14,38 +14,16 @@
       <Title Value="lazconverter"/>
       <ActiveEditorIndexAtStart Value="0"/>
     </General>
-    <Units Count="2">
-      <Unit0>
-        <CursorPos X="1" Y="1"/>
-        <Filename Value="lazconverter.lpr"/>
-        <IsPartOfProject Value="True"/>
-        <TopLine Value="1"/>
-        <UnitName Value="lazconverter"/>
-        <UsageCount Value="36"/>
-      </Unit0>
-      <Unit1>
-        <CursorPos X="1" Y="286"/>
-        <EditorIndex Value="0"/>
-        <Filename Value="mainunit.pas"/>
-        <ComponentName Value="LazConverterForm"/>
-        <IsPartOfProject Value="True"/>
-        <Loaded Value="True"/>
-        <ResourceFilename Value="mainunit.lrs"/>
-        <TopLine Value="109"/>
-        <UnitName Value="mainunit"/>
-        <UsageCount Value="36"/>
-      </Unit1>
-    </Units>
     <PublishOptions>
       <Version Value="2"/>
-      <DestinationDirectory Value="\home\barko\tempo\out\"/>
+      <DestinationDirectory Value="/home/barko/tempo/out/"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
       <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <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="2">
@@ -57,22 +35,41 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="lazconverter.lpr"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="lazconverter"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="36"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="mainunit.pas"/>
+        <ComponentName Value="LazConverterForm"/>
+        <IsPartOfProject Value="True"/>
+        <ResourceFilename Value="mainunit.lrs"/>
+        <UnitName Value="mainunit"/>
+        <CursorPos X="11" Y="30"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="0"/>
+        <UsageCount Value="36"/>
+        <Loaded Value="True"/>
+        <SyntaxHighlighter Value="Delphi"/>
+      </Unit1>
+    </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <PathDelim Value="\"/>
+    <Version Value="8"/>
     <SearchPaths>
-      <SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
+      <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
-        <DelphiCompat Value="True"/>
+        <SyntaxMode Value="Delphi"/>
         <UseAnsiStrings Value="True"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Linking>
       <Debugging>
         <UseLineInfoUnit Value="False"/>

examples/codepageconverter/mainunit.pas

@@ -27,7 +27,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, Buttons, ComCtrls, Menus
+  FileUtil, StdCtrls, Buttons, ComCtrls, Menus
   {$IFDEF TRANSLATESTRING}, DefaultTranslator{$ENDIF}, FileCtrl;
 
 type

examples/xmlstreaming/mainunit.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Laz_XMLStreaming, Laz_DOM, Laz_XMLCfg, Buttons, TypInfo;
+  FileUtil, StdCtrls, Laz_XMLStreaming, Laz_DOM, Laz_XMLCfg, Buttons, TypInfo;
 
 type
   TMyEnum = (myEnum1, myEnum2, myEnum3);

examples/xmlstreaming/streamasxmldemo.lpi

@@ -2,7 +2,7 @@
 <CONFIG>
   <ProjectOptions>
     <PathDelim Value="/"/>
-    <Version Value="5"/>
+    <Version Value="6"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
@@ -44,10 +44,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Linking>
       <Options>
         <Win32>

test/testresult-db/dbtests.pp

@@ -309,9 +309,9 @@ begin
     end;
   if upper(ClassName[1])<>'T' then exit;
   FileName := TestSrcDir+RelSrcDir+Path+DirectorySeparator+copy(lowercase(ClassName),2,length(classname));
-  if FileExistsUTF8(FileName+'.pas') then
+  if FileExists(FileName+'.pas') then
     FileName := FileName + '.pas'
-  else if FileExistsUTF8(FileName+'.pp') then
+  else if FileExists(FileName+'.pp') then
     FileName := FileName + '.pp'
   else exit;
   
@@ -379,7 +379,7 @@ Var
 
 begin
   Result:=-1;
-  If (FileExistsUTF8(TestSrcDir+RelSrcDir+Name) and
+  If (FileExists(TestSrcDir+RelSrcDir+Name) and
      GetConfig(TestSrcDir+RelSrcDir+Name,Info)) or
      GetUnitTestConfig(Name,Info) or
      GetLazarusTestConfig(Info) then
@@ -466,7 +466,7 @@ Function RequireTestID(Name : String): Integer;
 begin
   Result:=GetTestID(Name);
   If Result=-1 then
-    Result:=AddTest(Name,FileExistsUTF8(Name));
+    Result:=AddTest(Name,FileExists(Name));
   If Result=-1 then
     Verbose(V_WARNING,'Could not find or create entry for test '+Name);
 end;

test/testresult-db/importtestresults.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="6"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -33,14 +33,12 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <PathDelim Value="\"/>
+    <Version Value="8"/>
     <CodeGeneration>
       <Checks>
         <RangeChecks Value="True"/>
         <OverflowChecks Value="True"/>
       </Checks>
-      <Generate Value="Faster"/>
     </CodeGeneration>
     <Other>
       <CustomOptions Value="

test/testresult-db/importtestresults.pp

@@ -208,7 +208,7 @@ begin
   // Set the default value for old digests without RelSrcDir to the rtl/compiler
   // testsuite
   RelSrcDir:='tests/';
-  If Not FileExistsUTF8(FN) Then
+  If Not FileExists(FN) Then
     Exit;
   Verbose(V_DEBUG,'Parsing config file: '+FN);
   Assign(F,FN);
@@ -242,7 +242,7 @@ begin
   I:=1;
   While I<=ParamCount do
     begin
-    O:=ParamStrUTF8(I);
+    O:=ParamStr(I);
     Found:=Length(O)=2;
     If Found then
       For co:=low(TConfigOpt) to high(TConfigOpt) do
@@ -264,7 +264,7 @@ begin
       else
         begin
         inc(I);
-        O:=ParamStrUTF8(I);
+        O:=ParamStr(I);
         SetOpt(c,o);
         end;
       end;
@@ -392,7 +392,7 @@ Function GetLog(FN : String) : String;
 
 begin
   FN:=ChangeFileExt(FN,'.log');
-  If FileExistsUTF8(FN) then
+  If FileExists (FN) then
     Result:=GetFileContents(FN)
   else
     Result:='';
@@ -402,7 +402,7 @@ Function GetExecuteLog(FN : String) : String;
 
 begin
   FN:=ChangeFileExt(FN,'.elg');
-  If FileExistsUTF8(FN) then
+  If FileExists(FN) then
     Result:=GetFileContents(FN)
   else
     Result:='';
@@ -519,7 +519,7 @@ procedure ProcessResultsFile(FN: String);
 
 begin
   Verbose(V_Debug,'Start ProcessResultsFile');
-  if not FileExistsUTF8(FN) then
+  if not FileExists(FN) then
     Verbose(V_Error,'Results file "'+ResultsFileName+'" does not exist.');
 
   ReadXMLFile(Doc, FN);

tools/compile_all.sh

@@ -9,4 +9,6 @@ set -x
 
 find . -name '*.lpk' -exec $LazBuild {} \+
 
+find . -name '*.lpi' -exec $LazBuild {} \+
+
 #end.