diff --git a/.gitattributes b/.gitattributes index 7b5a8bc034..7958797d17 100644 --- a/.gitattributes +++ b/.gitattributes @@ -875,19 +875,8 @@ packages/base/httpd/httpd-2.2/util_md5.inc svneol=native#text/plain packages/base/httpd/httpd-2.2/util_script.inc svneol=native#text/plain packages/base/httpd/httpd-2.2/util_time.inc svneol=native#text/plain packages/base/ibase/Makefile svneol=native#text/plain -packages/base/ibase/Makefile.fpc svneol=native#text/plain -packages/base/ibase/README -text packages/base/ibase/fpmake.inc svneol=native#text/plain packages/base/ibase/fpmake.pp svneol=native#text/plain -packages/base/ibase/ibase40.pp svneol=native#text/plain -packages/base/ibase/ibase60.inc svneol=native#text/plain -packages/base/ibase/ibase60.pp svneol=native#text/plain -packages/base/ibase/ibase60dyn.pp svneol=native#text/plain -packages/base/ibase/mkdb -text -packages/base/ibase/mkdb.bat -text -packages/base/ibase/mkdb.sqd -text -packages/base/ibase/testib40.pp svneol=native#text/plain -packages/base/ibase/testib60.pp svneol=native#text/plain packages/base/imagemagick/Makefile svneol=native#text/plain packages/base/imagemagick/Makefile.fpc svneol=native#text/plain packages/base/imagemagick/buildim.pp svneol=native#text/plain @@ -4274,6 +4263,17 @@ packages/hash/src/md5.pp svneol=native#text/plain packages/hash/src/ntlm.pas svneol=native#text/plain packages/hash/src/unixcrypt.pas svneol=native#text/plain packages/hash/src/uuid.pas svneol=native#text/plain +packages/ibase/Makefile.fpc svneol=native#text/plain +packages/ibase/README svneol=native#text/plain +packages/ibase/scripts/mkdb svneol=native#text/plain +packages/ibase/scripts/mkdb.bat svneol=native#text/plain +packages/ibase/scripts/mkdb.sqd svneol=native#text/plain +packages/ibase/src/ibase40.pp svneol=native#text/plain +packages/ibase/src/ibase60.inc svneol=native#text/plain +packages/ibase/src/ibase60.pp svneol=native#text/plain +packages/ibase/src/ibase60dyn.pp svneol=native#text/plain +packages/ibase/tests/testib40.pp svneol=native#text/plain +packages/ibase/tests/testib60.pp svneol=native#text/plain packages/mysql/Makefile.fpc svneol=native#text/plain packages/mysql/fpmake.pp svneol=native#text/plain packages/mysql/scripts/mkdb svneol=native#text/plain diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 2ea0156a4e..89d6c0151f 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -3,16 +3,16 @@ # [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 mysql -dirs_freebsd=fcl-web fcl-async -dirs_darwin=fcl-web fcl-async -dirs_solaris=fcl-web fcl-async -dirs_netbsd=fcl-web fcl-async -dirs_openbsd=fcl-web fcl-async -dirs_linux=fcl-web fcl-async -dirs_win32=winunits-base winunits-jedi fcl-web -dirs_win64=winunits-base winunits-jedi fcl-web -dirs_wince=fcl-web +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 +dirs_freebsd=fcl-web fcl-async ibase mysql +dirs_darwin=fcl-web fcl-async ibase mysql +dirs_solaris=fcl-web fcl-async ibase mysql +dirs_netbsd=fcl-web fcl-async ibase mysql +dirs_openbsd=fcl-web fcl-async ibase mysql +dirs_linux=fcl-web fcl-async ibase mysql +dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql +dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql +dirs_wince=fcl-web ibase mysql [install] fpcpackage=y @@ -99,11 +99,11 @@ fcl-web_smart: fcl-db_smart fcl-xml_smart fcl-process_smart fcl-web_release: fcl-db_release fcl-xml_release fcl-process_release fcl-web_shared: fcl-db_shared fcl-xml_shared fcl-process_shared -fcl-db_all: fcl-base_all mysql_all -fcl-db_debug: fcl-base_debug mysql_debug -fcl-db_smart: fcl-base_smart mysql_smart -fcl-db_release: fcl-base_release mysql_release -fcl-db_shared: fcl-base_shared mysql_shared +fcl-db_all: fcl-base_all mysql_all ibase_all +fcl-db_debug: fcl-base_debug mysql_debug ibase_debug +fcl-db_smart: fcl-base_smart mysql_smart ibase_smart +fcl-db_release: fcl-base_release mysql_release ibase_release +fcl-db_shared: fcl-base_shared mysql_shared ibase_shared fcl_all: fcl-base_all fcl-xml_all fcl-fpcunit_all fcl-db_all fcl-web_all fcl-registry_all fcl-passrc_all fcl-image_all fcl-net_all fcl-json_all fcl_debug: fcl-base_debug fcl-xml_debug fcl-fpcunit_debug fcl-db_debug fcl-web_debug fcl-registry_debug fcl-passrc_debug fcl-image_debug fcl-net_debug fcl-json_debug diff --git a/packages/base/Makefile.fpc b/packages/base/Makefile.fpc index 5c44752b97..72b7f69ab8 100644 --- a/packages/base/Makefile.fpc +++ b/packages/base/Makefile.fpc @@ -5,17 +5,17 @@ [target] dirs=regexpr dirs_i386_linux=libc -dirs_linux=gdbint ibase postgres oracle odbc pthreads sqlite imagemagick dbus httpd -dirs_win32=gdbint ibase odbc sqlite postgres oracle imagemagick httpd -dirs_win64= ibase odbc sqlite postgres oracle -dirs_wince=ibase sqlite postgres +dirs_linux=gdbint postgres oracle odbc pthreads sqlite imagemagick dbus httpd +dirs_win32=gdbint odbc sqlite postgres oracle imagemagick httpd +dirs_win64= odbc sqlite postgres oracle +dirs_wince= sqlite postgres dirs_go32v2=gdbint -dirs_netbsd=gdbint ibase postgres oracle odbc imagemagick httpd -dirs_openbsd=gdbint ibase postgres oracle odbc imagemagick httpd -dirs_beos=gdbint ibase postgres odbc sqlite pthreads imagemagick -dirs_freebsd=gdbint ibase postgres oracle odbc sqlite pthreads imagemagick httpd -dirs_darwin= ibase postgres oracle odbc sqlite pthreads imagemagick httpd -dirs_solaris= ibase postgres oracle odbc sqlite pthreads imagemagick httpd +dirs_netbsd=gdbint postgres oracle odbc imagemagick httpd +dirs_openbsd=gdbint postgres oracle odbc imagemagick httpd +dirs_beos=gdbint postgres odbc sqlite pthreads imagemagick +dirs_freebsd=gdbint postgres oracle odbc sqlite pthreads imagemagick httpd +dirs_darwin= postgres oracle odbc sqlite pthreads imagemagick httpd +dirs_solaris= postgres oracle odbc sqlite pthreads imagemagick httpd [rules] diff --git a/packages/base/ibase/Makefile.fpc b/packages/ibase/Makefile.fpc similarity index 80% rename from packages/base/ibase/Makefile.fpc rename to packages/ibase/Makefile.fpc index d82851e320..5fc13b42ca 100644 --- a/packages/base/ibase/Makefile.fpc +++ b/packages/ibase/Makefile.fpc @@ -17,7 +17,11 @@ libc=y fpcpackage=y [default] -fpcdir=../../.. +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests [shared] build=n diff --git a/packages/base/ibase/README b/packages/ibase/README similarity index 100% rename from packages/base/ibase/README rename to packages/ibase/README diff --git a/packages/base/ibase/mkdb b/packages/ibase/scripts/mkdb similarity index 100% rename from packages/base/ibase/mkdb rename to packages/ibase/scripts/mkdb diff --git a/packages/base/ibase/mkdb.bat b/packages/ibase/scripts/mkdb.bat similarity index 100% rename from packages/base/ibase/mkdb.bat rename to packages/ibase/scripts/mkdb.bat diff --git a/packages/base/ibase/mkdb.sqd b/packages/ibase/scripts/mkdb.sqd similarity index 100% rename from packages/base/ibase/mkdb.sqd rename to packages/ibase/scripts/mkdb.sqd diff --git a/packages/base/ibase/ibase40.pp b/packages/ibase/src/ibase40.pp similarity index 100% rename from packages/base/ibase/ibase40.pp rename to packages/ibase/src/ibase40.pp diff --git a/packages/base/ibase/ibase60.inc b/packages/ibase/src/ibase60.inc similarity index 100% rename from packages/base/ibase/ibase60.inc rename to packages/ibase/src/ibase60.inc diff --git a/packages/base/ibase/ibase60.pp b/packages/ibase/src/ibase60.pp similarity index 100% rename from packages/base/ibase/ibase60.pp rename to packages/ibase/src/ibase60.pp diff --git a/packages/base/ibase/ibase60dyn.pp b/packages/ibase/src/ibase60dyn.pp similarity index 100% rename from packages/base/ibase/ibase60dyn.pp rename to packages/ibase/src/ibase60dyn.pp diff --git a/packages/base/ibase/testib40.pp b/packages/ibase/tests/testib40.pp similarity index 100% rename from packages/base/ibase/testib40.pp rename to packages/ibase/tests/testib40.pp diff --git a/packages/base/ibase/testib60.pp b/packages/ibase/tests/testib60.pp similarity index 100% rename from packages/base/ibase/testib60.pp rename to packages/ibase/tests/testib60.pp