* uuid moved

git-svn-id: trunk@9964 -
This commit is contained in:
marco 2008-01-26 20:11:31 +00:00
parent 05b92aa557
commit 552a0819a9
12 changed files with 3087 additions and 67 deletions

8
.gitattributes vendored
View File

@ -4422,6 +4422,14 @@ packages/unzip/fpmake.pp svneol=native#text/plain
packages/unzip/src/unzip.pp svneol=native#text/plain
packages/unzip/src/unzipdll.pp svneol=native#text/plain
packages/unzip/src/ziptypes.pp svneol=native#text/plain
packages/uuid/Makefile svneol=native#text/plain
packages/uuid/Makefile.fpc svneol=native#text/plain
packages/uuid/README svneol=native#text/plain
packages/uuid/fpmake.pp svneol=native#text/plain
packages/uuid/src/libuuid.pp svneol=native#text/plain
packages/uuid/src/macuuid.pp svneol=native#text/plain
packages/uuid/tests/testlibuid.pp svneol=native#text/plain
packages/uuid/tests/testuid.pp svneol=native#text/plain
packages/winunits-base/Makefile svneol=native#text/plain
packages/winunits-base/Makefile.fpc svneol=native#text/plain
packages/winunits-base/fpmake.pp svneol=native#text/plain

View File

@ -241,7 +241,7 @@ 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_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 libc unixutil
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid libc unixutil
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
@ -298,7 +298,7 @@ ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11
@ -322,7 +322,7 @@ ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11
@ -343,7 +343,7 @@ ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11
@ -355,7 +355,7 @@ ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11
@ -370,7 +370,7 @@ ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid
endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
@ -391,7 +391,7 @@ ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json extra fcl-process unzip regexpr fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11
@ -1515,6 +1515,7 @@ TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LIBC=1
TARGET_DIRS_UNIXUTIL=1
endif
@ -2032,6 +2033,7 @@ TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_UUID=1
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
TARGET_DIRS_BASE=1
@ -2262,6 +2264,7 @@ TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_UUID=1
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
TARGET_DIRS_BASE=1
@ -2456,6 +2459,7 @@ TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_UUID=1
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
TARGET_DIRS_BASE=1
@ -2587,6 +2591,7 @@ TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_UUID=1
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
TARGET_DIRS_BASE=1
@ -2751,6 +2756,7 @@ TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_UUID=1
endif
ifeq ($(FULL_TARGET),arm-palmos)
TARGET_DIRS_BASE=1
@ -2918,6 +2924,7 @@ TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_UUID=1
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
TARGET_DIRS_BASE=1
@ -4551,6 +4558,51 @@ x11:
$(MAKE) -C x11 all
.PHONY: x11_all x11_debug x11_smart x11_release x11_units x11_examples x11_shared x11_install x11_sourceinstall x11_exampleinstall x11_distinstall x11_zipinstall x11_zipsourceinstall x11_zipexampleinstall x11_zipdistinstall x11_clean x11_distclean x11_cleanall x11_info x11_makefiles x11
endif
ifdef TARGET_DIRS_UUID
uuid_all:
$(MAKE) -C uuid all
uuid_debug:
$(MAKE) -C uuid debug
uuid_smart:
$(MAKE) -C uuid smart
uuid_release:
$(MAKE) -C uuid release
uuid_units:
$(MAKE) -C uuid units
uuid_examples:
$(MAKE) -C uuid examples
uuid_shared:
$(MAKE) -C uuid shared
uuid_install:
$(MAKE) -C uuid install
uuid_sourceinstall:
$(MAKE) -C uuid sourceinstall
uuid_exampleinstall:
$(MAKE) -C uuid exampleinstall
uuid_distinstall:
$(MAKE) -C uuid distinstall
uuid_zipinstall:
$(MAKE) -C uuid zipinstall
uuid_zipsourceinstall:
$(MAKE) -C uuid zipsourceinstall
uuid_zipexampleinstall:
$(MAKE) -C uuid zipexampleinstall
uuid_zipdistinstall:
$(MAKE) -C uuid zipdistinstall
uuid_clean:
$(MAKE) -C uuid clean
uuid_distclean:
$(MAKE) -C uuid distclean
uuid_cleanall:
$(MAKE) -C uuid cleanall
uuid_info:
$(MAKE) -C uuid info
uuid_makefiles:
$(MAKE) -C uuid makefiles
uuid:
$(MAKE) -C uuid all
.PHONY: uuid_all uuid_debug uuid_smart uuid_release uuid_units uuid_examples uuid_shared uuid_install uuid_sourceinstall uuid_exampleinstall uuid_distinstall uuid_zipinstall uuid_zipsourceinstall uuid_zipexampleinstall uuid_zipdistinstall uuid_clean uuid_distclean uuid_cleanall uuid_info uuid_makefiles uuid
endif
ifdef TARGET_DIRS_LIBC
libc_all:
$(MAKE) -C libc all

View File

@ -16,7 +16,7 @@ dirs_netbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqli
dirs_openbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \
gdbint libpng x11
dirs_linux=fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick \
gdbint libpng x11
gdbint libpng x11 uuid
dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle odbc postgres sqlite imagemagick \
gdbint libpng
dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle odbc postgres sqlite imagemagick \

View File

@ -241,7 +241,7 @@ 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_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell lua sdl graph
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell lua sdl graph
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_DIRS+=chm graph
@ -298,7 +298,7 @@ ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_DIRS+=chm
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl graph aspell
@ -322,7 +322,7 @@ ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_DIRS+=chm
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell sdl graph
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell sdl graph
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_DIRS+=chm opengl gtk syslog forms svgalib ggi libgd utmp bfd gdbm fpgtk tcl imlib gnome1 openssl pcap libcurl cairo aspell
@ -343,7 +343,7 @@ ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_DIRS+=chm
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_DIRS+=chm opengl gtk syslog forms svgalib ggi libgd utmp bfd gdbm fpgtk tcl imlib gnome1 openssl pcap libcurl cairo aspell
@ -355,7 +355,7 @@ ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_DIRS+=chm
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell sdl graph
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell sdl graph
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm fpgtk tcl imlib gnome1 openssl pcap libcurl cairo sdl graph aspell
@ -370,7 +370,7 @@ ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_DIRS+=chm
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_DIRS+=chm palmunits
@ -391,7 +391,7 @@ ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_DIRS+=chm
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt uuid ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms svgalib ggi libgd utmp bfd gdbm tcl cdrom imlib gnome1 fpgtk newt ldap openal mad oggvorbis a52 modplug dts openssl pcap libcurl cairo aspell graph
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_DIRS+=chm fftw opengl gtk gtk2 syslog forms libgd utmp bfd gdbm fpgtk tcl imlib gnome1 openssl libcurl cairo aspell
@ -1498,7 +1498,6 @@ TARGET_DIRS_IMLIB=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_NEWT=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LDAP=1
TARGET_DIRS_OPENAL=1
TARGET_DIRS_MAD=1
@ -1723,7 +1722,6 @@ TARGET_DIRS_IMLIB=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_NEWT=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LDAP=1
TARGET_DIRS_OPENAL=1
TARGET_DIRS_MAD=1
@ -1842,7 +1840,6 @@ TARGET_DIRS_IMLIB=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_NEWT=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LDAP=1
TARGET_DIRS_OPENAL=1
TARGET_DIRS_MAD=1
@ -1937,7 +1934,6 @@ TARGET_DIRS_IMLIB=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_NEWT=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LDAP=1
TARGET_DIRS_OPENAL=1
TARGET_DIRS_MAD=1
@ -2020,7 +2016,6 @@ TARGET_DIRS_IMLIB=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_NEWT=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LDAP=1
TARGET_DIRS_OPENAL=1
TARGET_DIRS_MAD=1
@ -2118,7 +2113,6 @@ TARGET_DIRS_IMLIB=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_NEWT=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LDAP=1
TARGET_DIRS_OPENAL=1
TARGET_DIRS_MAD=1
@ -2174,7 +2168,6 @@ TARGET_DIRS_IMLIB=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_NEWT=1
TARGET_DIRS_UUID=1
TARGET_DIRS_LDAP=1
TARGET_DIRS_OPENAL=1
TARGET_DIRS_MAD=1
@ -3068,51 +3061,6 @@ newt:
$(MAKE) -C newt all
.PHONY: newt_all newt_debug newt_smart newt_release newt_units newt_examples newt_shared newt_install newt_sourceinstall newt_exampleinstall newt_distinstall newt_zipinstall newt_zipsourceinstall newt_zipexampleinstall newt_zipdistinstall newt_clean newt_distclean newt_cleanall newt_info newt_makefiles newt
endif
ifdef TARGET_DIRS_UUID
uuid_all:
$(MAKE) -C uuid all
uuid_debug:
$(MAKE) -C uuid debug
uuid_smart:
$(MAKE) -C uuid smart
uuid_release:
$(MAKE) -C uuid release
uuid_units:
$(MAKE) -C uuid units
uuid_examples:
$(MAKE) -C uuid examples
uuid_shared:
$(MAKE) -C uuid shared
uuid_install:
$(MAKE) -C uuid install
uuid_sourceinstall:
$(MAKE) -C uuid sourceinstall
uuid_exampleinstall:
$(MAKE) -C uuid exampleinstall
uuid_distinstall:
$(MAKE) -C uuid distinstall
uuid_zipinstall:
$(MAKE) -C uuid zipinstall
uuid_zipsourceinstall:
$(MAKE) -C uuid zipsourceinstall
uuid_zipexampleinstall:
$(MAKE) -C uuid zipexampleinstall
uuid_zipdistinstall:
$(MAKE) -C uuid zipdistinstall
uuid_clean:
$(MAKE) -C uuid clean
uuid_distclean:
$(MAKE) -C uuid distclean
uuid_cleanall:
$(MAKE) -C uuid cleanall
uuid_info:
$(MAKE) -C uuid info
uuid_makefiles:
$(MAKE) -C uuid makefiles
uuid:
$(MAKE) -C uuid all
.PHONY: uuid_all uuid_debug uuid_smart uuid_release uuid_units uuid_examples uuid_shared uuid_install uuid_sourceinstall uuid_exampleinstall uuid_distinstall uuid_zipinstall uuid_zipsourceinstall uuid_zipexampleinstall uuid_zipdistinstall uuid_clean uuid_distclean uuid_cleanall uuid_info uuid_makefiles uuid
endif
ifdef TARGET_DIRS_LDAP
ldap_all:
$(MAKE) -C ldap all

2586
packages/uuid/Makefile Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,32 @@
#
# Makefile.fpc for gdbm bindings
#
[package]
name=uuid
version=2.0.0
[target]
units=macuuid libuuid
examples=testuid testlibuid
[require]
package=rtl
[install]
examplesubdir=tests
fpcpackage=y
[default]
fpcdir=../..
[compiler]
includedir=src
sourcedir=src tests examples
unitdir=units/$(OS_TARGET)
[rules]
.NOTPARALLEL:
#testuid$(EXEEXT): testuid.pp uuid$(PPUEXT)
testlibuid$(EXEEXT): testlibuid.pp libuuid$(PPUEXT)

19
packages/uuid/README Normal file
View File

@ -0,0 +1,19 @@
This package contains 2 units
uuid:
creates a GUID based on the MAC address and Time on a linux machine.
The implementation is 100% native object pascal code.
Libuuid:
creates a GUID based on the MAC address and Time on a linux machine.
The implementation uses the libuuid.so.1 library, which should
be present on most linux systems. The library is loaded dynamically.
Both units set the OnCreateGUID event handler of SysUtils.
The test programs show the usage, tested on SuSE 9.2.
Enjoy,
Michael.

29
packages/uuid/fpmake.pp Normal file
View File

@ -0,0 +1,29 @@
{$ifndef ALLPACKAGES}
{$mode objfpc}{$H+}
program fpmake;
uses fpmkunit;
Var
P : TPackage;
T : TTarget;
begin
With Installer do
begin
{$endif ALLPACKAGES}
P:=AddPackage('uuid');
{$ifdef ALLPACKAGES}
P.Directory:='uuid';
{$endif ALLPACKAGES}
P.Version:='2.0.0';
P.SourcePath.Add('src');
T:=P.Targets.AddUnit('libuuid.pp');
T:=P.Targets.AddUnit('macuuid.pp');
{$ifndef ALLPACKAGES}
Run;
end;
end.
{$endif ALLPACKAGES}

View File

@ -0,0 +1,60 @@
{$mode objfpc}
{$H+}
Unit Libuuid;
interface
uses SysUtils,dynlibs;
Var
LibUUIDName : String = 'libuuid.so.1';
ProcName : String = 'uuid_generate_time';
function CCreateGUID(out Guid: TGUID): HResult;
Implementation
Type
TGenProc = procedure (out Guid: TGUID);cdecl;
var
Handle : TLibHandle;
GenFunc : TGenProc;
Function InitLibrary : Boolean;
begin
Result:=(Handle<>NilHandle);
If Not result then
begin
Handle:=LoadLibrary(LibUUIDName);
Result:=(Handle<>NilHandle);
if Result then
begin
GenFunc:=TGenProc(GetProcedureAddress(Handle, ProcName));
Result:=(GenFunc<>nil);
end;
end;
end;
function CCreateGUID(out Guid: TGUID): HResult;
begin
Result := -1;
if InitLibrary then
begin
GenFunc(Guid);
Result := 0;
end;
end;
initialization
If InitLibrary then
OnCreateGUID:=@CCreateGUID;
Finalization
if (Handle<>NilHandle) then
UnLoadLibrary(Handle)
end.

View File

@ -0,0 +1,258 @@
{$mode objfpc}
{$H+}
unit macuuid;
Interface
uses SysUtils;
Function CreateMacGUID(Out GUID : TGUID) : Integer;
Implementation
uses unixtype, sockets, baseunix, unix;
Const
MAX_ADJUSTMENT = 10;
IPPROTO_IP = 0;
// AF_INET = 2;
// SOCK_DGRAM = 2;
IF_NAMESIZE = 16;
SIOCGIFCONF = $8912;
SIOCGIFHWADDR = $8927;
Type
{$packrecords c}
tifr_ifrn = record
case integer of
0 : (ifrn_name: array [0..IF_NAMESIZE-1] of char);
end;
tifmap = record
mem_start : cardinal;
mem_end : cardinal;
base_addr : word;
irq : byte;
dma : byte;
port : byte;
end;
PIFrec = ^TIFrec;
TIFrec = record
ifr_ifrn : tifr_ifrn;
case integer of
0 : (ifru_addr : TSockAddr);
1 : (ifru_dstaddr : TSockAddr);
2 : (ifru_broadaddr : TSockAddr);
3 : (ifru_netmask : TSockAddr);
4 : (ifru_hwaddr : TSockAddr);
5 : (ifru_flags : word);
6 : (ifru_ivalue : longint);
7 : (ifru_mtu : longint);
8 : (ifru_map : tifmap);
9 : (ifru_slave : Array[0..IF_NAMESIZE-1] of char);
10 : (ifru_newname : Array[0..IF_NAMESIZE-1] of char);
11 : (ifru_data : pointer);
end;
TIFConf = record
ifc_len : longint;
case integer of
0 : (ifcu_buf : pointer);
1 : (ifcu_req : ^tifrec);
end;
tuuid = record
time_low : cardinal;
time_mid : Word;
time_hi_and_version : Word;
clock_seq : Word;
node : Array[0..5] of byte;
end;
Var
MacAddr : Packed Array[1..6] of byte = (0,0,0,0,0,0);
MacAddrTried : Byte = 0 ;
Last : TTimeVal = (tv_sec:0;tv_usec:0);
ClockSeq : Word = 0;
AdjustMent : Integer = 0;
Procedure GetRandomBytes(Var Buf; NBytes : Integer);
Var
I : Integer;
P : PByte;
begin
P:=@Buf;
Randomize;
For I:=0 to NBytes-1 do
P[i]:=Random(256);
end;
Function GetMacAddr : Boolean;
var
i,j,n,Sd : Integer;
buf : Array[0..1023] of byte;
ifc : TIfConf;
ifr : TIFRec;
ifp : PIFRec;
p : PChar;
begin
Result:=MacAddrTried>0;
If Result then
Result:=MacAddrTried>1
else
begin
MacAddrTried:=1;
sd:=fpSocket(AF_INET,SOCK_DGRAM,IPPROTO_IP);
if (sd<0) then
exit;
Try
ifc.ifc_len:=Sizeof(Buf);
ifc.ifcu_buf:=@buf;
if fpioctl(sd, SIOCGIFCONF, @ifc)<0 then
Exit;
n:= ifc.ifc_len;
i:=0;
While (Not Result) and (I<N) do
begin
ifp:=PIFRec(PByte(ifc.ifcu_buf)+i);
move(ifp^.ifr_ifrn.ifrn_name,ifr.ifr_ifrn.ifrn_name,IF_NAMESIZE);
if (fpioctl(sd, SIOCGIFHWADDR, @ifr) >= 0) then
begin
P:=Pchar(@ifr.ifru_hwaddr.sa_data);
Result:=(p[0]<>#0) or (p[1]<>#0) or (p[2]<>#0)
or (p[3]<>#0) or (p[4]<>#0) or (p[5]<>#0);
If Result Then
begin
Move(P^,MacAddr,SizeOf(MacAddr));
MacAddrTried:=2;
// DumpMacAddr;
end;
end;
I:=I+sizeof(tifrec);
end;
Finally
fileClose(sd);
end;
end;
end;
Function GetClock(Var ClockHigh,ClockLow : Cardinal; Var RetClockSeq : Word) : boolean;
Var
TV : TTImeVal;
ClockReg : QWord;
OK : Boolean;
begin
OK:=True;
Repeat
FPGetTimeOfDay(@Tv,Nil);
If (Last.tv_sec=0) and (last.tv_sec=0) then
begin
GetRandomBytes(ClockSeq,SizeOf(ClockSeq));
ClockSeq:=ClockSeq and $1FFF;
last:=TV;
Dec(last.tv_sec);
end;
if (tv.tv_sec<last.tv_sec) or
((tv.tv_sec=last.tv_sec) and (tv.tv_usec<last.tv_usec)) then
begin
ClockSeq:=(ClockSeq+1) and $1FFF;
Adjustment:=0;
Last:=Tv;
end
else if (tv.tv_sec=last.tv_sec) and (tv.tv_usec=last.tv_usec) then
begin
If Adjustment>=MAX_ADJUSTMENT then
OK:=False
else
inc(AdjustMent);
end
else
begin
AdjustMent:=0;
Last:=tv;
end;
Until OK;
ClockReg:=tv.tv_usec*10+adjustment;
Inc(ClockReg,tv.tv_sec*10000000);
Inc(ClockReg,($01B21DD2 shl 32) + $13814000);
ClockHigh :=Hi(ClockReg);
ClockLow :=Lo(ClockReg);
RetClockSeq :=ClockSeq;
Result :=True;
end;
Procedure UUIDPack(Const UU : TUUID; Var GUID : TGUID);
Var
tmp : Cardinal;
P : PByte;
begin
P:=PByte(@GUID);
tmp:=uu.time_low;
P[3]:=tmp and $FF;
tmp:=tmp shr 8;
P[2]:=tmp and $FF;
tmp:=tmp shr 8;
P[1]:=tmp and $FF;
tmp:=tmp shr 8;
P[0]:=tmp and $FF;
tmp:=uu.time_mid;
P[5]:=tmp and $FF;
tmp:=tmp shr 8;
P[4]:=tmp and $FF;
tmp:=uu.time_hi_and_version;
P[7]:=tmp and $FF;
tmp:=tmp shr 8;
P[6]:=tmp and $FF;
tmp:=uu.clock_seq;
P[9]:=tmp and $FF;
tmp:=tmp shr 8;
P[8]:=tmp and $FF;
Move(uu.node,P[10],6);
end;
Procedure DumpMacAddr;
var
I : Integer;
begin
Write('Mac Addr: ');
For i:=1 to 6 do
write(hexstr(MacAddr[i],2),':');
end;
Function CreateMacGUID(Out GUID : TGUID) : Integer;
Var
UU : TUUId;
ClockMid : Cardinal;
begin
Result:=Ord(not GetMacAddr);
If (Result=0) then
begin
// DumpMacAddr;
// Writeln;
GetClock(ClockMid,uu.time_low,uu.clock_seq);
uu.Clock_seq:=uu.Clock_seq or $8000;
uu.time_mid:=lo(clockMid);
uu.time_hi_and_version:=hi(ClockMid) or $1000;
move(MacAddr,uu.node,sizeof(MacAddr));
UUIDPack(UU,GUID);
end;
end;
initialization
OnCreateGUID:=@CreateMacGUID;
end.

View File

@ -0,0 +1,14 @@
program testlibuid;
uses sysutils,libuuid;
Var
T : TGUID;
P : PByte;
I : Integer;
begin
// GetURandomBytes(T,SizeOf(T));
CreateGUID(T);
Writeln(GUIDToString(T));
end.

View File

@ -0,0 +1,14 @@
program testuid;
uses sysutils, macuuid;
Var
T : TGUID;
P : PByte;
I : Integer;
begin
// GetURandomBytes(T,SizeOf(T));
CreateGUID(T);
Writeln(GUIDToString(T));
end.