Skip to content

Commit

Permalink
Remove code related to the gfal option
Browse files Browse the repository at this point in the history
The `gfal` option was deprecated in ROOT 6.28 and removed in 6.30
(see 3be3aad). This commit suggests to remove remaining code related to
the `gfal` option.
  • Loading branch information
guitargeek committed Feb 27, 2024
1 parent f565ab4 commit f0bd078
Show file tree
Hide file tree
Showing 15 changed files with 2 additions and 657 deletions.
1 change: 0 additions & 1 deletion .github/workflows/root-ci-config/buildconfig/global.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ fftw3=ON
fitsio=ON
fortran=OFF
gdml=ON
gfal=OFF
gminimal=OFF
gnuinstall=OFF
gsl_shared=OFF
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/root-ci-config/buildconfig/windows10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ builtin_zstd=ON
cudnn=OFF
davix=OFF
fftw3=OFF
gfal=OFF
llvm13_broken_tests=OFF
minuit2_mpi=OFF
minuit2_omp=OFF
Expand Down
42 changes: 0 additions & 42 deletions cmake/modules/FindGFAL.cmake

This file was deleted.

5 changes: 0 additions & 5 deletions cmake/modules/RootConfiguration.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,6 @@ set(glewlibdir ${GLEW_LIBRARY_DIR})
set(glewlibs ${GLEW_LIBRARIES})
set(glewincdir ${GLEW_INCLUDE_DIR})

set(buildgfal ${value${gfal}})
set(gfallibdir ${GFAL_LIBRARY_DIR})
set(gfallib ${GFAL_LIBRARY})
set(gfalincdir ${GFAL_INCLUDE_DIR})

set(buildarrow ${value${arrow}})
set(arrowlibdir ${ARROW_LIBRARY_DIR})
set(arrowlib ${ARROW_LIBRARY})
Expand Down
16 changes: 0 additions & 16 deletions cmake/modules/SearchInstalledSoftware.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1021,22 +1021,6 @@ if(arrow)

endif()

#---Check for gfal-------------------------------------------------------------------
if(gfal)
find_package(GFAL)
if(NOT GFAL_FOUND)
if(fail-on-missing)
message(FATAL_ERROR "Gfal library not found and is required (gfal option enabled)")
else()
message(STATUS "GFAL library not found. Set variable GFAL_DIR to point to your gfal installation
and the variable SRM_IFCE_DIR to the srm_ifce installation")
message(STATUS "For the time being switching OFF 'gfal' option")
set(gfal OFF CACHE BOOL "Disabled because GFAL not found (${gfal_description})" FORCE)
endif()
endif()
endif()


#---Check for dCache-------------------------------------------------------------------
if(dcache)
find_package(DCAP)
Expand Down
4 changes: 0 additions & 4 deletions config/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,6 @@ ifeq ($(BUILDGLEW), yes)
GLEWCPPFLAGS := -DBUILTIN_GLEW
endif

BUILDGFAL := @buildgfal@
GFALLIBDIR := @gfallibdir@
GFALCLILIB := @gfallib@
GFALINCDIR := $(filter-out /usr/include, @gfalincdir@)
SRMIFCEINCDIR := $(filter-out /usr/include, @srmifceincdir@)
GLIB2INCDIR := $(filter-out /usr/include, @glib2incdir@)

Expand Down
2 changes: 1 addition & 1 deletion config/rootrc.in
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ TS3WebFile.Root.MultiRangeServer: Huawei OBS
# In case the file namespace descriptor ends with - the namespace
# is not a part of the filename.
# Extend in private .rootrc with a +Url.Special line.
Url.Special: file: hpss: gfal: dcache:
Url.Special: file: hpss: dcache:
+Url.Special: /alien/-

# PROOF XRD client variables
Expand Down
1 change: 0 additions & 1 deletion documentation/doxygen/makeinput.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ echo " ../../hist/ \\" >> Doxyfile_INPUT
echo " ../../html/ \\" >> Doxyfile_INPUT
echo " ../../io/doc/TFile \\" >> Doxyfile_INPUT
echo " ../../io/dcache/ \\" >> Doxyfile_INPUT
echo " ../../io/gfal/ \\" >> Doxyfile_INPUT
echo " ../../io/io/ \\" >> Doxyfile_INPUT
echo " ../../io/sql/ \\" >> Doxyfile_INPUT
echo " ../../io/xml/ \\" >> Doxyfile_INPUT
Expand Down
2 changes: 1 addition & 1 deletion documentation/users-guide/InstallandBuild.md
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ namespace descriptor ends with - the namespace is not a part of the
filename. Extend in private .rootrc with a +Url.Special line.

``` {.cpp}
Url.Special: file: rfio: hpss: castor: gfal: dcache:
Url.Special: file: rfio: hpss: castor: dcache:
+Url.Special: /alien/- /castor/
```

Expand Down
5 changes: 0 additions & 5 deletions etc/plugins/TFile/P050_TGFALFile.C

This file was deleted.

3 changes: 0 additions & 3 deletions io/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ add_subdirectory(xml)
if(xml)
add_subdirectory(xmlparser)
endif()
if(gfal)
add_subdirectory(gfal)
endif()
if(dcache)
add_subdirectory(dcache)
endif()
Expand Down
19 changes: 0 additions & 19 deletions io/gfal/CMakeLists.txt

This file was deleted.

20 changes: 0 additions & 20 deletions io/gfal/inc/LinkDef.h

This file was deleted.

70 changes: 0 additions & 70 deletions io/gfal/inc/TGFALFile.h

This file was deleted.

Loading

0 comments on commit f0bd078

Please sign in to comment.