* Renamed to fpjsondataset, in line with other FPC units

git-svn-id: trunk@19854 -

.gitattributes

@@ -1895,7 +1895,7 @@ packages/fcl-db/src/export/fptexexport.pp svneol=native#text/plain
 packages/fcl-db/src/export/fpxmlxsdexport.pp svneol=native#text/plain
 packages/fcl-db/src/json/Makefile svneol=native#text/plain
 packages/fcl-db/src/json/Makefile.fpc svneol=native#text/plain
-packages/fcl-db/src/json/jsondataset.pp svneol=native#text/plain
+packages/fcl-db/src/json/fpjsondataset.pp svneol=native#text/plain
 packages/fcl-db/src/memds/Makefile svneol=native#text/plain
 packages/fcl-db/src/memds/Makefile.fpc svneol=native#text/plain
 packages/fcl-db/src/memds/README.txt svneol=native#text/plain

packages/fcl-db/src/json/Makefile

@@ -301,193 +301,193 @@ endif
 override PACKAGE_NAME=fcl-db
 PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR))))))
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=jsondataset
+override TARGET_UNITS+=fpjsondataset
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR

packages/fcl-db/src/json/Makefile.fpc

@@ -6,7 +6,7 @@
 main=fcl-db
 
 [target]
-units=jsondataset
+units=fpjsondataset
 
 [require]
 packages=fcl-base fcl-json

packages/fcl-db/src/json/jsondataset.pp → packages/fcl-db/src/json/fpjsondataset.pp

@@ -1,6 +1,6 @@
 {$mode objfpc}
 {$h+}
-unit jsondataset;
+unit fpjsondataset;
 
 interface