* adding more samples

git-svn-id: trunk@11630 -

packages/libxml/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/08/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/08/22]
 #
 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
@@ -259,178 +259,178 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_PROGRAMS+=reader1 reader2
+override TARGET_PROGRAMS+=reader1 reader2 io1
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR

packages/libxml/examples/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [target]
-programs=reader1 reader2
+programs=reader1 reader2 io1
 
 [require]
 #packages=

packages/libxml/examples/exutils.pas

@@ -8,7 +8,9 @@ uses
   SysUtils;
 
 procedure printf(const msg: string; const args: array of const);
+procedure printf(const msg: string);
 procedure printfn(const msg: string; const args: array of const);
+procedure printfn(const msg: string);
 
 implementation
 
@@ -17,9 +19,19 @@ begin
   write(Format(msg, args));
 end;
 
+procedure printf(const msg: string);
+begin
+  write(msg);
+end;
+
 procedure printfn(const msg: string; const args: array of const);
 begin
   writeln(Format(msg, args));
 end;
 
+procedure printfn(const msg: string);
+begin
+  writeln(msg);
+end;
+
 end.

packages/libxml/examples/reader1.pas

@@ -81,6 +81,18 @@ begin
 end;
 
 begin
+  (*
+   * this initialize the library and check potential ABI mismatches
+   * between the version it was compiled for and the actual shared
+   * library used.
+   *)
+  LIBXML_TEST_VERSION;
+
   streamFile(pchar(ParamStr(1)));
+
+  (*
+   * Cleanup function for the XML library.
+   *)
+  xmlCleanupParser();
 end.
 

packages/libxml/examples/reader2.pas

@@ -97,6 +97,18 @@ begin
 end;
 
 begin
+  (*
+   * this initialize the library and check potential ABI mismatches
+   * between the version it was compiled for and the actual shared
+   * library used.
+   *)
+  LIBXML_TEST_VERSION;
+
   streamFile(pchar(ParamStr(1)));
+
+  (*
+   * Cleanup function for the XML library.
+   *)
+  xmlCleanupParser();
 end.
 

packages/libxml/src/libxml2.pas

@@ -267,6 +267,16 @@ begin
 end;
 
 
+(*
+ * macros from xmlversion.inc
+ *)
+
+procedure LIBXML_TEST_VERSION;
+begin
+  xmlCheckVersion(LIBXML_VERSION);
+end;
+
+
 (*
  * macros from chvalid.inc
  *)
@@ -454,14 +464,14 @@ initialization
 (*
  * overloading the error functions
  *)
-  xmlSetGenericErrorFunc(nil, @fpcxmlGenericErrorHandler);
-  xmlSetStructuredErrorFunc(nil, @fpcxmlStructuredErrorHandler);
+  //xmlSetGenericErrorFunc(nil, @fpcxmlGenericErrorHandler);
+  //xmlSetStructuredErrorFunc(nil, @fpcxmlStructuredErrorHandler);
 
 finalization
 (*
  * Cleanup function for the XML library.
  *)
-  xmlCleanupParser();
+  //xmlCleanupParser();
 
 (*
  * this is to debug memory for regression tests

packages/libxml/src/xmlversion.inc

@@ -49,7 +49,7 @@ const
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  *)
-{$DEFINE LIBXML_TEST_VERSION := xmlCheckVersion(20632)}
+procedure LIBXML_TEST_VERSION;
 
 (**
  * LIBXML_THREAD_ENABLED: