Skip to content

Commit d364f30

Browse files
committed
Remove the deprecated Oracle interface
The Oracle interface was deprecated in ROOT 6.30 and scheduled for removal in 6.32. As we are now in the 6.32 development cycle, everything related to `oracle` can be removed.
1 parent 6d4e85d commit d364f30

15 files changed

+5
-2732
lines changed

cmake/modules/FindOracle.cmake

Lines changed: 0 additions & 90 deletions
This file was deleted.

cmake/modules/RootBuildOptions.cmake

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ ROOT_BUILD_OPTION(mpi OFF "Enable support for Message Passing Interface (MPI)")
147147
ROOT_BUILD_OPTION(mysql ON "Enable support for MySQL databases")
148148
ROOT_BUILD_OPTION(odbc OFF "Enable support for ODBC databases (requires libiodbc or libodbc)")
149149
ROOT_BUILD_OPTION(opengl ON "Enable support for OpenGL (requires libGL and libGLU)")
150-
ROOT_BUILD_OPTION(oracle OFF "Enable support for Oracle databases (requires Oracle Instant Client) (deprecated)")
151150
ROOT_BUILD_OPTION(pgsql ON "Enable support for PostgreSQL")
152151
ROOT_BUILD_OPTION(proof OFF "Enable support for PROOF")
153152
ROOT_BUILD_OPTION(pyroot ON "Enable support for automatic Python bindings (PyROOT)")
@@ -241,7 +240,6 @@ if(all)
241240
set(mysql_defvalue ON)
242241
set(odbc_defvalue ON)
243242
set(opengl_defvalue ON)
244-
set(oracle_defvalue ON)
245243
set(pgsql_defvalue ON)
246244
set(proof_defvalue OFF)
247245
set(pythia6_defvalue ON)
@@ -404,17 +402,17 @@ if(NOT webgui)
404402
endif()
405403

406404
#---Removed options------------------------------------------------------------
407-
foreach(opt afdsmgrd afs alien bonjour castor chirp cxx11 cxx14 cxx17 geocad
408-
gfal glite globus gsl_shared hdfs ios jemalloc krb5 ldap memstat
409-
monalisa pyroot_legacy qt qtgsi rfio ruby sapdb srp table tcmalloc
410-
python vmc xproofd pyroot-python2 exceptions)
405+
foreach(opt afdsmgrd afs alien bonjour castor chirp cxx11 cxx14 cxx17
406+
exceptions geocad gfal glite globus gsl_shared hdfs ios jemalloc krb5
407+
ldap memstat monalisa oracle pyroot-python2 pyroot_legacy python qt
408+
qtgsi rfio ruby sapdb srp table tcmalloc vmc xproofd)
411409
if(${opt})
412410
message(FATAL_ERROR ">>> Option '${opt}' is no longer supported in ROOT ${ROOT_VERSION}.")
413411
endif()
414412
endforeach()
415413

416414
#---Deprecated options------------------------------------------------------------------------
417-
foreach(opt cxxmodules oracle pythia6 pythia6_nolink)
415+
foreach(opt cxxmodules pythia6 pythia6_nolink)
418416
if(${opt})
419417
message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. Please contact [email protected] should you still need it.")
420418
endif()

cmake/modules/SearchInstalledSoftware.cmake

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -726,20 +726,6 @@ if(fcgi)
726726
endif()
727727

728728

729-
#---Check for Oracle-------------------------------------------------------------------
730-
if(oracle)
731-
message(STATUS "Looking for Oracle")
732-
find_package(Oracle)
733-
if(NOT ORACLE_FOUND)
734-
if(fail-on-missing)
735-
message(FATAL_ERROR "Oracle libraries not found and they are required (orable option enabled)")
736-
else()
737-
message(STATUS "Oracle not found. Switching off oracle option")
738-
set(oracle OFF CACHE BOOL "Disabled because Oracle not found (${oracle_description})" FORCE)
739-
endif()
740-
endif()
741-
endif()
742-
743729
#---Check for ODBC-------------------------------------------------------------------
744730
if(odbc)
745731
message(STATUS "Looking for ODBC")

sql/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
if(mysql)
88
add_subdirectory(mysql)
99
endif()
10-
if(oracle)
11-
add_subdirectory(oracle)
12-
endif()
1310
if(odbc)
1411
add_subdirectory(odbc)
1512
endif()

sql/oracle/CMakeLists.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.

sql/oracle/doc/index.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

sql/oracle/inc/LinkDef.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

sql/oracle/inc/TOracleResult.h

Lines changed: 0 additions & 68 deletions
This file was deleted.

sql/oracle/inc/TOracleRow.h

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)