* renamed uuid.pp to macuuid.pp

    * compared to the new uuid.pas in packages/base/hash this one is linux only

git-svn-id: trunk@5618 -

.gitattributes

@@ -4040,9 +4040,9 @@ packages/extra/uuid/README svneol=native#text/plain
 packages/extra/uuid/fpmake.inc svneol=native#text/plain
 packages/extra/uuid/fpmake.pp svneol=native#text/plain
 packages/extra/uuid/libuuid.pp svneol=native#text/plain
+packages/extra/uuid/macuuid.pp svneol=native#text/plain
 packages/extra/uuid/testlibuid.pp svneol=native#text/plain
 packages/extra/uuid/testuid.pp svneol=native#text/plain
-packages/extra/uuid/uuid.pp svneol=native#text/plain
 packages/extra/winunits/Makefile svneol=native#text/plain
 packages/extra/winunits/Makefile.fpc svneol=native#text/plain
 packages/extra/winunits/activex.pp svneol=native#text/plain

packages/extra/uuid/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/13]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/12/16]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded powerpc64-linux powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -233,127 +233,151 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=uuid
 override PACKAGE_VERSION=2.0.0
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=uuid libuuid
+override TARGET_UNITS+=macuuid libuuid
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_UNITS+=macuuid libuuid
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_EXAMPLES+=testuid testlibuid
@@ -406,6 +430,9 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
@@ -427,6 +454,9 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
@@ -445,6 +475,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
@@ -454,6 +487,9 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
@@ -463,6 +499,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
@@ -475,9 +514,18 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_EXAMPLES+=testuid testlibuid
 endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_EXAMPLES+=testuid testlibuid
+endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -1274,6 +1322,9 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),i386-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1295,6 +1346,9 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1313,6 +1367,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1322,6 +1379,9 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1331,6 +1391,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1343,9 +1406,18 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-nds)
+REQUIRE_PACKAGES_RTL=1
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)

packages/extra/uuid/Makefile.fpc

@@ -7,7 +7,7 @@ name=uuid
 version=2.0.0
 
 [target]
-units=uuid libuuid
+units=macuuid libuuid
 examples=testuid testlibuid
 
 [require]

packages/extra/uuid/uuid.pp → packages/extra/uuid/macuuid.pp

@@ -1,6 +1,6 @@
 {$mode objfpc}
 {$H+}
-unit uuid;
+unit macuuid;
 
 Interface
 

packages/extra/uuid/testuid.pp

@@ -1,6 +1,6 @@
 program testuid;
 
-uses sysutils,uuid;
+uses sysutils, macuuid;
 
 Var
   T : TGUID;