paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 16:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed name of libxml2, it's called now xml2. This way it follows the rules of the other libs in packages

Browse Source 
* tried to fix the samples (still some problems)

git-svn-id: trunk@12587 -
This commit is contained in:
ivost 2009-01-24 01:40:17 +00:00
parent f62780694e
commit 6c7c28c5f2
13 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -3300,7 +3300,6 @@ packages/libxml/src/encoding.inc svneol=native#text/plain
packages/libxml/src/entities.inc svneol=native#text/plain packages/libxml/src/entities.inc svneol=native#text/plain
packages/libxml/src/globals.inc svneol=native#text/plain packages/libxml/src/globals.inc svneol=native#text/plain
packages/libxml/src/hash.inc svneol=native#text/plain packages/libxml/src/hash.inc svneol=native#text/plain
packages/libxml/src/libxml2.pas svneol=native#text/plain
packages/libxml/src/list.inc svneol=native#text/plain packages/libxml/src/list.inc svneol=native#text/plain
packages/libxml/src/nanoftp.inc svneol=native#text/plain packages/libxml/src/nanoftp.inc svneol=native#text/plain
packages/libxml/src/nanohttp.inc svneol=native#text/plain packages/libxml/src/nanohttp.inc svneol=native#text/plain
@ -3316,6 +3315,7 @@ packages/libxml/src/uri.inc svneol=native#text/plain
packages/libxml/src/valid.inc svneol=native#text/plain packages/libxml/src/valid.inc svneol=native#text/plain
packages/libxml/src/xinclude.inc svneol=native#text/plain packages/libxml/src/xinclude.inc svneol=native#text/plain
packages/libxml/src/xlink.inc svneol=native#text/plain packages/libxml/src/xlink.inc svneol=native#text/plain
packages/libxml/src/xml2.pas svneol=native#text/plain
packages/libxml/src/xmlIO.inc svneol=native#text/plain packages/libxml/src/xmlIO.inc svneol=native#text/plain
packages/libxml/src/xmlautomata.inc svneol=native#text/plain packages/libxml/src/xmlautomata.inc svneol=native#text/plain
packages/libxml/src/xmlerror.inc svneol=native#text/plain packages/libxml/src/xmlerror.inc svneol=native#text/plain

118
packages/libxml/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/22] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/01/18]
# #
default: all 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 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
@ -265,178 +265,178 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
override PACKAGE_NAME=libxml2 override PACKAGE_NAME=libxml2
override PACKAGE_VERSION=2.2.2 override PACKAGE_VERSION=2.2.2
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-haiku) ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-embedded) ifeq ($(FULL_TARGET),i386-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),m68k-embedded) ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc-amiga) ifeq ($(FULL_TARGET),powerpc-amiga)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc-embedded) ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),sparc-embedded) ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),x86_64-embedded) ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-darwin) ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-gba) ifeq ($(FULL_TARGET),arm-gba)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-nds) ifeq ($(FULL_TARGET),arm-nds)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),arm-symbian) ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc64-darwin) ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),avr-embedded) ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),armeb-linux) ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_UNITS+=libxml2 xmlxsd override TARGET_UNITS+=xml2 xmlxsd
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples

2
packages/libxml/Makefile.fpc
View File

@ -7,7 +7,7 @@ name=libxml2
version=2.2.2 version=2.2.2
[target] [target]
units=libxml2 xmlxsd units=xml2 xmlxsd
exampledirs=examples exampledirs=examples
[require] [require]

6
packages/libxml/examples/exutils.pas
View File

@ -6,7 +6,7 @@ interface
uses uses
ctypes, ctypes,
libxml2, xml2,
SysUtils; SysUtils;
procedure docdump(doc: xmlDocPtr); procedure docdump(doc: xmlDocPtr);
@ -24,7 +24,7 @@ var
begin begin
mem := nil; mem := nil;
xmlDocDumpMemory(doc, mem, size); xmlDocDumpMemory(doc, mem, size);
writeln(mem); writeln(pchar(mem));
xmlFree(mem); xmlFree(mem);
end; end;
@ -48,4 +48,4 @@ begin
writeln(msg); writeln(msg);
end; end;
end. end.

4
packages/libxml/examples/io1.pas
View File

@ -17,7 +17,7 @@ program io1;
uses uses
ctypes, ctypes,
libxml2, xml2,
exutils, exutils,
SysUtils; SysUtils;
@ -172,4 +172,4 @@ begin
* Cleanup function for the XML library. * Cleanup function for the XML library.
*) *)
xmlCleanupParser(); xmlCleanupParser();
end. end.

4
packages/libxml/examples/io2.pas
View File

@ -15,7 +15,7 @@ program io2;
uses uses
ctypes, ctypes,
libxml2, xml2,
exutils, exutils,
SysUtils; SysUtils;
@ -46,4 +46,4 @@ begin
*) *)
xmlFree(xmlbuff); xmlFree(xmlbuff);
xmlFreeDoc(doc); xmlFreeDoc(doc);
end. end.

2
packages/libxml/examples/reader1.pas
View File

@ -17,7 +17,7 @@ program reader1;
uses uses
ctypes, ctypes,
libxml2, xml2,
exutils; exutils;
(** (**

2
packages/libxml/examples/reader2.pas
View File

@ -18,7 +18,7 @@ program reader2;
uses uses
ctypes, ctypes,
libxml2, xml2,
exutils; exutils;
(** (**

2
packages/libxml/examples/tree1.pas
View File

@ -16,7 +16,7 @@ program tree1;
uses uses
ctypes, ctypes,
libxml2, xml2,
exutils, exutils,
SysUtils; SysUtils;

4
packages/libxml/examples/tree2.pas
View File

@ -14,7 +14,7 @@ program tree2;
uses uses
ctypes, ctypes,
libxml2, xml2,
exutils, exutils,
SysUtils; SysUtils;
@ -107,4 +107,4 @@ begin
* this is to debug memory for regression tests * this is to debug memory for regression tests
*) *)
xmlMemoryDump(); xmlMemoryDump();
end. end.

4
packages/libxml/fpmake.pp
View File

@ -12,7 +12,7 @@ begin
begin begin
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
P:=AddPackage('libxml2'); P:=AddPackage('xml2');
{$ifdef ALLPACKAGES} {$ifdef ALLPACKAGES}
P.Directory:='libxml'; P.Directory:='libxml';
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
@ -20,7 +20,7 @@ begin
P.SourcePath.Add('src'); P.SourcePath.Add('src');
P.IncludePath.Add('src'); P.IncludePath.Add('src');
T:=P.Targets.AddUnit('libxml2.pas'); T:=P.Targets.AddUnit('xml2.pas');
with T.Dependencies do with T.Dependencies do
begin begin
AddInclude('xinclude.inc'); AddInclude('xinclude.inc');

2
packages/libxml/src/libxml2.pas → packages/libxml/src/xml2.pas
View File

@ -3,7 +3,7 @@
Copyright (C) 2008 by Ivo Steinmann Copyright (C) 2008 by Ivo Steinmann
} }
unit libxml2; unit xml2;
{$mode objfpc} {$mode objfpc}
{$H+} {$H+}

2
packages/libxml/src/xmlxsd.pas
View File

@ -11,7 +11,7 @@ unit xmlxsd;
interface interface
uses uses
libxml2, xml2,
DateUtils, DateUtils,
SysUtils; SysUtils;