Hi
Attached is a patch for fpcUnit. Due to the xmlreporter.pas unit
being added to FPC 2.0.x as well, you get a conflict in Lazarus.
This patch removes all traces of the xmlreporter.pas unit in Lazarus.
Using Lazarus with FPC 2.0.2 now defaults to using the old xml
reporting units. Using FPC > 2.0.2 will use the new xml reporting
units included with FPC.
Note:
* Apply patch from the root Lazarus directory.
* Delete the file "components/fpcunit/xmlreporter.pas"
Regards,
- Graeme -
--
There's no place like 127.0.0.1
Index: components/fpcunit/guitestrunner.pas
===================================================================
--- components/fpcunit/guitestrunner.pas (revision 9722)
+++ components/fpcunit/guitestrunner.pas (working copy)
@@ -24,11 +24,13 @@
{$mode objfpc}{$H+}
-{ Uncomment this define, to use the old XML output routines. If it is left
- commented out, it will use the XMLWrite unit that comes
- with FPC. The benefit of using XMLWrite is that it creates valid XML data with
- reserved characters escaped and allows for further processing with XSLT etc. }
-{.$DEFINE UseOldXML}
+{ By default the old XML unit will be used for FPC 2.0.2 and the new XML unit
+ for any FPC versions above 2.0.2. The benefit of using the new XML unit is
+ that it creates valid XML data with reserved characters escaped and allows
+ for further processing with XSLT etc. }
+{$IFDEF VER2_0_2}
+ {$DEFINE UseOldXML}
+{$ENDIF}
interface
Index: components/fpcunit/fpcunittestrunner.pas
===================================================================
--- components/fpcunit/fpcunittestrunner.pas (revision 9722)
+++ components/fpcunit/fpcunittestrunner.pas (working copy)
@@ -7,7 +7,7 @@
interface
uses
- GuiTestRunner, xmlreporter;
+ GuiTestRunner;
implementation
Index: components/fpcunit/fpcunittestrunner.lpk
===================================================================
--- components/fpcunit/fpcunittestrunner.lpk (revision 9722)
+++ components/fpcunit/fpcunittestrunner.lpk (working copy)
@@ -20,27 +20,23 @@
<Description Value="FPCUnit gui test runner form"/>
<License Value="LGPL"/>
<Version Minor="1"/>
- <Files Count="5">
+ <Files Count="4">
<Item1>
<Filename Value="guitestrunner.pas"/>
<UnitName Value="GuiTestRunner"/>
</Item1>
<Item2>
- <Filename Value="xmlreporter.pas"/>
- <UnitName Value="xmlreporter"/>
- </Item2>
- <Item3>
<Filename Value="blueball.xpm"/>
<Type Value="Text"/>
- </Item3>
- <Item4>
+ </Item2>
+ <Item3>
<Filename Value="guitestrunner.lfm"/>
<Type Value="LFM"/>
- </Item4>
- <Item5>
+ </Item3>
+ <Item4>
<Filename Value="guitestrunner.lrs"/>
<Type Value="LRS"/>
- </Item5>
+ </Item4>
</Files>
<RequiredPkgs Count="3">
<Item1>
