From 786c36ed6800277ccefaa4e980b517d718b639de Mon Sep 17 00:00:00 2001
From: Andrew Hanushevsky <abh@stanford.edu>
Date: Sun, 10 Jan 2021 23:43:26 -0800
Subject: [PATCH] [SciTokens] Make SciTokens adhere to repo standards.

---
 src/CMakeLists.txt                            |  4 +-
 src/XrdSciTokens.cmake                        | 44 +++++++++++++++++++
 src/XrdSciTokens/CMakeLists.txt               | 15 -------
 ...dAccSciTokens.cc => XrdSciTokensAccess.cc} |  2 +-
 .../{src => }/XrdSciTokensHelper.hh           |  0
 5 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 src/XrdSciTokens.cmake
 delete mode 100644 src/XrdSciTokens/CMakeLists.txt
 rename src/XrdSciTokens/{src/XrdAccSciTokens.cc => XrdSciTokensAccess.cc} (99%)
 rename src/XrdSciTokens/{src => }/XrdSciTokensHelper.hh (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 119cd379153..c4c4c892a70 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,7 @@ include( XrdCrypto )
 include( XrdSec )
 include( XrdXml )
 include( XrdHeaders )
+#include( XrdSecztn )
 
 if( BUILD_CRYPTO )
   include( XrdSecgsi )
@@ -52,7 +53,6 @@ if( NOT XRDCL_ONLY )
   include( XrdFfs )
   include( XrdPlugins )
   include( XrdSsi )
-#  include( XrdCns ) TODO: this is using the old client, needs refactoring or needs to be removed!
 
   include( XrdPfc )
 
@@ -74,7 +74,7 @@ if( NOT XRDCL_ONLY )
   endif()
 
   if( BUILD_SCITOKENS )
-    add_subdirectory( XrdSciTokens )
+    include( XrdSciTokens )
   endif()
 
 endif()
diff --git a/src/XrdSciTokens.cmake b/src/XrdSciTokens.cmake
new file mode 100644
index 00000000000..0052e97caa1
--- /dev/null
+++ b/src/XrdSciTokens.cmake
@@ -0,0 +1,44 @@
+include( XRootDCommon )
+
+find_package( SciTokensCpp REQUIRED )
+
+#-------------------------------------------------------------------------------
+# Modules
+#-------------------------------------------------------------------------------
+set( LIB_XRD_SCITOKENS  XrdAccSciTokens-${PLUGIN_VERSION} )
+
+include_directories(
+   ${SCITOKENS_CPP_INCLUDE_DIR}
+   XrdSciTokens/vendor/picojson
+   XrdSciTokens/vendor/inih )
+
+#-------------------------------------------------------------------------------
+# The XrdPfc library
+#-------------------------------------------------------------------------------
+add_library(
+   ${LIB_XRD_SCITOKENS}
+   MODULE
+   XrdSciTokens/XrdSciTokensAccess.cc
+                                       XrdSciTokens/XrdSciTokensHelper.hh )
+target_link_libraries(
+   ${LIB_XRD_SCITOKENS}
+   ${SCITOKENS_CPP_LIBRARIES}
+   XrdUtils
+   XrdServer
+   dl
+   pthread )
+
+set_target_properties(
+   ${LIB_XRD_SCITOKENS}
+   PROPERTIES
+   INTERFACE_LINK_LIBRARIES ""
+   LINK_INTERFACE_LIBRARIES "" )
+
+#-------------------------------------------------------------------------------
+# Install
+#-------------------------------------------------------------------------------
+install(
+   TARGETS
+   ${LIB_XRD_SCITOKENS}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
diff --git a/src/XrdSciTokens/CMakeLists.txt b/src/XrdSciTokens/CMakeLists.txt
deleted file mode 100644
index c6ae25f74aa..00000000000
--- a/src/XrdSciTokens/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-include(GNUInstallDirs)
-
-find_package( SciTokensCpp REQUIRED )
-
-include_directories(${SCITOKENS_CPP_INCLUDE_DIR} vendor/picojson vendor/inih)
-
-add_library(XrdAccSciTokens SHARED src/XrdAccSciTokens.cc src/XrdSciTokensHelper.hh)
-target_link_libraries(XrdAccSciTokens -ldl -lpthread ${SCITOKENS_CPP_LIBRARIES} XrdUtils XrdServer)
-set_target_properties(XrdAccSciTokens PROPERTIES OUTPUT_NAME XrdAccSciTokens-${PLUGIN_VERSION} SUFFIX ".so" LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/configs/export-lib-symbols")
-
-SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Install path for libraries")
-
-install(
-  TARGETS XrdAccSciTokens
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/XrdSciTokens/src/XrdAccSciTokens.cc b/src/XrdSciTokens/XrdSciTokensAccess.cc
similarity index 99%
rename from src/XrdSciTokens/src/XrdAccSciTokens.cc
rename to src/XrdSciTokens/XrdSciTokensAccess.cc
index 62f19765fe1..1ff3d560bd9 100644
--- a/src/XrdSciTokens/src/XrdAccSciTokens.cc
+++ b/src/XrdSciTokens/XrdSciTokensAccess.cc
@@ -19,7 +19,7 @@
 #include "picojson.h"
 
 #include "scitokens/scitokens.h"
-#include "XrdSciTokensHelper.hh"
+#include "XrdSciTokens/XrdSciTokensHelper.hh"
 
 // The status-quo to retrieve the default object is to copy/paste the
 // linker definition and invoke directly.
diff --git a/src/XrdSciTokens/src/XrdSciTokensHelper.hh b/src/XrdSciTokens/XrdSciTokensHelper.hh
similarity index 100%
rename from src/XrdSciTokens/src/XrdSciTokensHelper.hh
rename to src/XrdSciTokens/XrdSciTokensHelper.hh