* oracle moved + makefile.fpc + fpmake

git-svn-id: trunk@9934 -

.gitattributes

@@ -1170,28 +1170,9 @@ packages/base/odbc/odbcsqldyn.pas svneol=native#text/plain
 packages/base/odbc/testodbc.mdb -text
 packages/base/odbc/testodbc.pp svneol=native#text/plain
 packages/base/oracle/Makefile svneol=native#text/plain
-packages/base/oracle/Makefile.fpc svneol=native#text/plain
-packages/base/oracle/README -text
 packages/base/oracle/example/Makefile svneol=native#text/plain
-packages/base/oracle/example/Makefile.fpc svneol=native#text/plain
-packages/base/oracle/example/oraclew.pp svneol=native#text/plain
-packages/base/oracle/example/test01.pp svneol=native#text/plain
 packages/base/oracle/fpmake.inc svneol=native#text/plain
 packages/base/oracle/fpmake.pp svneol=native#text/plain
-packages/base/oracle/nzerror.inc -text
-packages/base/oracle/nzt.inc -text
-packages/base/oracle/oci.inc -text
-packages/base/oracle/oci.pp -text
-packages/base/oracle/oci1.inc -text
-packages/base/oracle/ociap.inc -text
-packages/base/oracle/ocidfn.inc -text
-packages/base/oracle/ocidyn.pp -text
-packages/base/oracle/oraoci.pp svneol=native#text/plain
-packages/base/oracle/oratypes.pp -text
-packages/base/oracle/orl.inc -text
-packages/base/oracle/oro_implementation.inc -text
-packages/base/oracle/oro_interface.inc -text
-packages/base/oracle/ort.inc -text
 packages/base/postgres/Makefile svneol=native#text/plain
 packages/base/postgres/Makefile.fpc svneol=native#text/plain
 packages/base/postgres/README -text
@@ -4289,6 +4270,25 @@ packages/ncurses/src/panel.pp svneol=native#text/plain
 packages/ncurses/src/pxpic.inc svneol=native#text/plain
 packages/ncurses/src/pxpic.txt svneol=native#text/plain
 packages/ncurses/tests/testn.pp svneol=native#text/plain
+packages/oracle/Makefile.fpc svneol=native#text/plain
+packages/oracle/README svneol=native#text/plain
+packages/oracle/examples/Makefile.fpc svneol=native#text/plain
+packages/oracle/examples/oraclew.pp svneol=native#text/plain
+packages/oracle/examples/test01.pp svneol=native#text/plain
+packages/oracle/src/nzerror.inc svneol=native#text/plain
+packages/oracle/src/nzt.inc svneol=native#text/plain
+packages/oracle/src/oci.inc svneol=native#text/plain
+packages/oracle/src/oci.pp svneol=native#text/plain
+packages/oracle/src/oci1.inc svneol=native#text/plain
+packages/oracle/src/ociap.inc svneol=native#text/plain
+packages/oracle/src/ocidfn.inc svneol=native#text/plain
+packages/oracle/src/ocidyn.pp svneol=native#text/plain
+packages/oracle/src/oraoci.pp svneol=native#text/plain
+packages/oracle/src/oratypes.pp svneol=native#text/plain
+packages/oracle/src/orl.inc svneol=native#text/plain
+packages/oracle/src/oro_implementation.inc svneol=native#text/plain
+packages/oracle/src/oro_interface.inc svneol=native#text/plain
+packages/oracle/src/ort.inc svneol=native#text/plain
 packages/pasjpeg/Makefile svneol=native#text/plain
 packages/pasjpeg/Makefile.fpc svneol=native#text/plain
 packages/pasjpeg/examples/cderror.pas svneol=native#text/plain

packages/Makefile.fpc

@@ -4,14 +4,14 @@
 
 [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
-dirs_freebsd=fcl-web fcl-async ibase mysql ncurses zlib
-dirs_darwin=fcl-web fcl-async ibase mysql ncurses zlib
-dirs_solaris=fcl-web fcl-async ibase mysql ncurses zlib
-dirs_netbsd=fcl-web fcl-async ibase mysql ncurses zlib
-dirs_openbsd=fcl-web fcl-async ibase mysql ncurses zlib
-dirs_linux=fcl-web fcl-async ibase mysql ncurses unzip zlib
-dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql zlib
-dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql zlib
+dirs_freebsd=fcl-web fcl-async ibase mysql ncurses zlib oracle
+dirs_darwin=fcl-web fcl-async ibase mysql ncurses zlib oracle
+dirs_solaris=fcl-web fcl-async ibase mysql ncurses zlib oracle
+dirs_netbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle
+dirs_openbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle
+dirs_linux=fcl-web fcl-async ibase mysql ncurses unzip zlib oracle
+dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle
+dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle
 dirs_wince=fcl-web ibase mysql
 dirs_os2=zlib
 dirs_emx=zlib
@@ -98,17 +98,17 @@ fcl-net_release: fcl-passrc_release fcl-xml_release fcl-async_release
 fcl-net_shared: fcl-passrc_shared fcl-xml_shared fcl-async_shared
 endif
 
-fcl-web_all: fcl-db_all fcl-xml_all fcl-process_all
+fcl-web_all: fcl-db_all fcl-xml_all fcl-process_all 
 fcl-web_debug: fcl-db_debug fcl-xml_debug fcl-process_debug
 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 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-db_all: fcl-base_all mysql_all ibase_all oracle_all
+fcl-db_debug: fcl-base_debug mysql_debug ibase_debug oracle_debug
+fcl-db_smart: fcl-base_smart mysql_smart ibase_smart oracle_smart
+fcl-db_release: fcl-base_release mysql_release ibase_release oracle_release
+fcl-db_shared: fcl-base_shared mysql_shared ibase_shared oracle_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

packages/base/Makefile.fpc

@@ -5,17 +5,17 @@
 [target]
 dirs=regexpr
 dirs_i386_linux=libc
-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_linux=gdbint   postgres  odbc pthreads sqlite imagemagick dbus httpd
+dirs_win32=gdbint   odbc sqlite postgres  imagemagick httpd 
+dirs_win64=  odbc sqlite postgres  
 dirs_wince= sqlite postgres
 dirs_go32v2=gdbint
-dirs_netbsd=gdbint   postgres oracle odbc imagemagick httpd
-dirs_openbsd=gdbint   postgres oracle odbc imagemagick httpd
+dirs_netbsd=gdbint   postgres  odbc imagemagick httpd
+dirs_openbsd=gdbint   postgres  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
+dirs_freebsd=gdbint   postgres  odbc sqlite pthreads imagemagick httpd
+dirs_darwin=  postgres  odbc sqlite pthreads imagemagick httpd
+dirs_solaris=  postgres  odbc sqlite pthreads imagemagick httpd
 
 
 [rules]

packages/base/oracle/Makefile.fpc → packages/oracle/Makefile.fpc

@@ -8,7 +8,7 @@ version=2.0.0
 
 [target]
 units=oci ocidyn oratypes oraoci
-exampledirs=example
+exampledirs=examples
 
 [require]
 libc=y
@@ -17,7 +17,11 @@ libc=y
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src tests
 
 # in libdir variable must be path to libraries
 # libclntsh.*,libnlsrtl3.*

packages/base/oracle/example/Makefile.fpc → packages/oracle/examples/Makefile.fpc

@@ -13,7 +13,7 @@ packages=oracle fcl-base fcl-db fcl-xml
 fpcpackage=y
 
 [default]
-fpcdir=../../../..
+fpcdir=../../..
 
 # in libdir variable must be path to libraries
 # libclntsh.*,libnlsrtl3.*