examples fixed compilation

git-svn-id: trunk@16245 -
This commit is contained in:
mattias 2008-08-25 23:06:16 +00:00
parent fb4b5588fd
commit 5c9e4e53f0
5 changed files with 72 additions and 74 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/07/07]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/08/24]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@ -624,178 +624,178 @@ ifeq ($(FULL_TARGET),armeb-embedded)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-haiku)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),armeb-linux)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_INCLUDEDIR+=./

View File

@ -2,7 +2,7 @@
#
# Makefile.fpc for FPCUnitTestRunner 0.1
#
# This file was generated on 14-7-2008
# This file was generated on 26-8-08
[package]
name=fpcunittestrunner
@ -12,7 +12,7 @@ version=0.1
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
unitdir=../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
includedir=./
options=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
options=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
[target]
units=fpcunittestrunner.pas

View File

@ -24,7 +24,7 @@ unit consoletestrunner;
interface
uses
custapp, Classes, SysUtils,
custapp, Classes, SysUtils, FileUtil,
fpcunit, testregistry, testutils,
fpcunitreport, latextestreport, xmltestreport, plaintestreport,
dom;

View File

@ -1,18 +1,13 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="3">
<PathDelim Value="\"/>
<Name Value="fpcunitconsolerunner"/>
<Author Value="Vincent"/>
<CompilerOptions>
<Version Value="5"/>
<PathDelim Value="\"/>
<Version Value="8"/>
<SearchPaths>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
<Other>
<CompilerPath Value="$(CompPath)"/>
</Other>
@ -26,14 +21,17 @@
<UnitName Value="consoletestrunner"/>
</Item1>
</Files>
<RequiredPkgs Count="1">
<RequiredPkgs Count="2">
<Item1>
<PackageName Value="LCL"/>
</Item1>
<Item2>
<PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/>
</Item1>
</Item2>
</RequiredPkgs>
<UsageOptions>
<UnitPath Value="$(PkgOutDir)\"/>
<UnitPath Value="$(PkgOutDir)/"/>
</UsageOptions>
<PublishOptions>
<Version Value="2"/>

View File

@ -28,8 +28,8 @@ unit GuiTestRunner;
interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
Buttons, ComCtrls, ActnList, Menus, Clipbrd, StdCtrls,
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
ExtCtrls, Buttons, ComCtrls, ActnList, Menus, Clipbrd, StdCtrls,
testdecorator,
{$IFDEF VER2_0}
xmlreporter,